Set up a Visual Studio project and tweak things until it compiles

- It doesn't link yet, but that was expected
- Fixed some issues with global variables having different types in different files.
This commit is contained in:
2014-12-29 14:52:54 -05:00
parent fdb98bf34a
commit b11199d7d9
56 changed files with 1412 additions and 153 deletions

12
.gitignore vendored
View File

@@ -34,6 +34,18 @@ src/*.xcodeproj/*.xcworkspace/xcuserdata
src/*.xcodeproj/*.mode*
src/*.xcodeproj/*.pbxuser
# Visual Studio Junk Files
src/*.vsproj/*sdf
src/*.vsproj/*/*.user
src/*.vsproj/*.suo
src/*.vsproj/*.aps
src/*.vsproj/*/*.aps
src/*.vsproj/*/Debug/
src/*.vsproj/*/Release/
src/*.vsproj/Debug/
src/*.vsproj/Release/
src/*.vsproj/*/ipch/
# Shader Builder projects
# It's an sqlite3 database and not particularly important, so exclude it
src/tools/*.sbproj

View File

@@ -0,0 +1,49 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game\Blades of Exile", "Game\Blades of Exile.vcxproj", "{A0C19353-478B-4F21-9FE3-FA8EE4D15147}"
ProjectSection(ProjectDependencies) = postProject
{1347FE79-73BD-4176-9280-0FE39E3534E2} = {1347FE79-73BD-4176-9280-0FE39E3534E2}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common\Common", "Common\Common.vcxproj", "{1347FE79-73BD-4176-9280-0FE39E3534E2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PcEdit\Char Editor", "PcEdit\Char Editor.vcxproj", "{3A6D88AD-45CD-4736-85F7-5E602ECB3D3C}"
ProjectSection(ProjectDependencies) = postProject
{1347FE79-73BD-4176-9280-0FE39E3534E2} = {1347FE79-73BD-4176-9280-0FE39E3534E2}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ScenEdit\Scen Editor", "ScenEdit\Scen Editor.vcxproj", "{87C53CC0-ED7A-4BF8-8844-FCA34401C1CA}"
ProjectSection(ProjectDependencies) = postProject
{1347FE79-73BD-4176-9280-0FE39E3534E2} = {1347FE79-73BD-4176-9280-0FE39E3534E2}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A0C19353-478B-4F21-9FE3-FA8EE4D15147}.Debug|Win32.ActiveCfg = Debug|Win32
{A0C19353-478B-4F21-9FE3-FA8EE4D15147}.Debug|Win32.Build.0 = Debug|Win32
{A0C19353-478B-4F21-9FE3-FA8EE4D15147}.Release|Win32.ActiveCfg = Release|Win32
{A0C19353-478B-4F21-9FE3-FA8EE4D15147}.Release|Win32.Build.0 = Release|Win32
{1347FE79-73BD-4176-9280-0FE39E3534E2}.Debug|Win32.ActiveCfg = Debug|Win32
{1347FE79-73BD-4176-9280-0FE39E3534E2}.Debug|Win32.Build.0 = Debug|Win32
{1347FE79-73BD-4176-9280-0FE39E3534E2}.Release|Win32.ActiveCfg = Release|Win32
{1347FE79-73BD-4176-9280-0FE39E3534E2}.Release|Win32.Build.0 = Release|Win32
{3A6D88AD-45CD-4736-85F7-5E602ECB3D3C}.Debug|Win32.ActiveCfg = Debug|Win32
{3A6D88AD-45CD-4736-85F7-5E602ECB3D3C}.Debug|Win32.Build.0 = Debug|Win32
{3A6D88AD-45CD-4736-85F7-5E602ECB3D3C}.Release|Win32.ActiveCfg = Release|Win32
{3A6D88AD-45CD-4736-85F7-5E602ECB3D3C}.Release|Win32.Build.0 = Release|Win32
{87C53CC0-ED7A-4BF8-8844-FCA34401C1CA}.Debug|Win32.ActiveCfg = Debug|Win32
{87C53CC0-ED7A-4BF8-8844-FCA34401C1CA}.Debug|Win32.Build.0 = Debug|Win32
{87C53CC0-ED7A-4BF8-8844-FCA34401C1CA}.Release|Win32.ActiveCfg = Release|Win32
{87C53CC0-ED7A-4BF8-8844-FCA34401C1CA}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@@ -0,0 +1,177 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\classes\creatlist.h" />
<ClInclude Include="..\..\classes\item.h" />
<ClInclude Include="..\..\classes\location.h" />
<ClInclude Include="..\..\classes\monster.h" />
<ClInclude Include="..\..\classes\outdoors.h" />
<ClInclude Include="..\..\classes\party.h" />
<ClInclude Include="..\..\classes\pc.h" />
<ClInclude Include="..\..\classes\regtown.h" />
<ClInclude Include="..\..\classes\scenario.h" />
<ClInclude Include="..\..\classes\shop.hpp" />
<ClInclude Include="..\..\classes\simpletypes.h" />
<ClInclude Include="..\..\classes\special.h" />
<ClInclude Include="..\..\classes\spell.hpp" />
<ClInclude Include="..\..\classes\talking.h" />
<ClInclude Include="..\..\classes\terrain.h" />
<ClInclude Include="..\..\classes\tmpltown.h" />
<ClInclude Include="..\..\classes\town.h" />
<ClInclude Include="..\..\classes\universe.h" />
<ClInclude Include="..\..\classes\vehicle.h" />
<ClInclude Include="..\..\dialogxml\button.hpp" />
<ClInclude Include="..\..\dialogxml\control.hpp" />
<ClInclude Include="..\..\dialogxml\dialog.hpp" />
<ClInclude Include="..\..\dialogxml\dialog.keys.hpp" />
<ClInclude Include="..\..\dialogxml\dlogutil.buttons.hpp" />
<ClInclude Include="..\..\dialogxml\dlogutil.hpp" />
<ClInclude Include="..\..\dialogxml\field.hpp" />
<ClInclude Include="..\..\dialogxml\message.hpp" />
<ClInclude Include="..\..\dialogxml\pict.hpp" />
<ClInclude Include="..\..\dialogxml\scrollbar.hpp" />
<ClInclude Include="..\..\dialogxml\stack.hpp" />
<ClInclude Include="..\..\dialogxml\xml-parser\ticpp.h" />
<ClInclude Include="..\..\dialogxml\xml-parser\ticpprc.h" />
<ClInclude Include="..\..\dialogxml\xml-parser\tinystr.h" />
<ClInclude Include="..\..\dialogxml\xml-parser\tinyxml.h" />
<ClInclude Include="..\..\tools\cursors.h" />
<ClInclude Include="..\..\tools\fileio.h" />
<ClInclude Include="..\..\tools\graphtool.h" />
<ClInclude Include="..\..\tools\gzstream\gzstream.h" />
<ClInclude Include="..\..\tools\map_parse.hpp" />
<ClInclude Include="..\..\tools\mathutil.h" />
<ClInclude Include="..\..\tools\porting.h" />
<ClInclude Include="..\..\tools\prefs.hpp" />
<ClInclude Include="..\..\tools\resmgr\resmgr.hpp" />
<ClInclude Include="..\..\tools\resmgr\restypes.hpp" />
<ClInclude Include="..\..\tools\soundtool.h" />
<ClInclude Include="..\..\tools\special_parse.hpp" />
<ClInclude Include="..\..\tools\tarball.hpp" />
<ClInclude Include="..\..\tools\undo.h" />
<ClInclude Include="..\..\tools\vector2d.hpp" />
<ClInclude Include="..\..\tools\winutil.h" />
<ClInclude Include="..\targetver.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\classes\creatlist.cpp" />
<ClCompile Include="..\..\classes\item.cpp" />
<ClCompile Include="..\..\classes\location.cpp" />
<ClCompile Include="..\..\classes\monster.cpp" />
<ClCompile Include="..\..\classes\outdoors.cpp" />
<ClCompile Include="..\..\classes\party.cpp" />
<ClCompile Include="..\..\classes\pc.cpp" />
<ClCompile Include="..\..\classes\regtown.cpp" />
<ClCompile Include="..\..\classes\scenario.cpp" />
<ClCompile Include="..\..\classes\shop.cpp" />
<ClCompile Include="..\..\classes\special.cpp" />
<ClCompile Include="..\..\classes\spell.cpp" />
<ClCompile Include="..\..\classes\talking.cpp" />
<ClCompile Include="..\..\classes\terrain.cpp" />
<ClCompile Include="..\..\classes\tmpltown.cpp" />
<ClCompile Include="..\..\classes\town.cpp" />
<ClCompile Include="..\..\classes\universe.cpp" />
<ClCompile Include="..\..\classes\vehicle.cpp" />
<ClCompile Include="..\..\dialogxml\button.cpp" />
<ClCompile Include="..\..\dialogxml\control.cpp" />
<ClCompile Include="..\..\dialogxml\dialog.cpp" />
<ClCompile Include="..\..\dialogxml\dlogutil.cpp" />
<ClCompile Include="..\..\dialogxml\field.cpp" />
<ClCompile Include="..\..\dialogxml\message.cpp" />
<ClCompile Include="..\..\dialogxml\pict.cpp" />
<ClCompile Include="..\..\dialogxml\scrollbar.cpp" />
<ClCompile Include="..\..\dialogxml\stack.cpp" />
<ClCompile Include="..\..\dialogxml\xml-parser\ticpp.cpp" />
<ClCompile Include="..\..\dialogxml\xml-parser\tinystr.cpp" />
<ClCompile Include="..\..\dialogxml\xml-parser\tinyxml.cpp" />
<ClCompile Include="..\..\dialogxml\xml-parser\tinyxmlerror.cpp" />
<ClCompile Include="..\..\dialogxml\xml-parser\tinyxmlparser.cpp" />
<ClCompile Include="..\..\tools\fileio.cpp" />
<ClCompile Include="..\..\tools\graphtool.cpp" />
<ClCompile Include="..\..\tools\gzstream\gzstream.cpp" />
<ClCompile Include="..\..\tools\map_parse.cpp" />
<ClCompile Include="..\..\tools\mathutil.cpp" />
<ClCompile Include="..\..\tools\porting.cpp" />
<ClCompile Include="..\..\tools\soundtool.cpp" />
<ClCompile Include="..\..\tools\specials_parse.cpp" />
<ClCompile Include="..\..\tools\tarball.cpp" />
<ClCompile Include="..\..\tools\undo.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{1347FE79-73BD-4176-9280-0FE39E3534E2}</ProjectGuid>
<RootNamespace>Common</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\tools\resmgr;..\..\tools\gzstream;..\..\tools;..\..\dialogxml\xml-parser;..\..\dialogxml;..\..\classes;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableLanguageExtensions>false</DisableLanguageExtensions>
<AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>opengl32.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;sfml-audio.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<NoEntryPoint>false</NoEntryPoint>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@@ -0,0 +1,326 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="DialogXML">
<UniqueIdentifier>{243e7be1-5ae2-447e-a151-1f024281fc3e}</UniqueIdentifier>
</Filter>
<Filter Include="Tools">
<UniqueIdentifier>{e57ca16d-7be8-4847-8a66-2255b728c9ac}</UniqueIdentifier>
</Filter>
<Filter Include="Classes">
<UniqueIdentifier>{f35d1cde-8f80-49ab-8f96-3fa8a44ce491}</UniqueIdentifier>
</Filter>
<Filter Include="Classes\Source Files">
<UniqueIdentifier>{606f67f8-5f1e-4b19-b417-0757fa8544ef}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="DialogXML\Source Files">
<UniqueIdentifier>{71426284-8f6d-42cb-8685-4d92d8e96879}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Tools\Source Files">
<UniqueIdentifier>{f41285d1-bf7b-4650-b2e5-0f816e52bac2}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Classes\Header Files">
<UniqueIdentifier>{28d415a1-e037-4a8b-bbdb-a6553b192bc3}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="DialogXML\Header Files">
<UniqueIdentifier>{17e8463f-156d-44db-9607-b2b5b0c426bb}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Tools\Header Files">
<UniqueIdentifier>{a6d8701d-a0e3-4429-8eec-3d0bad13c3f5}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="DialogXML\TinyXML">
<UniqueIdentifier>{b705522f-daf8-4db2-9cec-f5ae249e595e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\classes\creatlist.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\item.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\location.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\monster.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\outdoors.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\party.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\pc.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\regtown.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\scenario.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\shop.hpp">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\simpletypes.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\special.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\spell.hpp">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\talking.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\terrain.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\tmpltown.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\town.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\universe.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\classes\vehicle.h">
<Filter>Classes\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\xml-parser\ticpp.h">
<Filter>DialogXML\TinyXML</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\xml-parser\ticpprc.h">
<Filter>DialogXML\TinyXML</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\xml-parser\tinystr.h">
<Filter>DialogXML\TinyXML</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\xml-parser\tinyxml.h">
<Filter>DialogXML\TinyXML</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\button.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\control.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\dialog.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\dialog.keys.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\dlogutil.buttons.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\dlogutil.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\field.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\message.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\pict.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\scrollbar.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\dialogxml\stack.hpp">
<Filter>DialogXML\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\cursors.h">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\fileio.h">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\graphtool.h">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\map_parse.hpp">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\mathutil.h">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\porting.h">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\prefs.hpp">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\soundtool.h">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\special_parse.hpp">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\tarball.hpp">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\undo.h">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\vector2d.hpp">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\winutil.h">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\resmgr\resmgr.hpp">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\resmgr\restypes.hpp">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\tools\gzstream\gzstream.h">
<Filter>Tools\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\targetver.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\classes\creatlist.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\item.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\location.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\monster.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\outdoors.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\party.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\pc.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\regtown.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\scenario.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\shop.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\special.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\spell.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\talking.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\terrain.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\tmpltown.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\town.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\universe.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\classes\vehicle.cpp">
<Filter>Classes\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\xml-parser\ticpp.cpp">
<Filter>DialogXML\TinyXML</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\xml-parser\tinystr.cpp">
<Filter>DialogXML\TinyXML</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\xml-parser\tinyxml.cpp">
<Filter>DialogXML\TinyXML</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\xml-parser\tinyxmlerror.cpp">
<Filter>DialogXML\TinyXML</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\xml-parser\tinyxmlparser.cpp">
<Filter>DialogXML\TinyXML</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\button.cpp">
<Filter>DialogXML\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\control.cpp">
<Filter>DialogXML\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\dialog.cpp">
<Filter>DialogXML\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\dlogutil.cpp">
<Filter>DialogXML\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\field.cpp">
<Filter>DialogXML\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\message.cpp">
<Filter>DialogXML\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\pict.cpp">
<Filter>DialogXML\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\scrollbar.cpp">
<Filter>DialogXML\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dialogxml\stack.cpp">
<Filter>DialogXML\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tools\gzstream\gzstream.cpp">
<Filter>Tools\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tools\fileio.cpp">
<Filter>Tools\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tools\graphtool.cpp">
<Filter>Tools\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tools\map_parse.cpp">
<Filter>Tools\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tools\mathutil.cpp">
<Filter>Tools\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tools\porting.cpp">
<Filter>Tools\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tools\soundtool.cpp">
<Filter>Tools\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tools\specials_parse.cpp">
<Filter>Tools\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tools\tarball.cpp">
<Filter>Tools\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tools\undo.cpp">
<Filter>Tools\Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

Binary file not shown.

View File

@@ -0,0 +1,150 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{A0C19353-478B-4F21-9FE3-FA8EE4D15147}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>BladesofExile</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile />
<PrecompiledHeaderOutputFile />
<AdditionalIncludeDirectories>..\..\tools\resmgr;..\..\tools\gzstream;..\..\tools;..\..\dialogxml\xml-parser;..\..\dialogxml;..\..\classes;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>opengl32.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;sfml-audio.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\boe.actions.h" />
<ClInclude Include="..\..\boe.combat.h" />
<ClInclude Include="..\..\boe.consts.h" />
<ClInclude Include="..\..\boe.dlgutil.h" />
<ClInclude Include="..\..\boe.fileio.h" />
<ClInclude Include="..\..\boe.global.h" />
<ClInclude Include="..\..\boe.graphics.h" />
<ClInclude Include="..\..\boe.graphutil.h" />
<ClInclude Include="..\..\boe.infodlg.h" />
<ClInclude Include="..\..\boe.itemdata.h" />
<ClInclude Include="..\..\boe.items.h" />
<ClInclude Include="..\..\boe.locutils.h" />
<ClInclude Include="..\..\boe.main.h" />
<ClInclude Include="..\..\boe.menus.h" />
<ClInclude Include="..\..\boe.monster.h" />
<ClInclude Include="..\..\boe.newgraph.h" />
<ClInclude Include="..\..\boe.party.h" />
<ClInclude Include="..\..\boe.specials.h" />
<ClInclude Include="..\..\boe.startup.h" />
<ClInclude Include="..\..\boe.text.h" />
<ClInclude Include="..\..\boe.town.h" />
<ClInclude Include="..\..\boe.townspec.h" />
<ClInclude Include="Resource.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Blades of Exile.rc" />
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\Win32\game\Resources\BLADEXIL.ICO" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\boe.actions.cpp" />
<ClCompile Include="..\..\boe.combat.cpp" />
<ClCompile Include="..\..\boe.dlgutil.cpp" />
<ClCompile Include="..\..\boe.fileio.cpp" />
<ClCompile Include="..\..\boe.graphics.cpp" />
<ClCompile Include="..\..\boe.graphutil.cpp" />
<ClCompile Include="..\..\boe.infodlg.cpp" />
<ClCompile Include="..\..\boe.itemdata.cpp" />
<ClCompile Include="..\..\boe.items.cpp" />
<ClCompile Include="..\..\boe.locutils.cpp" />
<ClCompile Include="..\..\boe.main.cpp" />
<ClCompile Include="..\..\boe.monster.cpp" />
<ClCompile Include="..\..\boe.newgraph.cpp" />
<ClCompile Include="..\..\boe.party.cpp" />
<ClCompile Include="..\..\boe.specials.cpp" />
<ClCompile Include="..\..\boe.startup.cpp" />
<ClCompile Include="..\..\boe.text.cpp" />
<ClCompile Include="..\..\boe.town.cpp" />
<ClCompile Include="..\..\boe.townspec.cpp" />
<ClCompile Include="..\..\pcedit\pc.editors.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{1347fe79-73bd-4176-9280-0fe39e3534e2}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@@ -0,0 +1,163 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.actions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.combat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.consts.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.dlgutil.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.fileio.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.global.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.graphics.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.graphutil.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.infodlg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.itemdata.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.items.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.locutils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.main.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.menus.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.monster.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.newgraph.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.party.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.specials.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.startup.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.text.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.town.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\boe.townspec.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Blades of Exile.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\Win32\game\Resources\BLADEXIL.ICO">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\boe.actions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.combat.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.dlgutil.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.fileio.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.graphics.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.graphutil.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.infodlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.itemdata.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.items.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.locutils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.monster.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.newgraph.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.party.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.specials.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.startup.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.text.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.town.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\boe.townspec.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\pcedit\pc.editors.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@@ -0,0 +1,31 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by Blades of Exile.rc
//
#define IDS_APP_TITLE 103
#define IDR_MAINFRAME 128
#define IDD_BLADESOFEXILE_DIALOG 102
#define IDD_ABOUTBOX 103
#define IDM_ABOUT 104
#define IDM_EXIT 105
#define IDI_BLADESOFEXILE 107
#define IDI_SMALL 108
#define IDC_BLADESOFEXILE 109
#define IDC_MYICON 2
#ifndef IDC_STATIC
#define IDC_STATIC -1
#endif
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 130
#define _APS_NEXT_RESOURCE_VALUE 129
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 110
#endif
#endif

Binary file not shown.

View File

@@ -0,0 +1,116 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{3A6D88AD-45CD-4736-85F7-5E602ECB3D3C}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>CharEditor</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\tools\resmgr;..\..\tools\gzstream;..\..\tools;..\..\dialogxml\xml-parser;..\..\dialogxml;..\..\classes;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>opengl32.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;sfml-audio.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\pcedit\pc.action.cpp" />
<ClCompile Include="..\..\pcedit\pc.editors.cpp" />
<ClCompile Include="..\..\pcedit\pc.fileio.cpp" />
<ClCompile Include="..\..\pcedit\pc.graphics.cpp" />
<ClCompile Include="..\..\pcedit\pc.main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\pcedit\pc.action.h" />
<ClInclude Include="..\..\pcedit\pc.editors.h" />
<ClInclude Include="..\..\pcedit\pc.fileio.h" />
<ClInclude Include="..\..\pcedit\pc.global.h" />
<ClInclude Include="..\..\pcedit\pc.graphics.h" />
<ClInclude Include="..\..\pcedit\pc.menus.h" />
<ClInclude Include="resource.h" />
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\Win32\scenedit\BLSCENED.ICO" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{1347fe79-73bd-4176-9280-0fe39e3534e2}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Char Editor.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\pcedit\pc.action.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\pcedit\pc.editors.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\pcedit\pc.fileio.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\pcedit\pc.graphics.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\pcedit\pc.main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\pcedit\pc.action.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\pcedit\pc.editors.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\pcedit\pc.fileio.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\pcedit\pc.global.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\pcedit\pc.graphics.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\pcedit\pc.menus.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\Win32\scenedit\BLSCENED.ICO">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Char Editor.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,122 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{87C53CC0-ED7A-4BF8-8844-FCA34401C1CA}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ScenEditor</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\tools\resmgr;..\..\tools\gzstream;..\..\tools;..\..\dialogxml\xml-parser;..\..\dialogxml;..\..\classes;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>opengl32.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;sfml-audio.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Image Include="..\..\..\Win32\scenedit\BLSCENED.ICO" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\scenedit\scen.actions.cpp" />
<ClCompile Include="..\..\scenedit\scen.btnmg.cpp" />
<ClCompile Include="..\..\scenedit\scen.core.cpp" />
<ClCompile Include="..\..\scenedit\scen.fileio.cpp" />
<ClCompile Include="..\..\scenedit\scen.graphics.cpp" />
<ClCompile Include="..\..\scenedit\scen.keydlgs.cpp" />
<ClCompile Include="..\..\scenedit\scen.main.cpp" />
<ClCompile Include="..\..\scenedit\scen.townout.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\scenedit\scen.actions.h" />
<ClInclude Include="..\..\scenedit\scen.btnmg.h" />
<ClInclude Include="..\..\scenedit\scen.core.h" />
<ClInclude Include="..\..\scenedit\scen.fileio.h" />
<ClInclude Include="..\..\scenedit\scen.global.h" />
<ClInclude Include="..\..\scenedit\scen.graphics.h" />
<ClInclude Include="..\..\scenedit\scen.keydlgs.h" />
<ClInclude Include="..\..\scenedit\scen.menus.h" />
<ClInclude Include="..\..\scenedit\scen.townout.h" />
<ClInclude Include="resource.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{1347fe79-73bd-4176-9280-0fe39e3534e2}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Scen Editor.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\Win32\scenedit\BLSCENED.ICO">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\scenedit\scen.actions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\scenedit\scen.btnmg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\scenedit\scen.core.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\scenedit\scen.fileio.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\scenedit\scen.graphics.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\scenedit\scen.keydlgs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\scenedit\scen.main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\scenedit\scen.townout.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\scenedit\scen.actions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\scenedit\scen.btnmg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\scenedit\scen.core.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\scenedit\scen.fileio.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\scenedit\scen.global.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\scenedit\scen.graphics.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\scenedit\scen.keydlgs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\scenedit\scen.menus.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\scenedit\scen.townout.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Scen Editor.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

Binary file not shown.

View File

@@ -0,0 +1,6 @@
#pragma once
// This ensures functions unavailable in Windows XP will not be available at compile time
#define _WIN32_WINNT 0x0601
#include <SDKDDKVer.h>

View File

@@ -1292,7 +1292,7 @@ static void put_scen_info(cDialog& me) {
}
}
static static bool pick_a_scen_event_filter(cDialog& me, std::string item_hit, eKeyMod) {
static bool pick_a_scen_event_filter(cDialog& me, std::string item_hit, eKeyMod) {
if(item_hit == "cancel") {
me.setResult<short>(-1);
me.toast(false);

View File

@@ -147,7 +147,7 @@ void finish_load_party(){
loaded_yet = true;
// TODO: Why is this still a C-string?
strcpy (last_load_file, file_to_load.filename().c_str());
strcpy (last_load_file, file_to_load.filename().string().c_str());
store_file_reply = file_to_load;
add_string_to_buf("Load: Game loaded. ");
@@ -500,7 +500,7 @@ bool load_scenario_header(fs::path file/*,short header_entry*/){
bool mac_header = true;
// TODO: Rewrite using ifstream, or maybe ifstream_buf
FILE* file_id = fopen(file.c_str(), "rb");
FILE* file_id = fopen(file.string().c_str(), "rb");
if(file_id == NULL) {
return false;
}

View File

@@ -172,7 +172,7 @@ void adjust_window_mode() {
if(display_mode == 5) {
ul.x = 14; ul.y = 2;
mainPtr.create(sf::VideoMode(605,430,32), "Blades of Exile", sf::Style::Titlebar | sf::Style::Close, winSettings);
mainPtr.setPosition({(desktop.width - 605) / 2, (desktop.height - 430) / 2});
mainPtr.setPosition({static_cast<int>((desktop.width - 605) / 2), static_cast<int>((desktop.height - 430) / 2)});
r = rectangle(mainPtr);
}
else {

View File

@@ -1,5 +1,6 @@
#include <cstdio>
#include <map>
//#include "item.h"
@@ -29,9 +30,9 @@
short mage_spell_pos = 0,priest_spell_pos = 0,skill_pos = 0;
extern short skill_cost[20];
extern short skill_max[20];
extern short skill_g_cost[20];
extern std::map<eSkill,short> skill_cost;
extern std::map<eSkill,short> skill_max;
extern std::map<eSkill,short> skill_g_cost;
extern const char* skill_ids[19];
//extern party_record_type party;
extern short cur_town_talk_loaded;
@@ -138,19 +139,19 @@ void display_spells(eSkill mode,short force_spell,cDialog* parent) {
static void put_skill_info(cDialog& me) {
std::string store_text;
short pos;
eSkill pos;
pos = skill_pos;
pos = eSkill(skill_pos);
store_text = get_str("skills",pos * 2 + 1);
store_text = get_str("skills",skill_pos * 2 + 1);
me["name"].setText(store_text.c_str());
me["skp"].setTextToNum(skill_cost[pos]);
me["gold"].setTextToNum(skill_g_cost[pos]);
me["max"].setTextToNum(skill_max[pos]);
store_text = get_str("skills", pos * 2 + 2);
store_text = get_str("skills", skill_pos * 2 + 2);
me["desc"].setText(store_text);
store_text = get_str("tips", 1 + pos);
store_text = get_str("tips", 1 + skill_pos);
me["tips"].setText(store_text);
}

View File

@@ -2291,7 +2291,7 @@ eSpell pick_spell(short pc_num,eSkill type) { // 70 - no spell OW spell num
else key = {false, static_cast<unsigned char>('a' + i), mod_none};
cLed& led = dynamic_cast<cLed&>(castSpell[id]);
led.attachKey(key);
castSpell.addLabelFor(id, {i > 25 ? toupper(key.c) : key.c}, LABEL_LEFT, 8, true);
castSpell.addLabelFor(id, {static_cast<char>(i > 25 ? toupper(key.c) : key.c)}, LABEL_LEFT, 8, true);
led.setState((pc_can_cast_spell(pc_casting,cSpell::fromNum(type,on_which_spell_page == 0 ? i : spell_index[i])))
? led_red : led_green);
led.attachClickHandler(std::bind(pick_spell_select_led, _1, _2, _3, type, std::ref(dark), std::ref(former_spell)));

View File

@@ -39,6 +39,8 @@ public:
cCreature& operator[](size_t n);
const cCreature& operator[](size_t n) const;
cPopulation() : which_town(200) {}
// Apparently Visual Studio needs this to work
cPopulation& operator=(const cPopulation& other) = default;
};
#endif

View File

@@ -11,6 +11,7 @@
#include <iosfwd>
#include <string>
#include <functional>
#include "simpletypes.h"
#include "location.h"

View File

@@ -28,8 +28,9 @@ public:
public:
short personality,type;
char link1[4],link2[4];
short extras[4] = {-1,-1,-1,-1};
short extras[4];
std::string str1, str2;
cNode() {std::fill(extras, extras + 4, -1);}
};
unsigned char strlens[200];
cPersonality people[10];

View File

@@ -134,7 +134,8 @@ public:
void append(legacy::out_info_type& old);
ter_num_t(& operator [] (size_t i))[96];
typedef ter_num_t arr_96[96];
arr_96& operator [] (size_t i);
ter_num_t& operator [] (location loc);
void writeTo(std::ostream& file) const;
void readFrom(std::istream& file);

View File

@@ -178,8 +178,10 @@ template<> pair<string,cPict*> cDialog::parse(Element& who /*pict*/){
class dlogStringFilter : public boost::iterator_facade<dlogStringFilter, string::value_type, forward_iterator_tag, string::value_type> {
friend class boost::iterator_core_access;
public:
using value_type = std::string::value_type;
using iter_type = std::string::iterator;
private:
bool found_nl;
iter_type base;
bool equal(const dlogStringFilter& other) const {
@@ -834,7 +836,7 @@ void cDialog::loadFromFile(std::string path){
try{
printf("Loading dialog from: %s\n", cPath.c_str());
TiXmlBase::SetCondenseWhiteSpace(false);
Document xml(cPath.c_str());
Document xml(cPath.string().c_str());
xml.LoadFile();
Iterator<Attribute> attr;
@@ -1524,3 +1526,5 @@ cControl& cDialog::getControl(std::string id) {
}
throw std::invalid_argument(id + " does not exist in dialog " + fname);
}
const char*const xBadVal::CONTENT = "<content>";

View File

@@ -18,6 +18,7 @@
#include <map>
#include <vector>
#include <exception>
#include <functional>
#include "ticpp.h"
#include "dialog.keys.hpp"
@@ -258,7 +259,7 @@ class xBadVal : std::exception {
const char* msg;
public:
/// A magic value to indicate errors in an element's content, rather than an attribute's content.
static constexpr const char*const CONTENT = "<content>";
static const char*const CONTENT;
/// Construct a new exception.
/// @param t The tag name of the element with the invalid value.
/// @param n The name of the attribute with the invalid value.

View File

@@ -385,7 +385,7 @@ void cThreeChoice::init_buttons(cBasicButtonType btn1, cBasicButtonType btn2, cB
btn->attachKey(btns[i]->defaultKey);
btn->setText(btns[i]->label);
btn->setBtnType(btns[i]->type);
btn->attachClickHandler(std::bind(&cChoiceDlog::onClick,this,_1,_2));
btn->attachClickHandler(std::bind(&cThreeChoice::onClick,this,_1,_2));
switch(btns[i]->type){
case BTN_HELP:
cur_btn_rect.bottom = cur_btn_rect.top + 13;

View File

@@ -14,6 +14,7 @@
#include <string>
#include <vector>
#include <array>
#include <functional>
#include "graphtool.h" // for pic_num_t
#include "soundtool.h" // for snd_num_t

View File

@@ -68,8 +68,8 @@ std::map<ePicType,void(cPict::*)(short,rectangle)>& cPict::drawPict(){
}
void cPict::attachClickHandler(click_callback_t f) throw(){
if(f == NULL){
onClick = NULL;
if(f == nullptr){
onClick = nullptr;
clickable = false;
}else{
onClick = f;
@@ -82,7 +82,7 @@ void cPict::attachFocusHandler(focus_callback_t) throw(xHandlerNotSupported){
}
bool cPict::triggerClickHandler(cDialog& me, std::string id, eKeyMod mods){
if(onClick != NULL) return onClick(me,id,mods);
if(onClick != nullptr) return onClick(me,id,mods);
else return false;
}

View File

@@ -30,7 +30,7 @@ extern cUniverse univ;
//extern long ed_flag,ed_key;
extern sf::RenderWindow mainPtr;
extern bool file_in_mem;
extern fs::path file_in_mem;
//extern long register_flag;
extern sf::Texture pc_gworld;
@@ -63,7 +63,7 @@ bool handle_action(sf::Event event) {
the_point = {event.mouseButton.x, event.mouseButton.y};
if(!file_in_mem)
if(file_in_mem.empty())
return false;
for(i = 0; i < 6; i++)

View File

@@ -1,85 +0,0 @@
//#include <OSUtils.h>
#include <Carbon/Carbon.h>
#include "ed.global.h"
#include "math.h"
extern short give_delays;
short get_ran (short times,short min,short max)
{
long int store;
short i, to_ret = 0;
for (i = 1; i < times + 1; i++) {
store = Random();
to_ret = to_ret + min + (((store + 32767) * (max - min + 1)) / 65536);
}
return to_ret;
}
Boolean same_point(location p1,location p2)
{
if ((p1.x == p2.x) & (p1.y == p2.y))
return TRUE;
else return FALSE;
}
short move_to_zero(short val)
{
if (val < 0)
return val + 1;
if (val > 0)
return val - 1;
return val;
}
short max(short a,short b)
{
if (a > b)
return a;
else return b;
}
short min(short a,short b)
{
if (a < b)
return a;
else return b;
}
short minmax(short min,short max,short k)
{
if (k < min)
return min;
if (k > max)
return max;
return k;
}
short s_pow(short x,short y)
{
return (short) pow((double) x, (double) y);
}
short a_v(short x)
{
if (x < 0)
return (-1 * x);
else return x;
}
short ex_abs(short x)
{
if (x < 0)
return (-1 * x);
else return x;
}
void BoEpause(short length)
{
unsigned long dummy,len;
len = (unsigned long)length;
if (give_delays == 0)
Delay(len, &dummy);
}

View File

@@ -12,7 +12,7 @@
#include "fileio.h"
#include "dlogutil.hpp"
#import <fstream>
#include <fstream>
using std::endl;
#define DONE_BUTTON_ITEM 1

View File

@@ -454,7 +454,7 @@ void draw_lb_slot (short which,short mode) {
from_rect = blue_button_from;
if(mode > 0)
from_rect.offset(from_rect.right - from_rect.left,0);
rect_draw_some_item(editor_mixed,from_rect,left_buttons[which][1],(location){0,0});
rect_draw_some_item(editor_mixed,from_rect,left_buttons[which][1],location{0,0});
}
if(left_button_status[which] % 10 == 3)
text_rect.left += 16;

View File

@@ -430,12 +430,11 @@ static bool outdoor_details_event_filter(cDialog& me, std::string, eKeyMod) {
}
void outdoor_details() {
char temp_str[256];
cDialog out_dlg("edit-outdoor-details");
out_dlg["okay"].attachClickHandler(outdoor_details_event_filter);
snprintf(temp_str,256,"X = %d, Y = %d",cur_out.x,cur_out.y);
out_dlg["loc"].setText(temp_str);
std::ostringstream str_out;
str_out << "X = " << cur_out.x << ", Y = " << cur_out.y;
out_dlg["loc"].setText(str_out.str());
out_dlg["comment"].setText(current_terrain->comment);
out_dlg["name"].setText(current_terrain->out_name);

View File

@@ -9,6 +9,8 @@
#ifndef BOE_CURSORS_H
#define BOE_CURSORS_H
#include <string>
enum cursor_type {
wand_curs = 0,
eyedropper_curs = 1,
@@ -41,7 +43,7 @@ enum cursor_type {
class Cursor {
void* ptr;
public:
Cursor(const char* imgPath, float hotSpotX, float hotSpotY);
Cursor(std::string imgPath, float hotSpotX, float hotSpotY);
~Cursor();
void apply();
};

View File

@@ -98,7 +98,7 @@ bool load_scenario_v1(fs::path file_to_load, cScenario& scenario){
legacy::scenario_data_type *temp_scenario = new legacy::scenario_data_type;
legacy::scen_item_data_type *item_data = new legacy::scen_item_data_type;
// TODO: Convert this (and all the others in this file) to use C++ streams
FILE* file_id = fopen(file_to_load.c_str(),"rb");
FILE* file_id = fopen(file_to_load.string().c_str(),"rb");
if(file_id == NULL) {
// TODO: The third parameter to oopsError is supposed to specify whether we're in the scenario editor or the game, but I don't think this code knows that.
// TODO: Alternatively, nuke oopsError and just use giveError. It's more informative, anyway.
@@ -233,7 +233,7 @@ bool load_town_v1(fs::path scen_file, short which_town, cTown& the_town, legacy:
legacy::ave_tr_type ave_t;
legacy::tiny_tr_type tiny_t;
FILE* file_id = fopen(scen_file.c_str(), "rb");
FILE* file_id = fopen(scen_file.string().c_str(), "rb");
if(file_id == NULL) {
oopsError(14, 0, 0);
return false;
@@ -387,7 +387,7 @@ bool load_outdoors_v1(fs::path scen_file, location which_out,cOutdoors& the_out,
char temp_str[256];
legacy::outdoor_record_type store_out;
FILE* file_id = fopen(scen_file.c_str(), "rb");
FILE* file_id = fopen(scen_file.string().c_str(), "rb");
if(file_id == NULL) {
oopsError(32, 0, 0);
return false;
@@ -526,6 +526,7 @@ bool load_party(fs::path file_to_load, cUniverse& univ){
bool maps_there = false;
bool in_scen = false;
enum {old_mac, old_win, new_oboe, unknown} format;
typedef unsigned short ushort;
long len;
short vers,n;
@@ -544,7 +545,7 @@ bool load_party(fs::path file_to_load, cUniverse& univ){
};
// but if the first flag is 0x0B0E, we have a new-format save
// the three flags still follow that.
FILE* file_id = fopen(file_to_load.c_str(), "rb");
FILE* file_id = fopen(file_to_load.string().c_str(), "rb");
if(file_id == NULL) {
cChoiceDlog("load-game-fail").show();
return false;
@@ -783,7 +784,7 @@ bool load_party_v2(fs::path file_to_load, cUniverse& univ, bool town_restore, bo
fout.close();
}
igzstream zin(tempPath.c_str());
igzstream zin(tempPath.string().c_str());
tarball partyIn;
partyIn.readFrom(zin);
zin.close();
@@ -805,7 +806,7 @@ bool load_party_v2(fs::path file_to_load, cUniverse& univ, bool town_restore, bo
}
uint16_t magic;
fin.read((char*)&magic, 2);
fin.read((char*)&univ.party.setup, sizeof(cParty::setup));
fin.read((char*)&univ.party.setup, sizeof(univ.party.setup));
if(magic == 0x0E0B) // should be 0x0B0E!
for(auto& i : univ.party.setup)
for(auto& j : i)
@@ -886,7 +887,7 @@ bool save_party(fs::path dest_file, const cUniverse& univ) {
std::ostream& fout = partyOut.newFile("save/setup.dat");
static uint16_t magic = 0x0B0E;
fout.write((char*)&magic, 2);
fout.write((char*)&univ.party.setup, sizeof(cParty::setup));
fout.write((char*)&univ.party.setup, sizeof(univ.party.setup));
}
// Then write the data for each of the party members
@@ -928,7 +929,7 @@ bool save_party(fs::path dest_file, const cUniverse& univ) {
// Write out the compressed data
fs::path tempPath = tempDir/"savetemp.exg";
ogzstream zout(tempPath.c_str());
ogzstream zout(tempPath.string().c_str());
partyOut.writeTo(zout);
zout.close();

View File

@@ -12,6 +12,9 @@
#ifdef __APPLE__
#include <OpenGl/GL.h>
#else
#ifdef _WIN32
#include <Windows.h>
#endif
#include <GL/GL.h>
#endif
@@ -912,12 +915,12 @@ m_pic_index_t m_pic_index[] = {
};
// TODO: Put these classes in a header?
class Ellipse : public sf::Shape {
class EllipseShape : public sf::Shape {
float divSz;
int points;
float a, b;
public:
explicit Ellipse(sf::Vector2f size, unsigned int points = 30) : points(points) {
explicit EllipseShape(sf::Vector2f size, unsigned int points = 30) : points(points) {
a = size.x / 2.0f;
b = size.y / 2.0f;
divSz = 2 * pi<float>() / points;
@@ -936,12 +939,12 @@ public:
// TODO: Additional functions?
};
class RoundRect : public sf::Shape {
class RoundRectShape : public sf::Shape {
float divSz;
int points;
float w,h,r;
public:
RoundRect(sf::Vector2f size, float cornerRadius, unsigned int points = 32) : points(points / 4) {
RoundRectShape(sf::Vector2f size, float cornerRadius, unsigned int points = 32) : points(points / 4) {
w = size.x;
h = size.y;
r = cornerRadius;
@@ -1017,22 +1020,22 @@ void frame_rect(sf::RenderTarget& target, rectangle rect, sf::Color colour) {
}
void fill_roundrect(sf::RenderTarget& target, rectangle rect, int rad, sf::Color colour) {
RoundRect fill(sf::Vector2f(rect.width(), rect.height()), rad);
RoundRectShape fill(sf::Vector2f(rect.width(), rect.height()), rad);
fill_shape(target, fill, rect.left, rect.top, colour);
}
void frame_roundrect(sf::RenderTarget& target, rectangle rect, int rad, sf::Color colour) {
RoundRect frame(sf::Vector2f(rect.width(), rect.height()), rad);
RoundRectShape frame(sf::Vector2f(rect.width(), rect.height()), rad);
frame_shape(target, frame, rect.left, rect.top, colour);
}
void fill_circle(sf::RenderTarget& target, rectangle rect, sf::Color colour) {
Ellipse fill(sf::Vector2f(rect.width(), rect.height()));
EllipseShape fill(sf::Vector2f(rect.width(), rect.height()));
fill_shape(target, fill, rect.left, rect.top, colour);
}
void frame_circle(sf::RenderTarget& target, rectangle rect, sf::Color colour) {
Ellipse frame(sf::Vector2f(rect.width(), rect.height()));
EllipseShape frame(sf::Vector2f(rect.width(), rect.height()));
frame_shape(target, frame, rect.left, rect.top, colour);
}
@@ -1050,7 +1053,7 @@ void frame_region(sf::RenderWindow& target, Region& region, sf::Color colour) {
}
void Region::addEllipse(rectangle frame) {
Ellipse* ellipse = new Ellipse(sf::Vector2f(frame.width(), frame.height()));
EllipseShape* ellipse = new EllipseShape(sf::Vector2f(frame.width(), frame.height()));
ellipse->setFillColor(sf::Color::Black);
shapes.push_back(std::shared_ptr<sf::Shape>(ellipse));
}

View File

@@ -69,7 +69,7 @@ namespace ResMgr {
}
}
// TODO: Handle errors?
CursorRsrc* cur = new Cursor(fpath.c_str(),x,y);
CursorRsrc* cur = new Cursor(fpath.string(),x,y);
return cur;
throw xResMgrErr("Failed to load GIF cursor: " + fname);
}

View File

@@ -115,7 +115,7 @@ void play_sound(short which, short how_many_times) { // if < 0, play asynch
if(how_many_times > 1)
play_sound(which, how_many_times - 1);
// TODO: Since sounds are handled by SFML, all this Windows-specific code shouldn't be needed
#if defined(WIN32)
#if 0 //defined(WIN32)
short i,num_fails = 0;
char snd_name[30];
bool asyn = false,a_sound_did_get_played = false;
@@ -233,7 +233,7 @@ void play_sound(short which, short how_many_times) { // if < 0, play asynch
#endif
}
#ifdef WIN32
#if 0 //def WIN32
void kill_sound() {
sndPlaySound(NULL,0);
}
@@ -255,7 +255,7 @@ void flip_sound() {
}
#ifdef WIN32
#if 0 //def WIN32
void sound_pause(long len) {
long t1,t2;

View File

@@ -8,6 +8,8 @@
//#define BOOST_SPIRIT_DEBUG
#ifndef _MSC_VER // TODO: Figure out why this won't compile in Visual Studio
#include "special_parse.hpp"
#include <fstream>
@@ -18,6 +20,11 @@
#include "special.h"
#ifdef _MSC_VER
#define BOOST_PHOENIX_LIMIT 10
#define _VARIADIC_MAX 10
#endif
namespace ph = boost::phoenix;
qi::symbols<char, eSpecType> opcode;
@@ -229,3 +236,5 @@ void test_special_parse(std::string file) {
}
fout.close();
}
#endif

View File

@@ -8,6 +8,13 @@
#include "tarball.hpp"
#include <algorithm>
#include <cstdio>
#include <ctime>
#ifdef _MSC_VER
// For some bizarre reason, Visual Studio doesn't declare snprintf in <cstdio>
#define snprintf _snprintf_s
#endif
tarball::header_posix_ustar tarball::generateTarHeader(const std::string& fileName, unsigned long long fileSize, bool directory){
static_assert(sizeof(header_posix_ustar) == 512, "Uh-oh! Padding in the tarball header!");

View File

@@ -36,6 +36,13 @@ class tarball {
header_posix_ustar header;
std::string filename;
std::stringstream contents;
// This seems to be necessary to compile in Visual Studio
// Seemingly, stringstream is non-copyable.
tarfile() {}
tarfile(tarfile& other) {
contents.str("");
contents << other.contents.str();
}
};
std::deque<tarfile> files;
static header_posix_ustar generateTarHeader(const std::string& fileName, unsigned long long fileSize, bool directory=false);