Last active
December 12, 2015 08:19
-
-
Save Ghabry/4743323 to your computer and use it in GitHub Desktop.
Changes:
gitignore update;
new msvc project files;
Removed FileFinder DefaultFont() (and DEFAULT_FONTS in system.h) replaced by shinanonome;
std::fill_n replaced with std::fill (pls check if this is correct);
added copyright header to al_audio.h and sdl_audio.h;
SdlAudio must have public (not protected) inheritance -> compiler error;
Compile fix…
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| .gitignore | 14 - | |
| builds/.gitignore | 16 + | |
| builds/vs2010/EasyRPG.sln | 51 +- | |
| builds/vs2010/EasyRPG.vcxproj | 361 +++-------- | |
| builds/vs2010/EasyRPG.vcxproj.filters | 1058 +++++++++++++++------------------ | |
| src/filefinder.cpp | 27 - | |
| src/filefinder.h | 6 - | |
| src/input.cpp | 2 +- | |
| src/platform/al_audio.h | 16 + | |
| src/platform/sdl_audio.h | 18 +- | |
| src/rtp_table_bom.h | 62 +- | |
| src/sdl_ui.cpp | 2 +- | |
| src/system.h | 6 - | |
| 13 files changed, 658 insertions(+), 981 deletions(-) | |
| diff --git a/.gitignore b/.gitignore | |
| index 3fd1196..54846e0 100644 | |
| --- a/.gitignore | |
| +++ b/.gitignore | |
| @@ -1,20 +1,6 @@ | |
| /bin/ | |
| /doc/ | |
| /lib/readers | |
| -/builds/cmake/libEasyRPG_Player_Static.a | |
| -/builds/cmake/libsdl_test_main.a | |
| -/builds/vs2010/Debug* | |
| -/builds/vs2010/Release* | |
| -/builds/vs2010/*.suo | |
| -/builds/vs2010/*.user | |
| -/builds/vs2010/*.*sdf | |
| -/builds/vs2010/ipch/ | |
| -/builds/psp/PARAM.SFO | |
| -/builds/psp/EBOOT.PBP | |
| -/builds/psp/EasyRPG.elf | |
| -/builds/wii/obj | |
| -/builds/wii/*.elf | |
| -/builds/wii/*.dol | |
| CMakeCache.txt | |
| CMakeFiles/ | |
| *.cmake | |
| diff --git a/builds/.gitignore b/builds/.gitignore | |
| index 95d9f29..6173d31 100644 | |
| --- a/builds/.gitignore | |
| +++ b/builds/.gitignore | |
| @@ -7,3 +7,19 @@ | |
| /mingw/mingw | |
| /mingw/Player.exe | |
| + | |
| +/cmake/libEasyRPG_Player_Static.a | |
| +/cmake/libsdl_test_main.a | |
| +/vs2010/Debug* | |
| +/vs2010/Release* | |
| +/vs2010/*.suo | |
| +/vs2010/*.user | |
| +/vs2010/*.*sdf | |
| +/vs2010/ipch/ | |
| +/vs2010/x64/ | |
| +/psp/PARAM.SFO | |
| +/psp/EBOOT.PBP | |
| +/psp/EasyRPG.elf | |
| +/wii/obj | |
| +/wii/*.elf | |
| +/wii/*.dol | |
| diff --git a/builds/vs2010/EasyRPG.sln b/builds/vs2010/EasyRPG.sln | |
| index 879ffdb..54c3891 100644 | |
| --- a/builds/vs2010/EasyRPG.sln | |
| +++ b/builds/vs2010/EasyRPG.sln | |
| @@ -1,7 +1,7 @@ | |
| | |
| Microsoft Visual Studio Solution File, Format Version 11.00 | |
| # Visual Studio 2010 | |
| -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EasyRPG", "EasyRPG.vcxproj", "{BDAFF2D9-EC6B-4D53-8857-3F1064252322}" | |
| +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EasyRPG", "EasyRPG.vcxproj", "{9B294371-4E85-42E0-95C8-39DF9573D69D}" | |
| ProjectSection(ProjectDependencies) = postProject | |
| {D892967A-6B8E-4AC5-9D38-785D748796D0} = {D892967A-6B8E-4AC5-9D38-785D748796D0} | |
| EndProjectSection | |
| @@ -10,43 +10,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "readers", "..\..\lib\reader | |
| EndProject | |
| Global | |
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | |
| - Debug Pixman|Win32 = Debug Pixman|Win32 | |
| - Debug SDL|Win32 = Debug SDL|Win32 | |
| - Debug SoftBitmap|Win32 = Debug SoftBitmap|Win32 | |
| - Release Pixman|Win32 = Release Pixman|Win32 | |
| - Release SDL|Win32 = Release SDL|Win32 | |
| - Release SoftBitmap|Win32 = Release SoftBitmap|Win32 | |
| + Debug|Win32 = Debug|Win32 | |
| + Debug|x64 = Debug|x64 | |
| Release|Win32 = Release|Win32 | |
| + Release|x64 = Release|x64 | |
| EndGlobalSection | |
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Debug Pixman|Win32.ActiveCfg = Debug Pixman|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Debug Pixman|Win32.Build.0 = Debug Pixman|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Debug SDL|Win32.ActiveCfg = Debug SDL|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Debug SDL|Win32.Build.0 = Debug SDL|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Debug SoftBitmap|Win32.ActiveCfg = Debug SoftBitmap|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Debug SoftBitmap|Win32.Build.0 = Debug SoftBitmap|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Release Pixman|Win32.ActiveCfg = Release Pixman|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Release Pixman|Win32.Build.0 = Release Pixman|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Release SDL|Win32.ActiveCfg = Release SDL|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Release SDL|Win32.Build.0 = Release SDL|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Release SoftBitmap|Win32.ActiveCfg = Release SoftBitmap|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Release SoftBitmap|Win32.Build.0 = Release SoftBitmap|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Release|Win32.ActiveCfg = Release|Win32 | |
| - {BDAFF2D9-EC6B-4D53-8857-3F1064252322}.Release|Win32.Build.0 = Release|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Debug Pixman|Win32.ActiveCfg = Debug|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Debug Pixman|Win32.Build.0 = Debug|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Debug SDL|Win32.ActiveCfg = Debug|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Debug SDL|Win32.Build.0 = Debug|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Debug SoftBitmap|Win32.ActiveCfg = Debug|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Debug SoftBitmap|Win32.Build.0 = Debug|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Release Pixman|Win32.ActiveCfg = Release|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Release Pixman|Win32.Build.0 = Release|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Release SDL|Win32.ActiveCfg = Release|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Release SDL|Win32.Build.0 = Release|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Release SoftBitmap|Win32.ActiveCfg = Release|Win32 | |
| - {D892967A-6B8E-4AC5-9D38-785D748796D0}.Release SoftBitmap|Win32.Build.0 = Release|Win32 | |
| + {9B294371-4E85-42E0-95C8-39DF9573D69D}.Debug|Win32.ActiveCfg = Debug|Win32 | |
| + {9B294371-4E85-42E0-95C8-39DF9573D69D}.Debug|Win32.Build.0 = Debug|Win32 | |
| + {9B294371-4E85-42E0-95C8-39DF9573D69D}.Debug|x64.ActiveCfg = Debug|x64 | |
| + {9B294371-4E85-42E0-95C8-39DF9573D69D}.Debug|x64.Build.0 = Debug|x64 | |
| + {9B294371-4E85-42E0-95C8-39DF9573D69D}.Release|Win32.ActiveCfg = Release|Win32 | |
| + {9B294371-4E85-42E0-95C8-39DF9573D69D}.Release|Win32.Build.0 = Release|Win32 | |
| + {9B294371-4E85-42E0-95C8-39DF9573D69D}.Release|x64.ActiveCfg = Release|x64 | |
| + {9B294371-4E85-42E0-95C8-39DF9573D69D}.Release|x64.Build.0 = Release|x64 | |
| + {D892967A-6B8E-4AC5-9D38-785D748796D0}.Debug|Win32.ActiveCfg = Debug|Win32 | |
| + {D892967A-6B8E-4AC5-9D38-785D748796D0}.Debug|Win32.Build.0 = Debug|Win32 | |
| + {D892967A-6B8E-4AC5-9D38-785D748796D0}.Debug|x64.ActiveCfg = Debug|x64 | |
| + {D892967A-6B8E-4AC5-9D38-785D748796D0}.Debug|x64.Build.0 = Debug|x64 | |
| {D892967A-6B8E-4AC5-9D38-785D748796D0}.Release|Win32.ActiveCfg = Release|Win32 | |
| {D892967A-6B8E-4AC5-9D38-785D748796D0}.Release|Win32.Build.0 = Release|Win32 | |
| + {D892967A-6B8E-4AC5-9D38-785D748796D0}.Release|x64.ActiveCfg = Release|x64 | |
| + {D892967A-6B8E-4AC5-9D38-785D748796D0}.Release|x64.Build.0 = Release|x64 | |
| EndGlobalSection | |
| GlobalSection(SolutionProperties) = preSolution | |
| HideSolutionNode = FALSE | |
| diff --git a/builds/vs2010/EasyRPG.vcxproj b/builds/vs2010/EasyRPG.vcxproj | |
| index 0328b07..322ce62 100644 | |
| --- a/builds/vs2010/EasyRPG.vcxproj | |
| +++ b/builds/vs2010/EasyRPG.vcxproj | |
| @@ -1,366 +1,176 @@ | |
| <?xml version="1.0" encoding="utf-8"?> | |
| <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |
| <ItemGroup Label="ProjectConfigurations"> | |
| - <ProjectConfiguration Include="Debug Pixman|Win32"> | |
| - <Configuration>Debug Pixman</Configuration> | |
| + <ProjectConfiguration Include="Debug|Win32"> | |
| + <Configuration>Debug</Configuration> | |
| <Platform>Win32</Platform> | |
| </ProjectConfiguration> | |
| - <ProjectConfiguration Include="Debug SoftBitmap|Win32"> | |
| - <Configuration>Debug SoftBitmap</Configuration> | |
| - <Platform>Win32</Platform> | |
| - </ProjectConfiguration> | |
| - <ProjectConfiguration Include="Debug SDL|Win32"> | |
| - <Configuration>Debug SDL</Configuration> | |
| - <Platform>Win32</Platform> | |
| - </ProjectConfiguration> | |
| - <ProjectConfiguration Include="Release Pixman|Win32"> | |
| - <Configuration>Release Pixman</Configuration> | |
| - <Platform>Win32</Platform> | |
| - </ProjectConfiguration> | |
| - <ProjectConfiguration Include="Release SoftBitmap|Win32"> | |
| - <Configuration>Release SoftBitmap</Configuration> | |
| - <Platform>Win32</Platform> | |
| - </ProjectConfiguration> | |
| - <ProjectConfiguration Include="Release SDL|Win32"> | |
| - <Configuration>Release SDL</Configuration> | |
| - <Platform>Win32</Platform> | |
| + <ProjectConfiguration Include="Debug|x64"> | |
| + <Configuration>Debug</Configuration> | |
| + <Platform>x64</Platform> | |
| </ProjectConfiguration> | |
| <ProjectConfiguration Include="Release|Win32"> | |
| <Configuration>Release</Configuration> | |
| <Platform>Win32</Platform> | |
| </ProjectConfiguration> | |
| + <ProjectConfiguration Include="Release|x64"> | |
| + <Configuration>Release</Configuration> | |
| + <Platform>x64</Platform> | |
| + </ProjectConfiguration> | |
| </ItemGroup> | |
| <PropertyGroup Label="Globals"> | |
| - <ProjectGuid>{BDAFF2D9-EC6B-4D53-8857-3F1064252322}</ProjectGuid> | |
| - <Keyword>Win32Proj</Keyword> | |
| + <ProjectGuid>{9B294371-4E85-42E0-95C8-39DF9573D69D}</ProjectGuid> | |
| <RootNamespace>EasyRPG</RootNamespace> | |
| </PropertyGroup> | |
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug SDL|Win32'" Label="Configuration"> | |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
| <ConfigurationType>Application</ConfigurationType> | |
| <UseDebugLibraries>true</UseDebugLibraries> | |
| <CharacterSet>Unicode</CharacterSet> | |
| - <PlatformToolset>v100</PlatformToolset> | |
| </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Pixman|Win32'" Label="Configuration"> | |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
| <ConfigurationType>Application</ConfigurationType> | |
| <UseDebugLibraries>true</UseDebugLibraries> | |
| <CharacterSet>Unicode</CharacterSet> | |
| - <PlatformToolset>v100</PlatformToolset> | |
| - </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug SoftBitmap|Win32'" Label="Configuration"> | |
| - <ConfigurationType>Application</ConfigurationType> | |
| - <UseDebugLibraries>true</UseDebugLibraries> | |
| - <CharacterSet>Unicode</CharacterSet> | |
| - <PlatformToolset>v100</PlatformToolset> | |
| - </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release SDL|Win32'" Label="Configuration"> | |
| - <ConfigurationType>Application</ConfigurationType> | |
| - <UseDebugLibraries>false</UseDebugLibraries> | |
| - <WholeProgramOptimization>true</WholeProgramOptimization> | |
| - <CharacterSet>Unicode</CharacterSet> | |
| - <PlatformToolset>v100</PlatformToolset> | |
| - </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Pixman|Win32'" Label="Configuration"> | |
| - <ConfigurationType>Application</ConfigurationType> | |
| - <UseDebugLibraries>false</UseDebugLibraries> | |
| - <WholeProgramOptimization>true</WholeProgramOptimization> | |
| - <CharacterSet>Unicode</CharacterSet> | |
| - <PlatformToolset>v100</PlatformToolset> | |
| </PropertyGroup> | |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | |
| <ConfigurationType>Application</ConfigurationType> | |
| <UseDebugLibraries>false</UseDebugLibraries> | |
| <WholeProgramOptimization>true</WholeProgramOptimization> | |
| <CharacterSet>Unicode</CharacterSet> | |
| - <PlatformToolset>v100</PlatformToolset> | |
| </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release SoftBitmap|Win32'" Label="Configuration"> | |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
| <ConfigurationType>Application</ConfigurationType> | |
| <UseDebugLibraries>false</UseDebugLibraries> | |
| <WholeProgramOptimization>true</WholeProgramOptimization> | |
| <CharacterSet>Unicode</CharacterSet> | |
| - <PlatformToolset>v100</PlatformToolset> | |
| </PropertyGroup> | |
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |
| <ImportGroup Label="ExtensionSettings"> | |
| </ImportGroup> | |
| - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug SDL|Win32'"> | |
| - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
| - </ImportGroup> | |
| - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Pixman|Win32'" Label="PropertySheets"> | |
| + <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 Condition="'$(Configuration)|$(Platform)'=='Debug SoftBitmap|Win32'" Label="PropertySheets"> | |
| + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
| <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 SDL|Win32'"> | |
| + <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> | |
| - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Pixman|Win32'" Label="PropertySheets"> | |
| - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
| - </ImportGroup> | |
| - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | |
| - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
| - </ImportGroup> | |
| - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release SoftBitmap|Win32'" Label="PropertySheets"> | |
| + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
| <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 SDL|Win32'"> | |
| - <LinkIncremental>true</LinkIncremental> | |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |
| <OutDir>..\..\bin\</OutDir> | |
| <TargetName>PlayerD</TargetName> | |
| - <SourcePath>$(SourcePath)</SourcePath> | |
| - </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Pixman|Win32'"> | |
| <LinkIncremental>true</LinkIncremental> | |
| - <OutDir>..\..\bin\</OutDir> | |
| - <TargetName>PlayerD</TargetName> | |
| - <SourcePath>$(SourcePath)</SourcePath> | |
| </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug SoftBitmap|Win32'"> | |
| - <LinkIncremental>true</LinkIncremental> | |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
| <OutDir>..\..\bin\</OutDir> | |
| - <TargetName>PlayerD</TargetName> | |
| - <SourcePath>$(SourcePath)</SourcePath> | |
| + <TargetName>Player64D</TargetName> | |
| + <LinkIncremental>true</LinkIncremental> | |
| </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release SDL|Win32'"> | |
| - <LinkIncremental>false</LinkIncremental> | |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
| <OutDir>..\..\bin\</OutDir> | |
| <TargetName>Player</TargetName> | |
| - </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Pixman|Win32'"> | |
| <LinkIncremental>false</LinkIncremental> | |
| - <OutDir>..\..\bin\</OutDir> | |
| - <TargetName>Player</TargetName> | |
| </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
| - <LinkIncremental>false</LinkIncremental> | |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
| <OutDir>..\..\bin\</OutDir> | |
| - <TargetName>Player</TargetName> | |
| - </PropertyGroup> | |
| - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release SoftBitmap|Win32'"> | |
| + <TargetName>Player64</TargetName> | |
| <LinkIncremental>false</LinkIncremental> | |
| - <OutDir>..\..\bin\</OutDir> | |
| - <TargetName>Player</TargetName> | |
| </PropertyGroup> | |
| - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug SDL|Win32'"> | |
| + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |
| <ClCompile> | |
| - <PrecompiledHeader> | |
| - </PrecompiledHeader> | |
| <WarningLevel>Level4</WarningLevel> | |
| <Optimization>Disabled</Optimization> | |
| - <PreprocessorDefinitions>MSVC;USE_SDL;DEBUG;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <AdditionalIncludeDirectories>..\..\lib\readers\include;$(EASYDEV_MSVC)\include</AdditionalIncludeDirectories> | |
| <MultiProcessorCompilation>true</MultiProcessorCompilation> | |
| - <DisableSpecificWarnings>4996;4100;4512</DisableSpecificWarnings> | |
| - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |
| - <BufferSecurityCheck>false</BufferSecurityCheck> | |
| - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | |
| + <PreprocessorDefinitions>MSVC;USE_SDL;HAVE_SDL_MIXER;XML_STATIC;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>false</MinimalRebuild> | |
| - </ClCompile> | |
| - <Link> | |
| - <SubSystem>Console</SubSystem> | |
| - <GenerateDebugInformation>true</GenerateDebugInformation> | |
| - <AdditionalLibraryDirectories>$(EASYDEV_MSVC)\lib\debug;..\..\lib\readers\lib\debug</AdditionalLibraryDirectories> | |
| - <AdditionalDependencies>readers.lib;libexpat.lib;dxguid.lib;winmm.lib;SDL.lib;SDLmain.lib;zlib.lib;SDL_image.lib;libpng.lib;jpeg.lib;freetype.lib;SDL_ttf.lib;SDL_gfx.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;native_midi.lib;smpeg.lib;SDL_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| - <IgnoreSpecificDefaultLibraries> | |
| - </IgnoreSpecificDefaultLibraries> | |
| - <IgnoreAllDefaultLibraries> | |
| - </IgnoreAllDefaultLibraries> | |
| - <Profile>false</Profile> | |
| - </Link> | |
| - </ItemDefinitionGroup> | |
| - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Pixman|Win32'"> | |
| - <ClCompile> | |
| - <PrecompiledHeader> | |
| - </PrecompiledHeader> | |
| - <WarningLevel>Level4</WarningLevel> | |
| - <Optimization>Disabled</Optimization> | |
| - <PreprocessorDefinitions>MSVC;USE_SDL;DEBUG;USE_PIXMAN_BITMAP;USE_ALPHA;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| - <AdditionalIncludeDirectories>..\..\lib\readers\include;$(EASYDEV_MSVC)\include</AdditionalIncludeDirectories> | |
| - <MultiProcessorCompilation>true</MultiProcessorCompilation> | |
| - <DisableSpecificWarnings>4996;4100;4512</DisableSpecificWarnings> | |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |
| - <BufferSecurityCheck>false</BufferSecurityCheck> | |
| - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | |
| - <MinimalRebuild>false</MinimalRebuild> | |
| + <DisableSpecificWarnings>4996;4512</DisableSpecificWarnings> | |
| </ClCompile> | |
| <Link> | |
| - <SubSystem>Console</SubSystem> | |
| <GenerateDebugInformation>true</GenerateDebugInformation> | |
| - <AdditionalLibraryDirectories>$(EASYDEV_MSVC)\lib\debug;..\..\lib\readers\lib\debug</AdditionalLibraryDirectories> | |
| - <AdditionalDependencies>readers.lib;libexpat.lib;dxguid.lib;winmm.lib;SDL.lib;SDLmain.lib;zlib.lib;SDL_image.lib;libpng.lib;jpeg.lib;freetype.lib;SDL_ttf.lib;SDL_gfx.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;native_midi.lib;smpeg.lib;SDL_mixer.lib;pixman-1.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| - <IgnoreSpecificDefaultLibraries> | |
| - </IgnoreSpecificDefaultLibraries> | |
| - <IgnoreAllDefaultLibraries> | |
| - </IgnoreAllDefaultLibraries> | |
| - <Profile>false</Profile> | |
| + <AdditionalLibraryDirectories>..\..\lib\readers\lib\debug;$(EASYDEV_MSVC)\lib\$(PlatformShortName)\debug</AdditionalLibraryDirectories> | |
| + <AdditionalDependencies>freetype.lib;jpeg.lib;libexpat.lib;libmad.lib;libogg.lib;libpng.lib;libvorbis.lib;libvorbisfile.lib;mikmod.lib;native_midi.lib;SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;SDL_ttf.lib;shinonome.lib;zlib.lib;winmm.lib;dxguid.lib;pixman.lib;readers.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| + <SubSystem>Console</SubSystem> | |
| </Link> | |
| </ItemDefinitionGroup> | |
| - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug SoftBitmap|Win32'"> | |
| + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
| <ClCompile> | |
| - <PrecompiledHeader> | |
| - </PrecompiledHeader> | |
| <WarningLevel>Level4</WarningLevel> | |
| <Optimization>Disabled</Optimization> | |
| - <PreprocessorDefinitions>MSVC;USE_SDL;DEBUG;USE_SOFT_BITMAP;USE_ALPHA;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <AdditionalIncludeDirectories>..\..\lib\readers\include;$(EASYDEV_MSVC)\include</AdditionalIncludeDirectories> | |
| <MultiProcessorCompilation>true</MultiProcessorCompilation> | |
| - <DisableSpecificWarnings>4996;4100;4512</DisableSpecificWarnings> | |
| - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |
| - <BufferSecurityCheck>false</BufferSecurityCheck> | |
| - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | |
| + <PreprocessorDefinitions>MSVC;USE_SDL;HAVE_SDL_MIXER;XML_STATIC;_WIN64;_AMD64_;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>false</MinimalRebuild> | |
| - </ClCompile> | |
| - <Link> | |
| - <SubSystem>Console</SubSystem> | |
| - <GenerateDebugInformation>true</GenerateDebugInformation> | |
| - <AdditionalLibraryDirectories>$(EASYDEV_MSVC)\lib\debug;..\..\lib\readers\lib\debug</AdditionalLibraryDirectories> | |
| - <AdditionalDependencies>readers.lib;libexpat.lib;dxguid.lib;winmm.lib;SDL.lib;SDLmain.lib;zlib.lib;SDL_image.lib;libpng.lib;jpeg.lib;freetype.lib;SDL_ttf.lib;SDL_gfx.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;native_midi.lib;smpeg.lib;SDL_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| - <IgnoreSpecificDefaultLibraries> | |
| - </IgnoreSpecificDefaultLibraries> | |
| - <IgnoreAllDefaultLibraries> | |
| - </IgnoreAllDefaultLibraries> | |
| - <Profile>false</Profile> | |
| - </Link> | |
| - </ItemDefinitionGroup> | |
| - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release SDL|Win32'"> | |
| - <ClCompile> | |
| - <WarningLevel>Level4</WarningLevel> | |
| - <PrecompiledHeader> | |
| - </PrecompiledHeader> | |
| - <Optimization>MaxSpeed</Optimization> | |
| - <FunctionLevelLinking>true</FunctionLevelLinking> | |
| - <IntrinsicFunctions>true</IntrinsicFunctions> | |
| - <PreprocessorDefinitions>MSVC;USE_SDL;_HAS_EXCEPTIONS=0;NDEBUG;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| - <AdditionalIncludeDirectories>..\..\lib\readers\include;$(EASYDEV_MSVC)\include</AdditionalIncludeDirectories> | |
| - <MultiProcessorCompilation>true</MultiProcessorCompilation> | |
| + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |
| <DisableSpecificWarnings>4996;4512</DisableSpecificWarnings> | |
| - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
| - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | |
| - <BufferSecurityCheck>false</BufferSecurityCheck> | |
| - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
| - <MinimalRebuild>false</MinimalRebuild> | |
| - <ExceptionHandling>false</ExceptionHandling> | |
| - <RuntimeTypeInfo>false</RuntimeTypeInfo> | |
| </ClCompile> | |
| <Link> | |
| - <SubSystem>Windows</SubSystem> | |
| <GenerateDebugInformation>true</GenerateDebugInformation> | |
| - <EnableCOMDATFolding>true</EnableCOMDATFolding> | |
| - <OptimizeReferences>true</OptimizeReferences> | |
| - <AdditionalLibraryDirectories>$(EASYDEV_MSVC)\lib\release;..\..\lib\readers\lib\release</AdditionalLibraryDirectories> | |
| - <AdditionalDependencies>readers.lib;libexpat.lib;dxguid.lib;winmm.lib;SDL.lib;SDLmain.lib;zlib.lib;SDL_image.lib;libpng.lib;freetype.lib;SDL_ttf.lib;SDL_gfx.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;native_midi.lib;jpeg.lib;smpeg.lib;SDL_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| - <IgnoreSpecificDefaultLibraries> | |
| - </IgnoreSpecificDefaultLibraries> | |
| + <AdditionalLibraryDirectories>..\..\lib\readers\lib\debug;$(EASYDEV_MSVC)\lib\$(PlatformShortName)\debug</AdditionalLibraryDirectories> | |
| + <AdditionalDependencies>freetype.lib;jpeg.lib;libexpat.lib;libmad.lib;libogg.lib;libpng.lib;libvorbis.lib;libvorbisfile.lib;mikmod.lib;native_midi.lib;SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;SDL_ttf.lib;shinonome.lib;zlib.lib;winmm.lib;dxguid.lib;pixman.lib;readers64.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| + <SubSystem>Console</SubSystem> | |
| </Link> | |
| </ItemDefinitionGroup> | |
| - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Pixman|Win32'"> | |
| + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
| <ClCompile> | |
| <WarningLevel>Level4</WarningLevel> | |
| - <PrecompiledHeader> | |
| - </PrecompiledHeader> | |
| <Optimization>MaxSpeed</Optimization> | |
| <FunctionLevelLinking>true</FunctionLevelLinking> | |
| <IntrinsicFunctions>true</IntrinsicFunctions> | |
| - <PreprocessorDefinitions>MSVC;USE_SDL;_HAS_EXCEPTIONS=0;NDEBUG;USE_PIXMAN_BITMAP;USE_ALPHA;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <AdditionalIncludeDirectories>..\..\lib\readers\include;$(EASYDEV_MSVC)\include</AdditionalIncludeDirectories> | |
| + <DebugInformationFormat>OldStyle</DebugInformationFormat> | |
| <MultiProcessorCompilation>true</MultiProcessorCompilation> | |
| - <DisableSpecificWarnings>4996;4512;4100</DisableSpecificWarnings> | |
| - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
| - <FavorSizeOrSpeed> | |
| - </FavorSizeOrSpeed> | |
| - <BufferSecurityCheck>false</BufferSecurityCheck> | |
| - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
| + <PreprocessorDefinitions>MSVC;USE_SDL;HAVE_SDL_MIXER;XML_STATIC;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>false</MinimalRebuild> | |
| - <ExceptionHandling>false</ExceptionHandling> | |
| - <RuntimeTypeInfo>false</RuntimeTypeInfo> | |
| + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
| + <DisableSpecificWarnings>4996;4512</DisableSpecificWarnings> | |
| </ClCompile> | |
| <Link> | |
| - <SubSystem>Windows</SubSystem> | |
| <GenerateDebugInformation>true</GenerateDebugInformation> | |
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | |
| <OptimizeReferences>true</OptimizeReferences> | |
| - <AdditionalLibraryDirectories>$(EASYDEV_MSVC)\lib\release;..\..\lib\readers\lib\release</AdditionalLibraryDirectories> | |
| - <AdditionalDependencies>readers.lib;libexpat.lib;dxguid.lib;winmm.lib;SDL.lib;SDLmain.lib;zlib.lib;libpng.lib;freetype.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;native_midi.lib;jpeg.lib;smpeg.lib;SDL_mixer.lib;pixman-1.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| - <IgnoreSpecificDefaultLibraries> | |
| - </IgnoreSpecificDefaultLibraries> | |
| - <Profile>true</Profile> | |
| - </Link> | |
| - </ItemDefinitionGroup> | |
| - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
| - <ClCompile> | |
| - <WarningLevel>Level4</WarningLevel> | |
| - <PrecompiledHeader> | |
| - </PrecompiledHeader> | |
| - <Optimization>MaxSpeed</Optimization> | |
| - <FunctionLevelLinking>true</FunctionLevelLinking> | |
| - <IntrinsicFunctions>true</IntrinsicFunctions> | |
| - <PreprocessorDefinitions>MSVC;USE_SDL;_HAS_EXCEPTIONS=0;NDEBUG;USE_PIXMAN_BITMAP;USE_ALPHA;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| - <AdditionalIncludeDirectories>..\..\lib\readers\include;$(EASYDEV_MSVC)\include</AdditionalIncludeDirectories> | |
| - <MultiProcessorCompilation>true</MultiProcessorCompilation> | |
| - <DisableSpecificWarnings>4996;4512;4100</DisableSpecificWarnings> | |
| - <DebugInformationFormat> | |
| - </DebugInformationFormat> | |
| - <FavorSizeOrSpeed> | |
| - </FavorSizeOrSpeed> | |
| - <BufferSecurityCheck>false</BufferSecurityCheck> | |
| - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
| - <MinimalRebuild>false</MinimalRebuild> | |
| - <ExceptionHandling>false</ExceptionHandling> | |
| - <RuntimeTypeInfo>false</RuntimeTypeInfo> | |
| - </ClCompile> | |
| - <Link> | |
| + <AdditionalLibraryDirectories>..\..\lib\readers\lib\release;$(EASYDEV_MSVC)\lib\$(PlatformShortName)\release</AdditionalLibraryDirectories> | |
| + <AdditionalDependencies>freetype.lib;jpeg.lib;libexpat.lib;libmad.lib;libogg.lib;libpng.lib;libvorbis.lib;libvorbisfile.lib;mikmod.lib;native_midi.lib;SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;SDL_ttf.lib;shinonome.lib;zlib.lib;winmm.lib;dxguid.lib;pixman.lib;readers.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| <SubSystem>Windows</SubSystem> | |
| - <GenerateDebugInformation>false</GenerateDebugInformation> | |
| - <EnableCOMDATFolding>true</EnableCOMDATFolding> | |
| - <OptimizeReferences>true</OptimizeReferences> | |
| - <AdditionalLibraryDirectories>$(EASYDEV_MSVC)\lib\release;..\..\lib\readers\lib\release</AdditionalLibraryDirectories> | |
| - <AdditionalDependencies>readers.lib;libexpat.lib;dxguid.lib;winmm.lib;SDL.lib;SDLmain.lib;zlib.lib;libpng.lib;freetype.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;native_midi.lib;jpeg.lib;smpeg.lib;SDL_mixer.lib;pixman-1.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| - <IgnoreSpecificDefaultLibraries> | |
| - </IgnoreSpecificDefaultLibraries> | |
| <Profile>true</Profile> | |
| </Link> | |
| </ItemDefinitionGroup> | |
| - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release SoftBitmap|Win32'"> | |
| + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
| <ClCompile> | |
| <WarningLevel>Level4</WarningLevel> | |
| - <PrecompiledHeader> | |
| - </PrecompiledHeader> | |
| <Optimization>MaxSpeed</Optimization> | |
| <FunctionLevelLinking>true</FunctionLevelLinking> | |
| <IntrinsicFunctions>true</IntrinsicFunctions> | |
| - <PreprocessorDefinitions>MSVC;USE_SDL;_HAS_EXCEPTIONS=0;NDEBUG;USE_SOFT_BITMAP;USE_ALPHA;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <AdditionalIncludeDirectories>..\..\lib\readers\include;$(EASYDEV_MSVC)\include</AdditionalIncludeDirectories> | |
| + <DebugInformationFormat>OldStyle</DebugInformationFormat> | |
| <MultiProcessorCompilation>true</MultiProcessorCompilation> | |
| - <DisableSpecificWarnings>4996;4512</DisableSpecificWarnings> | |
| - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
| - <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | |
| - <BufferSecurityCheck>false</BufferSecurityCheck> | |
| - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
| + <PreprocessorDefinitions>MSVC;USE_SDL;HAVE_SDL_MIXER;XML_STATIC;_WIN64;_AMD64_;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>false</MinimalRebuild> | |
| - <ExceptionHandling>false</ExceptionHandling> | |
| - <RuntimeTypeInfo>false</RuntimeTypeInfo> | |
| + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
| + <DisableSpecificWarnings>4996;4512</DisableSpecificWarnings> | |
| </ClCompile> | |
| <Link> | |
| - <SubSystem>Windows</SubSystem> | |
| <GenerateDebugInformation>true</GenerateDebugInformation> | |
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | |
| <OptimizeReferences>true</OptimizeReferences> | |
| - <AdditionalLibraryDirectories>$(EASYDEV_MSVC)\lib\release;..\..\lib\readers\lib\release</AdditionalLibraryDirectories> | |
| - <AdditionalDependencies>readers.lib;libexpat.lib;dxguid.lib;winmm.lib;SDL.lib;SDLmain.lib;zlib.lib;SDL_image.lib;libpng.lib;freetype.lib;SDL_ttf.lib;SDL_gfx.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;native_midi.lib;jpeg.lib;smpeg.lib;SDL_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| - <IgnoreSpecificDefaultLibraries> | |
| - </IgnoreSpecificDefaultLibraries> | |
| + <AdditionalLibraryDirectories>..\..\lib\readers\lib\release;$(EASYDEV_MSVC)\lib\$(PlatformShortName)\release</AdditionalLibraryDirectories> | |
| + <AdditionalDependencies>freetype.lib;jpeg.lib;libexpat.lib;libmad.lib;libogg.lib;libpng.lib;libvorbis.lib;libvorbisfile.lib;mikmod.lib;native_midi.lib;SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;SDL_ttf.lib;shinonome.lib;zlib.lib;winmm.lib;dxguid.lib;pixman.lib;readers64.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| + <SubSystem>Windows</SubSystem> | |
| + <Profile>true</Profile> | |
| </Link> | |
| </ItemDefinitionGroup> | |
| <ItemGroup> | |
| <ResourceCompile Include="..\..\resources\player.rc" /> | |
| </ItemGroup> | |
| <ItemGroup> | |
| + <ClCompile Include="..\..\src\al_audio.cpp" /> | |
| <ClCompile Include="..\..\src\audio.cpp" /> | |
| - <ClCompile Include="..\..\src\audio_stream.cpp" /> | |
| <ClCompile Include="..\..\src\background.cpp" /> | |
| <ClCompile Include="..\..\src\baseui.cpp" /> | |
| <ClCompile Include="..\..\src\battle_actions.cpp" /> | |
| @@ -371,16 +181,12 @@ | |
| <ClCompile Include="..\..\src\bitmap_screen.cpp" /> | |
| <ClCompile Include="..\..\src\bitmap_utils.cpp" /> | |
| <ClCompile Include="..\..\src\cache.cpp" /> | |
| - <ClCompile Include="..\..\src\channel.cpp" /> | |
| <ClCompile Include="..\..\src\color.cpp" /> | |
| <ClCompile Include="..\..\src\effects.cpp" /> | |
| - <ClCompile Include="..\..\src\filefinder_basic.cpp" /> | |
| - <ClCompile Include="..\..\src\filefinder_unix.cpp" /> | |
| - <ClCompile Include="..\..\src\filefinder_win.cpp" /> | |
| + <ClCompile Include="..\..\src\filefinder.cpp" /> | |
| <ClCompile Include="..\..\src\font.cpp" /> | |
| <ClCompile Include="..\..\src\font_pearl_8x8.cpp" /> | |
| <ClCompile Include="..\..\src\font_render_8x8.cpp" /> | |
| - <ClCompile Include="..\..\src\ftfont.cpp" /> | |
| <ClCompile Include="..\..\src\game_actor.cpp" /> | |
| <ClCompile Include="..\..\src\game_actors.cpp" /> | |
| <ClCompile Include="..\..\src\game_battle.cpp" /> | |
| @@ -389,6 +195,7 @@ | |
| <ClCompile Include="..\..\src\game_commonevent.cpp" /> | |
| <ClCompile Include="..\..\src\game_enemy.cpp" /> | |
| <ClCompile Include="..\..\src\game_event.cpp" /> | |
| + <ClCompile Include="..\..\src\game_interpreter.cpp" /> | |
| <ClCompile Include="..\..\src\game_interpreter_battle.cpp" /> | |
| <ClCompile Include="..\..\src\game_interpreter_map.cpp" /> | |
| <ClCompile Include="..\..\src\game_map.cpp" /> | |
| @@ -403,7 +210,6 @@ | |
| <ClCompile Include="..\..\src\game_troop.cpp" /> | |
| <ClCompile Include="..\..\src\game_unit.cpp" /> | |
| <ClCompile Include="..\..\src\game_vehicle.cpp" /> | |
| - <ClCompile Include="..\..\src\gl_bitmap_screen.cpp" /> | |
| <ClCompile Include="..\..\src\graphics.cpp" /> | |
| <ClCompile Include="..\..\src\hslrgb.cpp" /> | |
| <ClCompile Include="..\..\src\image_bmp.cpp" /> | |
| @@ -414,20 +220,15 @@ | |
| <ClCompile Include="..\..\src\input_buttons_desktop.cpp" /> | |
| <ClCompile Include="..\..\src\input_buttons_dingoo.cpp" /> | |
| <ClCompile Include="..\..\src\input_buttons_gekko.cpp" /> | |
| + <ClCompile Include="..\..\src\input_buttons_gph.cpp" /> | |
| <ClCompile Include="..\..\src\input_buttons_psp.cpp" /> | |
| - <ClCompile Include="..\..\src\game_interpreter.cpp" /> | |
| <ClCompile Include="..\..\src\main.cpp" /> | |
| <ClCompile Include="..\..\src\main_data.cpp" /> | |
| - <ClCompile Include="..\..\src\mixer.cpp" /> | |
| - <ClCompile Include="..\..\src\msgbox_win.cpp" /> | |
| <ClCompile Include="..\..\src\output.cpp" /> | |
| - <ClCompile Include="..\..\src\pixman_bitmap.cpp" /> | |
| - <ClCompile Include="..\..\src\pixman_bitmap_screen.cpp" /> | |
| <ClCompile Include="..\..\src\plane.cpp" /> | |
| <ClCompile Include="..\..\src\player.cpp" /> | |
| <ClCompile Include="..\..\src\rect.cpp" /> | |
| <ClCompile Include="..\..\src\registry_win.cpp" /> | |
| - <ClCompile Include="..\..\src\resampler.cpp" /> | |
| <ClCompile Include="..\..\src\scene.cpp" /> | |
| <ClCompile Include="..\..\src\scene_actortarget.cpp" /> | |
| <ClCompile Include="..\..\src\scene_battle.cpp" /> | |
| @@ -448,17 +249,10 @@ | |
| <ClCompile Include="..\..\src\scene_status.cpp" /> | |
| <ClCompile Include="..\..\src\scene_title.cpp" /> | |
| <ClCompile Include="..\..\src\sdl_audio.cpp" /> | |
| - <ClCompile Include="..\..\src\sdl_bitmap.cpp" /> | |
| - <ClCompile Include="..\..\src\sdl_bitmap_screen.cpp" /> | |
| - <ClCompile Include="..\..\src\sdl_font.cpp" /> | |
| - <ClCompile Include="..\..\src\sdl_time.cpp" /> | |
| <ClCompile Include="..\..\src\sdl_ui.cpp" /> | |
| - <ClCompile Include="..\..\src\soft_bitmap.cpp" /> | |
| - <ClCompile Include="..\..\src\soft_bitmap_screen.cpp" /> | |
| <ClCompile Include="..\..\src\sprite.cpp" /> | |
| <ClCompile Include="..\..\src\spriteset_map.cpp" /> | |
| <ClCompile Include="..\..\src\sprite_character.cpp" /> | |
| - <ClCompile Include="..\..\src\surface.cpp" /> | |
| <ClCompile Include="..\..\src\text.cpp" /> | |
| <ClCompile Include="..\..\src\tilemap.cpp" /> | |
| <ClCompile Include="..\..\src\tilemap_layer.cpp" /> | |
| @@ -483,18 +277,18 @@ | |
| <ClCompile Include="..\..\src\window_face.cpp" /> | |
| <ClCompile Include="..\..\src\window_gold.cpp" /> | |
| <ClCompile Include="..\..\src\window_help.cpp" /> | |
| + <ClCompile Include="..\..\src\window_item.cpp" /> | |
| <ClCompile Include="..\..\src\window_keyboard.cpp" /> | |
| + <ClCompile Include="..\..\src\window_menustatus.cpp" /> | |
| + <ClCompile Include="..\..\src\window_message.cpp" /> | |
| <ClCompile Include="..\..\src\window_name.cpp" /> | |
| <ClCompile Include="..\..\src\window_numberinput.cpp" /> | |
| - <ClCompile Include="..\..\src\window_item.cpp" /> | |
| - <ClCompile Include="..\..\src\window_message.cpp" /> | |
| - <ClCompile Include="..\..\src\window_shopparty.cpp" /> | |
| <ClCompile Include="..\..\src\window_savefile.cpp" /> | |
| <ClCompile Include="..\..\src\window_selectable.cpp" /> | |
| - <ClCompile Include="..\..\src\window_menustatus.cpp" /> | |
| <ClCompile Include="..\..\src\window_shop.cpp" /> | |
| <ClCompile Include="..\..\src\window_shopbuy.cpp" /> | |
| <ClCompile Include="..\..\src\window_shopnumber.cpp" /> | |
| + <ClCompile Include="..\..\src\window_shopparty.cpp" /> | |
| <ClCompile Include="..\..\src\window_shopsell.cpp" /> | |
| <ClCompile Include="..\..\src\window_shopstatus.cpp" /> | |
| <ClCompile Include="..\..\src\window_skill.cpp" /> | |
| @@ -503,25 +297,25 @@ | |
| <ClCompile Include="..\..\src\zobj.cpp" /> | |
| </ItemGroup> | |
| <ItemGroup> | |
| + <ClInclude Include="..\..\src\al_audio.h" /> | |
| <ClInclude Include="..\..\src\audio.h" /> | |
| - <ClInclude Include="..\..\src\audio_stream.h" /> | |
| <ClInclude Include="..\..\src\background.h" /> | |
| + <ClInclude Include="..\..\src\baseui.h" /> | |
| <ClInclude Include="..\..\src\battle_actions.h" /> | |
| <ClInclude Include="..\..\src\battle_animation.h" /> | |
| <ClInclude Include="..\..\src\battle_battler.h" /> | |
| + <ClInclude Include="..\..\src\battle_interface.h" /> | |
| <ClInclude Include="..\..\src\bitmap.h" /> | |
| <ClInclude Include="..\..\src\bitmap_screen.h" /> | |
| <ClInclude Include="..\..\src\bitmap_utils.h" /> | |
| <ClInclude Include="..\..\src\cache.h" /> | |
| - <ClInclude Include="..\..\src\channel.h" /> | |
| <ClInclude Include="..\..\src\color.h" /> | |
| - <ClInclude Include="..\..\src\baseui.h" /> | |
| + <ClInclude Include="..\..\src\dirent_win.h" /> | |
| <ClInclude Include="..\..\src\drawable.h" /> | |
| <ClInclude Include="..\..\src\exfont.h" /> | |
| <ClInclude Include="..\..\src\filefinder.h" /> | |
| <ClInclude Include="..\..\src\font.h" /> | |
| <ClInclude Include="..\..\src\font_render_8x8.h" /> | |
| - <ClInclude Include="..\..\src\ftfont.h" /> | |
| <ClInclude Include="..\..\src\game_actor.h" /> | |
| <ClInclude Include="..\..\src\game_actors.h" /> | |
| <ClInclude Include="..\..\src\game_battle.h" /> | |
| @@ -530,6 +324,7 @@ | |
| <ClInclude Include="..\..\src\game_commonevent.h" /> | |
| <ClInclude Include="..\..\src\game_enemy.h" /> | |
| <ClInclude Include="..\..\src\game_event.h" /> | |
| + <ClInclude Include="..\..\src\game_interpreter.h" /> | |
| <ClInclude Include="..\..\src\game_interpreter_battle.h" /> | |
| <ClInclude Include="..\..\src\game_interpreter_map.h" /> | |
| <ClInclude Include="..\..\src\game_map.h" /> | |
| @@ -546,7 +341,6 @@ | |
| <ClInclude Include="..\..\src\game_unit.h" /> | |
| <ClInclude Include="..\..\src\game_variables.h" /> | |
| <ClInclude Include="..\..\src\game_vehicle.h" /> | |
| - <ClInclude Include="..\..\src\gl_bitmap_screen.h" /> | |
| <ClInclude Include="..\..\src\graphics.h" /> | |
| <ClInclude Include="..\..\src\hslrgb.h" /> | |
| <ClInclude Include="..\..\src\image_bmp.h" /> | |
| @@ -554,23 +348,20 @@ | |
| <ClInclude Include="..\..\src\image_png.h" /> | |
| <ClInclude Include="..\..\src\image_xyz.h" /> | |
| <ClInclude Include="..\..\src\input.h" /> | |
| - <ClInclude Include="..\..\src\game_interpreter.h" /> | |
| <ClInclude Include="..\..\src\input_buttons.h" /> | |
| <ClInclude Include="..\..\src\keys.h" /> | |
| <ClInclude Include="..\..\src\main_data.h" /> | |
| <ClInclude Include="..\..\src\map_data.h" /> | |
| - <ClInclude Include="..\..\src\mixer.h" /> | |
| - <ClInclude Include="..\..\src\msgbox.h" /> | |
| + <ClInclude Include="..\..\src\matrix.h" /> | |
| + <ClInclude Include="..\..\src\memory_management.h" /> | |
| <ClInclude Include="..\..\src\options.h" /> | |
| <ClInclude Include="..\..\src\output.h" /> | |
| <ClInclude Include="..\..\src\pixel_format.h" /> | |
| - <ClInclude Include="..\..\src\pixman_bitmap.h" /> | |
| - <ClInclude Include="..\..\src\pixman_bitmap_screen.h" /> | |
| <ClInclude Include="..\..\src\plane.h" /> | |
| <ClInclude Include="..\..\src\player.h" /> | |
| <ClInclude Include="..\..\src\rect.h" /> | |
| <ClInclude Include="..\..\src\registry_win.h" /> | |
| - <ClInclude Include="..\..\src\resampler.h" /> | |
| + <ClInclude Include="..\..\src\rtp_table_bom.h" /> | |
| <ClInclude Include="..\..\src\scene.h" /> | |
| <ClInclude Include="..\..\src\scene_actortarget.h" /> | |
| <ClInclude Include="..\..\src\scene_battle.h" /> | |
| @@ -590,21 +381,15 @@ | |
| <ClInclude Include="..\..\src\scene_skill.h" /> | |
| <ClInclude Include="..\..\src\scene_status.h" /> | |
| <ClInclude Include="..\..\src\scene_title.h" /> | |
| - <ClInclude Include="..\..\src\sdl_bitmap.h" /> | |
| - <ClInclude Include="..\..\src\sdl_bitmap_screen.h" /> | |
| - <ClInclude Include="..\..\src\sdl_font.h" /> | |
| + <ClInclude Include="..\..\src\sdl_audio.h" /> | |
| <ClInclude Include="..\..\src\sdl_ui.h" /> | |
| - <ClInclude Include="..\..\src\soft_bitmap.h" /> | |
| - <ClInclude Include="..\..\src\soft_bitmap_screen.h" /> | |
| <ClInclude Include="..\..\src\sprite.h" /> | |
| <ClInclude Include="..\..\src\spriteset_map.h" /> | |
| <ClInclude Include="..\..\src\sprite_character.h" /> | |
| - <ClInclude Include="..\..\src\surface.h" /> | |
| <ClInclude Include="..\..\src\system.h" /> | |
| <ClInclude Include="..\..\src\text.h" /> | |
| <ClInclude Include="..\..\src\tilemap.h" /> | |
| <ClInclude Include="..\..\src\tilemap_layer.h" /> | |
| - <ClInclude Include="..\..\src\time.hpp" /> | |
| <ClInclude Include="..\..\src\tone.h" /> | |
| <ClInclude Include="..\..\src\utils.h" /> | |
| <ClInclude Include="..\..\src\util_macro.h" /> | |
| @@ -627,18 +412,18 @@ | |
| <ClInclude Include="..\..\src\window_face.h" /> | |
| <ClInclude Include="..\..\src\window_gold.h" /> | |
| <ClInclude Include="..\..\src\window_help.h" /> | |
| + <ClInclude Include="..\..\src\window_item.h" /> | |
| <ClInclude Include="..\..\src\window_keyboard.h" /> | |
| + <ClInclude Include="..\..\src\window_menustatus.h" /> | |
| + <ClInclude Include="..\..\src\window_message.h" /> | |
| <ClInclude Include="..\..\src\window_name.h" /> | |
| <ClInclude Include="..\..\src\window_numberinput.h" /> | |
| - <ClInclude Include="..\..\src\window_item.h" /> | |
| - <ClInclude Include="..\..\src\window_message.h" /> | |
| - <ClInclude Include="..\..\src\window_shopparty.h" /> | |
| <ClInclude Include="..\..\src\window_savefile.h" /> | |
| <ClInclude Include="..\..\src\window_selectable.h" /> | |
| - <ClInclude Include="..\..\src\window_menustatus.h" /> | |
| <ClInclude Include="..\..\src\window_shop.h" /> | |
| <ClInclude Include="..\..\src\window_shopbuy.h" /> | |
| <ClInclude Include="..\..\src\window_shopnumber.h" /> | |
| + <ClInclude Include="..\..\src\window_shopparty.h" /> | |
| <ClInclude Include="..\..\src\window_shopsell.h" /> | |
| <ClInclude Include="..\..\src\window_shopstatus.h" /> | |
| <ClInclude Include="..\..\src\window_skill.h" /> | |
| diff --git a/builds/vs2010/EasyRPG.vcxproj.filters b/builds/vs2010/EasyRPG.vcxproj.filters | |
| index cb1f410..2ec81dc 100644 | |
| --- a/builds/vs2010/EasyRPG.vcxproj.filters | |
| +++ b/builds/vs2010/EasyRPG.vcxproj.filters | |
| @@ -2,164 +2,105 @@ | |
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |
| <ItemGroup> | |
| <Filter Include="Resource Files"> | |
| - <UniqueIdentifier>{ba53e486-8b9b-465e-9258-4ad89b0c0565}</UniqueIdentifier> | |
| + <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="Source Files"> | |
| - <UniqueIdentifier>{4271e27a-6d48-432c-b6cc-30f7a247a719}</UniqueIdentifier> | |
| - </Filter> | |
| - <Filter Include="Source Files\Engine"> | |
| - <UniqueIdentifier>{3c755e1b-5f8c-4eca-a7c9-3d9e8b29892b}</UniqueIdentifier> | |
| - </Filter> | |
| - <Filter Include="Source Files\Tools"> | |
| - <UniqueIdentifier>{d64c64b2-4255-436c-90e3-b8ad45439ca4}</UniqueIdentifier> | |
| - </Filter> | |
| - <Filter Include="Source Files\Engine\Game"> | |
| - <UniqueIdentifier>{88ed1727-57cd-4b2c-abf5-d9de729ce8fe}</UniqueIdentifier> | |
| - </Filter> | |
| - <Filter Include="Source Files\Engine\Window"> | |
| - <UniqueIdentifier>{21b2b815-1077-4fde-89e9-b7361490fc8d}</UniqueIdentifier> | |
| - </Filter> | |
| - <Filter Include="Source Files\Engine\Scene"> | |
| - <UniqueIdentifier>{471f2aa7-c5b4-4984-8b95-be49986b2b79}</UniqueIdentifier> | |
| - </Filter> | |
| - <Filter Include="Source Files\Engine\Sprite"> | |
| - <UniqueIdentifier>{d6d5baa3-bfb3-42fb-9d14-d6146b6072ec}</UniqueIdentifier> | |
| - </Filter> | |
| - <Filter Include="Source Files\Tools\Font 8x8"> | |
| - <UniqueIdentifier>{bb2eb505-d02e-4476-8dcc-77d59d056c36}</UniqueIdentifier> | |
| - </Filter> | |
| - <Filter Include="Source Files\Tools\Win"> | |
| - <UniqueIdentifier>{60d055a3-9b00-4bae-99f6-e827231bf43c}</UniqueIdentifier> | |
| + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | |
| + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> | |
| </Filter> | |
| <Filter Include="Source Files\Backend"> | |
| - <UniqueIdentifier>{6223dc7f-cae6-4c4a-98f7-72511f6d5c67}</UniqueIdentifier> | |
| + <UniqueIdentifier>{f9c8e0bf-3d9d-4f20-8d5f-50c487c1b05e}</UniqueIdentifier> | |
| </Filter> | |
| <Filter Include="Source Files\Backend\Audio"> | |
| - <UniqueIdentifier>{978babb7-a33f-499d-a3be-c4d4a5a3a25d}</UniqueIdentifier> | |
| + <UniqueIdentifier>{b67319e7-4226-4593-961c-5cecdc035a6d}</UniqueIdentifier> | |
| </Filter> | |
| <Filter Include="Source Files\Backend\Graphics"> | |
| - <UniqueIdentifier>{ada7a03e-2a3a-4ae5-91b0-75f802ba4a41}</UniqueIdentifier> | |
| - </Filter> | |
| - <Filter Include="Source Files\Backend\Graphics\sdl"> | |
| - <UniqueIdentifier>{27af2db9-a710-41e4-a027-e1a806db7bcc}</UniqueIdentifier> | |
| + <UniqueIdentifier>{7af98abf-21e3-45e7-a449-ffcd3bf061d3}</UniqueIdentifier> | |
| </Filter> | |
| <Filter Include="Source Files\Backend\Input"> | |
| - <UniqueIdentifier>{6855f41e-6f53-4116-bf0f-382c4c1b967d}</UniqueIdentifier> | |
| + <UniqueIdentifier>{ffe2c197-01e3-4dde-a82c-6834bd070404}</UniqueIdentifier> | |
| </Filter> | |
| <Filter Include="Source Files\Backend\UI"> | |
| - <UniqueIdentifier>{173294f6-8029-4cb6-9b0c-41960648fb71}</UniqueIdentifier> | |
| + <UniqueIdentifier>{ce2d7343-39dd-458d-b5a6-ab688e16af7f}</UniqueIdentifier> | |
| </Filter> | |
| - <Filter Include="Source Files\Backend\UI\SDL"> | |
| - <UniqueIdentifier>{1fa02dfd-29c0-46a0-98ae-fc726696819d}</UniqueIdentifier> | |
| + <Filter Include="Source Files\Engine"> | |
| + <UniqueIdentifier>{150af59c-bdd7-4871-9896-fcbaa91f995b}</UniqueIdentifier> | |
| + </Filter> | |
| + <Filter Include="Source Files\Engine\Game"> | |
| + <UniqueIdentifier>{13a516d5-b2ec-404e-af5c-89dbade61633}</UniqueIdentifier> | |
| + </Filter> | |
| + <Filter Include="Source Files\Engine\Scene"> | |
| + <UniqueIdentifier>{532078e2-4b2c-4ef2-b571-5be08a4be290}</UniqueIdentifier> | |
| </Filter> | |
| - <Filter Include="Source Files\Backend\Time"> | |
| - <UniqueIdentifier>{6921f63b-dd00-43f1-8150-dfb84d1a79ca}</UniqueIdentifier> | |
| + <Filter Include="Source Files\Engine\Sprite"> | |
| + <UniqueIdentifier>{fd5619a4-1bcb-4207-83ca-5d6fc02cb569}</UniqueIdentifier> | |
| </Filter> | |
| - <Filter Include="Source Files\Backend\Time\sdl"> | |
| - <UniqueIdentifier>{f7d05c21-24a8-4ab2-b83e-0b85b6214326}</UniqueIdentifier> | |
| + <Filter Include="Source Files\Engine\Window"> | |
| + <UniqueIdentifier>{c9afd51c-09bc-486d-ad90-cccec101e659}</UniqueIdentifier> | |
| </Filter> | |
| - <Filter Include="Source Files\Backend\Graphics\gl"> | |
| - <UniqueIdentifier>{7c9e2021-4809-40d7-a505-60dddd6d70c5}</UniqueIdentifier> | |
| + <Filter Include="Source Files\Tools"> | |
| + <UniqueIdentifier>{5c38e5d1-df70-4c50-8e06-d9e813ecfdfa}</UniqueIdentifier> | |
| </Filter> | |
| - <Filter Include="Source Files\Backend\Graphics\pixman"> | |
| - <UniqueIdentifier>{d2bc687f-f170-41dd-ac7f-7a3b237d6af1}</UniqueIdentifier> | |
| + <Filter Include="Source Files\Tools\Font 8x8"> | |
| + <UniqueIdentifier>{743c23f6-e9cd-4953-9517-aae64f9c6776}</UniqueIdentifier> | |
| </Filter> | |
| - <Filter Include="Source Files\Backend\Graphics\soft"> | |
| - <UniqueIdentifier>{07190c41-1d1f-43d6-9b8f-70ea3d180999}</UniqueIdentifier> | |
| + <Filter Include="Source Files\Tools\Filefinder"> | |
| + <UniqueIdentifier>{1ac112ed-4c8f-45bf-85d2-1ebc5098935f}</UniqueIdentifier> | |
| </Filter> | |
| - <Filter Include="Source Files\Engine\Game\Battle"> | |
| - <UniqueIdentifier>{8dd8555e-8e3f-4df1-abfc-77acf985f743}</UniqueIdentifier> | |
| + <Filter Include="Source Files\Settings"> | |
| + <UniqueIdentifier>{36029a79-f366-4072-aafe-fe9606e929ec}</UniqueIdentifier> | |
| </Filter> | |
| </ItemGroup> | |
| <ItemGroup> | |
| - <ClCompile Include="..\..\src\cache.cpp"> | |
| - <Filter>Source Files\Engine</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_actor.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_actors.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_battler.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_map.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_message.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_party.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_player.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_screen.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_system.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_temp.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_troop.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_title.cpp"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\window_base.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\window_command.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\window_selectable.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClCompile> | |
| + <ResourceCompile Include="..\..\resources\player.rc"> | |
| + <Filter>Resource Files</Filter> | |
| + </ResourceCompile> | |
| + </ItemGroup> | |
| + <ItemGroup> | |
| <ClCompile Include="..\..\src\audio.cpp"> | |
| <Filter>Source Files\Backend\Audio</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\input.cpp"> | |
| - <Filter>Source Files\Backend\Input</Filter> | |
| + <ClCompile Include="..\..\src\background.cpp"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\output.cpp"> | |
| - <Filter>Source Files\Tools</Filter> | |
| + <ClCompile Include="..\..\src\bitmap.cpp"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\filefinder_win.cpp"> | |
| - <Filter>Source Files\Tools\Win</Filter> | |
| + <ClCompile Include="..\..\src\bitmap_screen.cpp"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\msgbox_win.cpp"> | |
| - <Filter>Source Files\Tools\Win</Filter> | |
| + <ClCompile Include="..\..\src\bitmap_utils.cpp"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\registry_win.cpp"> | |
| - <Filter>Source Files\Tools\Win</Filter> | |
| + <ClCompile Include="..\..\src\color.cpp"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\main.cpp"> | |
| - <Filter>Source Files</Filter> | |
| + <ClCompile Include="..\..\src\effects.cpp"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\main_data.cpp"> | |
| - <Filter>Source Files</Filter> | |
| + <ClCompile Include="..\..\src\font.cpp"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\player.cpp"> | |
| - <Filter>Source Files</Filter> | |
| + <ClCompile Include="..\..\src\graphics.cpp"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\bitmap.cpp"> | |
| + <ClCompile Include="..\..\src\hslrgb.cpp"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\color.cpp"> | |
| + <ClCompile Include="..\..\src\image_jpg.cpp"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\font.cpp"> | |
| + <ClCompile Include="..\..\src\image_png.cpp"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\graphics.cpp"> | |
| + <ClCompile Include="..\..\src\image_xyz.cpp"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\hslrgb.cpp"> | |
| + <ClCompile Include="..\..\src\image_bmp.cpp"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\sprite.cpp"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| <ClCompile Include="..\..\src\plane.cpp"> | |
| @@ -168,7 +109,10 @@ | |
| <ClCompile Include="..\..\src\rect.cpp"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\sprite.cpp"> | |
| + <ClCompile Include="..\..\src\zobj.cpp"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\text.cpp"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| <ClCompile Include="..\..\src\tilemap.cpp"> | |
| @@ -183,17 +127,50 @@ | |
| <ClCompile Include="..\..\src\window.cpp"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_map.cpp"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClCompile Include="..\..\src\input.cpp"> | |
| + <Filter>Source Files\Backend\Input</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_message.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\input_buttons_desktop.cpp"> | |
| + <Filter>Source Files\Backend\Input</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\spriteset_map.cpp"> | |
| - <Filter>Source Files\Engine\Sprite</Filter> | |
| + <ClCompile Include="..\..\src\input_buttons_dingoo.cpp"> | |
| + <Filter>Source Files\Backend\Input</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\zobj.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClCompile Include="..\..\src\input_buttons_gekko.cpp"> | |
| + <Filter>Source Files\Backend\Input</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\input_buttons_gph.cpp"> | |
| + <Filter>Source Files\Backend\Input</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\input_buttons_psp.cpp"> | |
| + <Filter>Source Files\Backend\Input</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\baseui.cpp"> | |
| + <Filter>Source Files\Backend\UI</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\sdl_ui.cpp"> | |
| + <Filter>Source Files\Backend\UI</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\al_audio.cpp"> | |
| + <Filter>Source Files\Backend\Audio</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\sdl_audio.cpp"> | |
| + <Filter>Source Files\Backend\Audio</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\game_vehicle.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\game_actor.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\game_actors.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\game_battle.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\game_battler.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| <ClCompile Include="..\..\src\game_character.cpp"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| @@ -201,396 +178,279 @@ | |
| <ClCompile Include="..\..\src\game_commonevent.cpp"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_menu.cpp"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClCompile Include="..\..\src\game_enemy.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_gold.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\game_event.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_menustatus.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\game_interpreter.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\sprite_character.cpp"> | |
| - <Filter>Source Files\Engine\Sprite</Filter> | |
| + <ClCompile Include="..\..\src\game_interpreter_battle.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\game_interpreter.cpp"> | |
| + <ClCompile Include="..\..\src\game_interpreter_map.cpp"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\game_event.cpp"> | |
| + <ClCompile Include="..\..\src\game_map.cpp"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene.cpp"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClCompile Include="..\..\src\game_message.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\sdl_ui.cpp"> | |
| - <Filter>Source Files\Backend\UI\SDL</Filter> | |
| + <ClCompile Include="..\..\src\game_party.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\baseui.cpp"> | |
| - <Filter>Source Files\Backend\UI</Filter> | |
| + <ClCompile Include="..\..\src\game_picture.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\font_pearl_8x8.cpp"> | |
| - <Filter>Source Files\Tools\Font 8x8</Filter> | |
| + <ClCompile Include="..\..\src\game_player.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\font_render_8x8.cpp"> | |
| - <Filter>Source Files\Tools\Font 8x8</Filter> | |
| + <ClCompile Include="..\..\src\game_screen.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\input_buttons_desktop.cpp"> | |
| - <Filter>Source Files\Backend\Input</Filter> | |
| + <ClCompile Include="..\..\src\game_system.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\input_buttons_dingoo.cpp"> | |
| - <Filter>Source Files\Backend\Input</Filter> | |
| + <ClCompile Include="..\..\src\game_targets.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\input_buttons_gekko.cpp"> | |
| - <Filter>Source Files\Backend\Input</Filter> | |
| + <ClCompile Include="..\..\src\game_temp.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\input_buttons_psp.cpp"> | |
| - <Filter>Source Files\Backend\Input</Filter> | |
| + <ClCompile Include="..\..\src\game_troop.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_equip.cpp"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClCompile Include="..\..\src\game_unit.cpp"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_help.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\scene_title.cpp"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_equipitem.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\scene.cpp"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_logo.cpp"> | |
| + <ClCompile Include="..\..\src\scene_actortarget.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| <ClCompile Include="..\..\src\scene_battle.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_equip.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\window_equipstatus.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\scene_end.cpp"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_numberinput.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\scene_equip.cpp"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_item.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\scene_file.cpp"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_actortarget.cpp"> | |
| + <ClCompile Include="..\..\src\scene_gameover.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| <ClCompile Include="..\..\src\scene_item.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_skill.cpp"> | |
| + <ClCompile Include="..\..\src\scene_load.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_actortarget.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\window_skill.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\window_skillstatus.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_gameover.cpp"> | |
| + <ClCompile Include="..\..\src\scene_logo.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_end.cpp"> | |
| + <ClCompile Include="..\..\src\scene_map.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_shopstatus.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_unit.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_enemy.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\window_targetstatus.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\sdl_bitmap.cpp"> | |
| - <Filter>Source Files\Backend\Graphics\sdl</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\sdl_bitmap_screen.cpp"> | |
| - <Filter>Source Files\Backend\Graphics\sdl</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\bitmap_screen.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\gl_bitmap_screen.cpp"> | |
| - <Filter>Source Files\Backend\Graphics\gl</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\sdl_time.cpp"> | |
| - <Filter>Source Files\Backend\Time\sdl</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\sdl_audio.cpp"> | |
| - <Filter>Source Files\Backend\Audio</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\game_picture.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| + <ClCompile Include="..\..\src\scene_menu.cpp"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| <ClCompile Include="..\..\src\scene_name.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_name.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\window_face.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\scene_order.cpp"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_keyboard.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\scene_save.cpp"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| <ClCompile Include="..\..\src\scene_shop.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_save.cpp"> | |
| + <ClCompile Include="..\..\src\scene_skill.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_file.cpp"> | |
| + <ClCompile Include="..\..\src\scene_status.cpp"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\game_vehicle.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| + <ClCompile Include="..\..\src\sprite_character.cpp"> | |
| + <Filter>Source Files\Engine\Sprite</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_shopparty.cpp"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClCompile Include="..\..\src\spriteset_map.cpp"> | |
| + <Filter>Source Files\Engine\Sprite</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_savefile.cpp"> | |
| + <ClCompile Include="..\..\src\window_actorinfo.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_shop.cpp"> | |
| + <ClCompile Include="..\..\src\window_actorstatus.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_shopbuy.cpp"> | |
| + <ClCompile Include="..\..\src\window_actortarget.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_shopnumber.cpp"> | |
| + <ClCompile Include="..\..\src\window_base.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_shopsell.cpp"> | |
| + <ClCompile Include="..\..\src\window_battlecommand.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\util_win.cpp"> | |
| - <Filter>Source Files\Tools\Win</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\utils.cpp"> | |
| - <Filter>Source Files\Tools</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\text.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\sdl_font.cpp"> | |
| - <Filter>Source Files\Backend\Graphics\sdl</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\surface.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| - </ClCompile> | |
| - <ClCompile Include="..\..\src\wcwidth.cpp"> | |
| - <Filter>Source Files\Tools</Filter> | |
| + <ClCompile Include="..\..\src\window_battleitem.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\ftfont.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClCompile Include="..\..\src\window_battleoption.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\soft_bitmap.cpp"> | |
| - <Filter>Source Files\Backend\Graphics\soft</Filter> | |
| + <ClCompile Include="..\..\src\window_battleskill.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\soft_bitmap_screen.cpp"> | |
| - <Filter>Source Files\Backend\Graphics\soft</Filter> | |
| + <ClCompile Include="..\..\src\window_battlestatus.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\pixman_bitmap.cpp"> | |
| - <Filter>Source Files\Backend\Graphics\pixman</Filter> | |
| + <ClCompile Include="..\..\src\window_command.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\pixman_bitmap_screen.cpp"> | |
| - <Filter>Source Files\Backend\Graphics\pixman</Filter> | |
| + <ClCompile Include="..\..\src\window_equip.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\bitmap_utils.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClCompile Include="..\..\src\window_equipitem.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\image_png.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClCompile Include="..\..\src\window_equipstatus.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\image_xyz.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClCompile Include="..\..\src\window_face.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\image_jpg.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClCompile Include="..\..\src\window_gold.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\image_bmp.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClCompile Include="..\..\src\window_help.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\resampler.cpp"> | |
| - <Filter>Source Files\Backend\Audio</Filter> | |
| + <ClCompile Include="..\..\src\window_item.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\channel.cpp"> | |
| - <Filter>Source Files\Backend\Audio</Filter> | |
| + <ClCompile Include="..\..\src\window_keyboard.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\mixer.cpp"> | |
| - <Filter>Source Files\Backend\Audio</Filter> | |
| + <ClCompile Include="..\..\src\window_menustatus.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\audio_stream.cpp"> | |
| - <Filter>Source Files\Backend\Audio</Filter> | |
| + <ClCompile Include="..\..\src\window_message.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\effects.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClCompile Include="..\..\src\window_name.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\background.cpp"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClCompile Include="..\..\src\window_numberinput.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_battlecommand.cpp"> | |
| + <ClCompile Include="..\..\src\window_savefile.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_battleitem.cpp"> | |
| + <ClCompile Include="..\..\src\window_selectable.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_battleskill.cpp"> | |
| + <ClCompile Include="..\..\src\window_shop.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_battlestatus.cpp"> | |
| + <ClCompile Include="..\..\src\window_shopbuy.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_status.cpp"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClCompile Include="..\..\src\window_shopnumber.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_order.cpp"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClCompile Include="..\..\src\window_shopparty.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_battleoption.cpp"> | |
| + <ClCompile Include="..\..\src\window_shopsell.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_actorinfo.cpp"> | |
| + <ClCompile Include="..\..\src\window_shopstatus.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\window_actorstatus.cpp"> | |
| + <ClCompile Include="..\..\src\window_skill.cpp"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\game_interpreter_battle.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| + <ClCompile Include="..\..\src\window_skillstatus.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\game_interpreter_map.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| + <ClCompile Include="..\..\src\window_targetstatus.cpp"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\battle_actions.cpp"> | |
| - <Filter>Source Files\Engine\Game\Battle</Filter> | |
| + <ClCompile Include="..\..\src\cache.cpp"> | |
| + <Filter>Source Files\Engine</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\battle_algorithms.cpp"> | |
| - <Filter>Source Files\Engine\Game\Battle</Filter> | |
| + <ClCompile Include="..\..\src\font_pearl_8x8.cpp"> | |
| + <Filter>Source Files\Tools\Font 8x8</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\battle_animation.cpp"> | |
| - <Filter>Source Files\Engine\Game\Battle</Filter> | |
| + <ClCompile Include="..\..\src\font_render_8x8.cpp"> | |
| + <Filter>Source Files\Tools\Font 8x8</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\battle_battler.cpp"> | |
| - <Filter>Source Files\Engine\Game\Battle</Filter> | |
| + <ClCompile Include="..\..\src\filefinder.cpp"> | |
| + <Filter>Source Files\Tools\Filefinder</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\game_battle.cpp"> | |
| - <Filter>Source Files\Engine\Game\Battle</Filter> | |
| + <ClCompile Include="..\..\src\util_win.cpp"> | |
| + <Filter>Source Files\Tools</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\game_targets.cpp"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| + <ClCompile Include="..\..\src\registry_win.cpp"> | |
| + <Filter>Source Files\Tools</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\filefinder_unix.cpp"> | |
| + <ClCompile Include="..\..\src\output.cpp"> | |
| <Filter>Source Files\Tools</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\filefinder_basic.cpp"> | |
| + <ClCompile Include="..\..\src\utils.cpp"> | |
| <Filter>Source Files\Tools</Filter> | |
| </ClCompile> | |
| - <ClCompile Include="..\..\src\scene_load.cpp"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClCompile Include="..\..\src\wcwidth.cpp"> | |
| + <Filter>Source Files\Tools</Filter> | |
| </ClCompile> | |
| - </ItemGroup> | |
| - <ItemGroup> | |
| - <ClInclude Include="..\..\src\cache.h"> | |
| + <ClCompile Include="..\..\src\player.cpp"> | |
| <Filter>Source Files\Engine</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_actor.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_actors.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_battler.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_map.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_message.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_party.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_player.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_screen.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_switches.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_system.h"> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\main.cpp"> | |
| + <Filter>Source Files</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\main_data.cpp"> | |
| + <Filter>Source Files</Filter> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\battle_actions.cpp"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_temp.h"> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\battle_algorithms.cpp"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_troop.h"> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\battle_animation.cpp"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_variables.h"> | |
| + </ClCompile> | |
| + <ClCompile Include="..\..\src\battle_battler.cpp"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\scene.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_title.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\window_base.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\window_command.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\window_selectable.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClInclude> | |
| + </ClCompile> | |
| + </ItemGroup> | |
| + <ItemGroup> | |
| <ClInclude Include="..\..\src\audio.h"> | |
| <Filter>Source Files\Backend\Audio</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\input.h"> | |
| - <Filter>Source Files\Backend\Input</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\input_buttons.h"> | |
| - <Filter>Source Files\Backend\Input</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\filefinder.h"> | |
| - <Filter>Source Files\Tools</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\util_macro.h"> | |
| - <Filter>Source Files\Tools</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\msgbox.h"> | |
| - <Filter>Source Files\Tools</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\output.h"> | |
| - <Filter>Source Files\Tools</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\registry_win.h"> | |
| - <Filter>Source Files\Tools\Win</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\main_data.h"> | |
| - <Filter>Source Files</Filter> | |
| + <ClInclude Include="..\..\src\background.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\options.h"> | |
| - <Filter>Source Files</Filter> | |
| + <ClInclude Include="..\..\src\bitmap.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\player.h"> | |
| - <Filter>Source Files</Filter> | |
| + <ClInclude Include="..\..\src\bitmap_screen.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\bitmap.h"> | |
| + <ClInclude Include="..\..\src\bitmap_utils.h"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| <ClInclude Include="..\..\src\color.h"> | |
| @@ -611,13 +471,34 @@ | |
| <ClInclude Include="..\..\src\hslrgb.h"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| + <ClInclude Include="..\..\src\image_bmp.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\image_jpg.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\image_png.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\image_xyz.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\pixel_format.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\sprite.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| + </ClInclude> | |
| <ClInclude Include="..\..\src\plane.h"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| <ClInclude Include="..\..\src\rect.h"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\sprite.h"> | |
| + <ClInclude Include="..\..\src\zobj.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\text.h"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| <ClInclude Include="..\..\src\tilemap.h"> | |
| @@ -632,17 +513,47 @@ | |
| <ClInclude Include="..\..\src\window.h"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_map.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClInclude Include="..\..\src\input.h"> | |
| + <Filter>Source Files\Backend\Input</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_message.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClInclude Include="..\..\src\input_buttons.h"> | |
| + <Filter>Source Files\Backend\Input</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\spriteset_map.h"> | |
| - <Filter>Source Files\Engine\Sprite</Filter> | |
| + <ClInclude Include="..\..\src\keys.h"> | |
| + <Filter>Source Files\Backend\Input</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\zobj.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClInclude Include="..\..\src\baseui.h"> | |
| + <Filter>Source Files\Backend\UI</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\sdl_ui.h"> | |
| + <Filter>Source Files\Backend\UI</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\sdl_audio.h"> | |
| + <Filter>Source Files\Backend\Audio</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\al_audio.h"> | |
| + <Filter>Source Files\Backend\Audio</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_unit.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_variables.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_vehicle.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_actor.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_actors.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_battle.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_battler.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| <ClInclude Include="..\..\src\game_character.h"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| @@ -650,150 +561,192 @@ | |
| <ClInclude Include="..\..\src\game_commonevent.h"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_menu.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClInclude Include="..\..\src\game_enemy.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_gold.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClInclude Include="..\..\src\game_event.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_menustatus.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClInclude Include="..\..\src\game_interpreter.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\sprite_character.h"> | |
| - <Filter>Source Files\Engine\Sprite</Filter> | |
| + <ClInclude Include="..\..\src\game_interpreter_battle.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_interpreter_map.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_map.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_message.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_party.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_picture.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_player.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_screen.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_switches.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\game_system.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\game_interpreter.h"> | |
| + <ClInclude Include="..\..\src\game_targets.h"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\system.h"> | |
| - <Filter>Source Files</Filter> | |
| + <ClInclude Include="..\..\src\game_temp.h"> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\game_event.h"> | |
| + <ClInclude Include="..\..\src\game_troop.h"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\baseui.h"> | |
| - <Filter>Source Files\Backend\UI</Filter> | |
| + <ClInclude Include="..\..\src\scene_title.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\sdl_ui.h"> | |
| - <Filter>Source Files\Backend\UI\SDL</Filter> | |
| + <ClInclude Include="..\..\src\scene.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\keys.h"> | |
| - <Filter>Source Files\Backend\Input</Filter> | |
| + <ClInclude Include="..\..\src\scene_actortarget.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\font_render_8x8.h"> | |
| - <Filter>Source Files\Tools\Font 8x8</Filter> | |
| + <ClInclude Include="..\..\src\scene_battle.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\scene_end.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| <ClInclude Include="..\..\src\scene_equip.h"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_help.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClInclude Include="..\..\src\scene_file.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_equipitem.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClInclude Include="..\..\src\scene_gameover.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_logo.h"> | |
| + <ClInclude Include="..\..\src\scene_item.h"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_battle.h"> | |
| + <ClInclude Include="..\..\src\scene_load.h"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_equip.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClInclude Include="..\..\src\scene_logo.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_equipstatus.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClInclude Include="..\..\src\scene_map.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_numberinput.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClInclude Include="..\..\src\scene_menu.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_item.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClInclude Include="..\..\src\scene_name.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_actortarget.h"> | |
| + <ClInclude Include="..\..\src\scene_order.h"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_item.h"> | |
| + <ClInclude Include="..\..\src\scene_save.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\scene_shop.h"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| <ClInclude Include="..\..\src\scene_skill.h"> | |
| <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_skillstatus.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| + <ClInclude Include="..\..\src\scene_status.h"> | |
| + <Filter>Source Files\Engine\Scene</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_actortarget.h"> | |
| + <ClInclude Include="..\..\src\sprite_character.h"> | |
| + <Filter>Source Files\Engine\Sprite</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\spriteset_map.h"> | |
| + <Filter>Source Files\Engine\Sprite</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\window_targetstatus.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_skill.h"> | |
| + <ClInclude Include="..\..\src\window_actorinfo.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_gameover.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClInclude Include="..\..\src\window_actorstatus.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_end.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClInclude Include="..\..\src\window_actortarget.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_shopstatus.h"> | |
| + <ClInclude Include="..\..\src\window_base.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\game_unit.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| + <ClInclude Include="..\..\src\window_battlecommand.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\game_enemy.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| + <ClInclude Include="..\..\src\window_battleitem.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_targetstatus.h"> | |
| + <ClInclude Include="..\..\src\window_battleoption.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\sdl_bitmap.h"> | |
| - <Filter>Source Files\Backend\Graphics\sdl</Filter> | |
| + <ClInclude Include="..\..\src\window_battleskill.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\sdl_bitmap_screen.h"> | |
| - <Filter>Source Files\Backend\Graphics\sdl</Filter> | |
| + <ClInclude Include="..\..\src\window_battlestatus.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\bitmap_screen.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClInclude Include="..\..\src\window_command.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\gl_bitmap_screen.h"> | |
| - <Filter>Source Files\Backend\Graphics\gl</Filter> | |
| + <ClInclude Include="..\..\src\window_equip.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\game_picture.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| + <ClInclude Include="..\..\src\window_equipitem.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_name.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClInclude Include="..\..\src\window_equipstatus.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_keyboard.h"> | |
| + <ClInclude Include="..\..\src\window_face.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_name.h"> | |
| + <ClInclude Include="..\..\src\window_gold.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_face.h"> | |
| + <ClInclude Include="..\..\src\window_help.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_shop.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClInclude Include="..\..\src\window_item.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_save.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClInclude Include="..\..\src\window_keyboard.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_file.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClInclude Include="..\..\src\window_menustatus.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\game_vehicle.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| + <ClInclude Include="..\..\src\window_message.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_shopsell.h"> | |
| + <ClInclude Include="..\..\src\window_name.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_shopparty.h"> | |
| + <ClInclude Include="..\..\src\window_numberinput.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| <ClInclude Include="..\..\src\window_savefile.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| + <ClInclude Include="..\..\src\window_selectable.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| + </ClInclude> | |
| <ClInclude Include="..\..\src\window_shop.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| @@ -803,133 +756,86 @@ | |
| <ClInclude Include="..\..\src\window_shopnumber.h"> | |
| <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\util_win.h"> | |
| - <Filter>Source Files\Tools\Win</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\utils.h"> | |
| - <Filter>Source Files\Tools</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\text.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\sdl_font.h"> | |
| - <Filter>Source Files\Backend\Graphics\sdl</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\surface.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClInclude Include="..\..\src\window_shopparty.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\wcwidth.h"> | |
| - <Filter>Source Files\Tools</Filter> | |
| + <ClInclude Include="..\..\src\window_shopsell.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\pixel_format.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClInclude Include="..\..\src\window_shopstatus.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\ftfont.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClInclude Include="..\..\src\window_skill.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\soft_bitmap_screen.h"> | |
| - <Filter>Source Files\Backend\Graphics\soft</Filter> | |
| + <ClInclude Include="..\..\src\window_skillstatus.h"> | |
| + <Filter>Source Files\Engine\Window</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\soft_bitmap.h"> | |
| - <Filter>Source Files\Backend\Graphics\soft</Filter> | |
| + <ClInclude Include="..\..\src\cache.h"> | |
| + <Filter>Source Files\Engine</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\pixman_bitmap_screen.h"> | |
| - <Filter>Source Files\Backend\Graphics\pixman</Filter> | |
| + <ClInclude Include="..\..\src\font_render_8x8.h"> | |
| + <Filter>Source Files\Tools\Font 8x8</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\pixman_bitmap.h"> | |
| - <Filter>Source Files\Backend\Graphics\pixman</Filter> | |
| + <ClInclude Include="..\..\src\filefinder.h"> | |
| + <Filter>Source Files\Tools\Filefinder</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\bitmap_utils.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClInclude Include="..\..\src\dirent_win.h"> | |
| + <Filter>Source Files\Tools\Filefinder</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\map_data.h"> | |
| - <Filter>Source Files</Filter> | |
| + <ClInclude Include="..\..\src\util_win.h"> | |
| + <Filter>Source Files\Tools</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\image_xyz.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClInclude Include="..\..\src\registry_win.h"> | |
| + <Filter>Source Files\Tools</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\image_png.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClInclude Include="..\..\src\output.h"> | |
| + <Filter>Source Files\Tools</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\image_jpg.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClInclude Include="..\..\src\util_macro.h"> | |
| + <Filter>Source Files\Tools</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\image_bmp.h"> | |
| - <Filter>Source Files\Backend\Graphics</Filter> | |
| + <ClInclude Include="..\..\src\utils.h"> | |
| + <Filter>Source Files\Tools</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\resampler.h"> | |
| - <Filter>Source Files\Backend\Audio</Filter> | |
| + <ClInclude Include="..\..\src\wcwidth.h"> | |
| + <Filter>Source Files\Tools</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\channel.h"> | |
| - <Filter>Source Files\Backend\Audio</Filter> | |
| + <ClInclude Include="..\..\src\system.h"> | |
| + <Filter>Source Files\Settings</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\mixer.h"> | |
| - <Filter>Source Files\Backend\Audio</Filter> | |
| + <ClInclude Include="..\..\src\options.h"> | |
| + <Filter>Source Files\Settings</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\audio_stream.h"> | |
| - <Filter>Source Files\Backend\Audio</Filter> | |
| + <ClInclude Include="..\..\src\player.h"> | |
| + <Filter>Source Files\Engine</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\background.h"> | |
| + <ClInclude Include="..\..\src\map_data.h"> | |
| <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\window_battlecommand.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\window_battleitem.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\window_battleskill.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\window_battlestatus.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_status.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_order.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\window_battleoption.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\window_actorinfo.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\window_actorstatus.h"> | |
| - <Filter>Source Files\Engine\Window</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_interpreter_battle.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_interpreter_map.h"> | |
| - <Filter>Source Files\Engine\Game</Filter> | |
| + <ClInclude Include="..\..\src\main_data.h"> | |
| + <Filter>Source Files</Filter> | |
| </ClInclude> | |
| <ClInclude Include="..\..\src\battle_actions.h"> | |
| - <Filter>Source Files\Engine\Game\Battle</Filter> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| <ClInclude Include="..\..\src\battle_animation.h"> | |
| - <Filter>Source Files\Engine\Game\Battle</Filter> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| <ClInclude Include="..\..\src\battle_battler.h"> | |
| - <Filter>Source Files\Engine\Game\Battle</Filter> | |
| - </ClInclude> | |
| - <ClInclude Include="..\..\src\game_battle.h"> | |
| - <Filter>Source Files\Engine\Game\Battle</Filter> | |
| + <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\game_targets.h"> | |
| + <ClInclude Include="..\..\src\battle_interface.h"> | |
| <Filter>Source Files\Engine\Game</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\time.hpp"> | |
| - <Filter>Source Files\Backend\Time</Filter> | |
| + <ClInclude Include="..\..\src\matrix.h"> | |
| + <Filter>Source Files\Backend\Graphics</Filter> | |
| </ClInclude> | |
| - <ClInclude Include="..\..\src\scene_load.h"> | |
| - <Filter>Source Files\Engine\Scene</Filter> | |
| + <ClInclude Include="..\..\src\memory_management.h"> | |
| + <Filter>Source Files\Settings</Filter> | |
| + </ClInclude> | |
| + <ClInclude Include="..\..\src\rtp_table_bom.h"> | |
| + <Filter>Source Files\Engine</Filter> | |
| </ClInclude> | |
| - </ItemGroup> | |
| - <ItemGroup> | |
| - <ResourceCompile Include="..\..\resources\player.rc"> | |
| - <Filter>Resource Files</Filter> | |
| - </ResourceCompile> | |
| </ItemGroup> | |
| </Project> | |
| \ No newline at end of file | |
| diff --git a/src/filefinder.cpp b/src/filefinder.cpp | |
| index 79352ea..d8f980d 100644 | |
| --- a/src/filefinder.cpp | |
| +++ b/src/filefinder.cpp | |
| @@ -252,33 +252,6 @@ std::string FileFinder::FindFont(const std::string& name) { | |
| #endif | |
| } | |
| -//////////////////////////////////////////////////////////// | |
| -std::string FileFinder::DefaultFont() { | |
| -#ifdef _WIN32 | |
| - static std::string default_font = ""; | |
| - static bool init = false; | |
| - | |
| - if (!init) { | |
| - std::string fonts[] = DEFAULT_FONTS; | |
| - | |
| - const std::string* pfont = fonts; | |
| - while(const std::string* font = pfont++) { | |
| - if (font->empty()) break; | |
| - | |
| - default_font = FindFont(*font); | |
| - | |
| - if (!default_font.empty()) break; | |
| - } | |
| - | |
| - init = true; | |
| - } | |
| - | |
| - return default_font; | |
| -#else | |
| - return "DejaVuLGCSansMono"; | |
| -#endif | |
| -} | |
| - | |
| FileFinder::ProjectTree const& FileFinder::GetProjectTree() { | |
| static ProjectTree tree_; | |
| diff --git a/src/filefinder.h b/src/filefinder.h | |
| index 66ffc39..809f6cc 100644 | |
| --- a/src/filefinder.h | |
| +++ b/src/filefinder.h | |
| @@ -92,12 +92,6 @@ namespace FileFinder { | |
| std::string FindFont(const std::string& name); | |
| /////////////////////////////////////////////////////// | |
| - /// Get a default font. | |
| - /// @return path to file | |
| - /////////////////////////////////////////////////////// | |
| - std::string DefaultFont(); | |
| - | |
| - /////////////////////////////////////////////////////// | |
| /// Open a file specified by a UTF-8 string | |
| /// @param : filename in UTF-8 | |
| /// @param : mode ("r", "w", etc) | |
| diff --git a/src/input.cpp b/src/input.cpp | |
| index 98b9254..03574f5 100644 | |
| --- a/src/input.cpp | |
| +++ b/src/input.cpp | |
| @@ -46,7 +46,7 @@ void Input::WaitInput(bool v) { wait_input = v; } | |
| void Input::Init() { | |
| InitButtons(); | |
| - std::fill_n(press_time.begin(), BUTTON_COUNT, 0); | |
| + std::fill(press_time.begin(), press_time.end(), 0); | |
| triggered.reset(); | |
| repeated.reset(); | |
| released.reset(); | |
| diff --git a/src/platform/al_audio.h b/src/platform/al_audio.h | |
| index 89f828b..6a1e075 100644 | |
| --- a/src/platform/al_audio.h | |
| +++ b/src/platform/al_audio.h | |
| @@ -1,3 +1,19 @@ | |
| +//////////////////////////////////////////////////////////////////////////// | |
| +// This file is part of EasyRPG Player. | |
| +// | |
| +// EasyRPG Player is free software: you can redistribute it and/or modify | |
| +// it under the terms of the GNU General Public License as published by | |
| +// the Free Software Foundation, either version 3 of the License, or | |
| +// (at your option) any later version. | |
| +// | |
| +// EasyRPG Player is distributed in the hope that it will be useful, | |
| +// but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| +// GNU General Public License for more details. | |
| +// | |
| +// You should have received a copy of the GNU General Public License | |
| +// along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>. | |
| +///////////////////////////////////////////////////////////////////////////// | |
| #ifndef _AL_AUDIO_H_ | |
| #define _AL_AUDIO_H_ | |
| diff --git a/src/platform/sdl_audio.h b/src/platform/sdl_audio.h | |
| index 8c47f2c..8f1a7e8 100644 | |
| --- a/src/platform/sdl_audio.h | |
| +++ b/src/platform/sdl_audio.h | |
| @@ -1,3 +1,19 @@ | |
| +//////////////////////////////////////////////////////////////////////////// | |
| +// This file is part of EasyRPG Player. | |
| +// | |
| +// EasyRPG Player is free software: you can redistribute it and/or modify | |
| +// it under the terms of the GNU General Public License as published by | |
| +// the Free Software Foundation, either version 3 of the License, or | |
| +// (at your option) any later version. | |
| +// | |
| +// EasyRPG Player is distributed in the hope that it will be useful, | |
| +// but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| +// GNU General Public License for more details. | |
| +// | |
| +// You should have received a copy of the GNU General Public License | |
| +// along with EasyRPG Player. If not, see <http://www.gnu.org/licenses/>. | |
| +///////////////////////////////////////////////////////////////////////////// | |
| #ifndef _SDL_AUDIO_H_ | |
| #define _SDL_AUDIO_H_ | |
| @@ -9,7 +25,7 @@ | |
| #include <SDL.h> | |
| #include <SDL_mixer.h> | |
| -struct SdlAudio : protected AudioInterface { | |
| +struct SdlAudio : public AudioInterface { | |
| SdlAudio(); | |
| ~SdlAudio(); | |
| diff --git a/src/rtp_table_bom.h b/src/rtp_table_bom.h | |
| index 1f9d432..5fda572 100644 | |
| --- a/src/rtp_table_bom.h | |
| +++ b/src/rtp_table_bom.h | |
| @@ -1,10 +1,14 @@ | |
| -#include <boost/assign/list_of.hpp> | |
| +#ifndef EASYRPG_RTP_TABLE_BOM | |
| +#define EASYRPG_RTP_TABLE_BOM | |
| + | |
| +#include <boost/assign/list_of.hpp> | |
| #include <map> | |
| using boost::assign::list_of; | |
| using boost::assign::map_list_of; | |
| typedef std::map<std::string, std::string> sub_map_type; | |
| +typedef std::pair<std::string, std::string> sub_map_pair; | |
| static sub_map_type sub_map; | |
| typedef std::map<std::string, std::map<std::string, std::string> > rtp_table_type; | |
| @@ -13,7 +17,7 @@ typedef std::map<std::string, std::map<std::string, std::string> > rtp_table_typ | |
| * { folder: { ASCII, UTF-8 } } | |
| */ | |
| rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| - ("backdrop", list_of<sub_map_type::value_type> | |
| + ("backdrop", list_of<sub_map_pair> | |
| ("graveyard", "お墓") | |
| ("shrine", "お寺") | |
| ("dungeon1", "ダンジョン１") | |
| @@ -50,7 +54,7 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ("snowfield", "雪原") | |
| .to_container(sub_map)) | |
| - ("battle", list_of<sub_map_type::value_type> | |
| + ("battle", list_of<sub_map_pair> | |
| ("misc1", "2003その他1") | |
| ("misc2", "2003その他2") | |
| ("barrier1", "2003バリア") | |
| @@ -107,7 +111,7 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ("paralyze2", "麻痺") | |
| .to_container(sub_map)) | |
| - ("battlechar", list_of<sub_map_type::value_type> | |
| + ("battlechar", list_of<sub_map_pair> | |
| ("elf-f-1", "エルフ女a") | |
| ("elf-f-2", "エルフ女b") | |
| ("elf-m-1", "エルフ男a") | |
| @@ -174,11 +178,11 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ("mage-m-2", "魔術師男b") | |
| .to_container(sub_map)) | |
| - ("battleweapon", list_of<sub_map_type::value_type> | |
| + ("battleweapon", list_of<sub_map_pair> | |
| ("weapons", "武器") | |
| .to_container(sub_map)) | |
| - ("charset", list_of<sub_map_type::value_type> | |
| + ("charset", list_of<sub_map_pair> | |
| ("monster1", "オブジェクト1") | |
| ("monster2", "オブジェクト2") | |
| ("object1", "モンスター1") | |
| @@ -196,7 +200,7 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ("animal", "動物") | |
| .to_container(sub_map)) | |
| - ("chipset", list_of<sub_map_type::value_type> | |
| + ("chipset", list_of<sub_map_pair> | |
| ("dungeon", "ダンジョン") | |
| ("building", "内装") | |
| ("main", "基本") | |
| @@ -204,7 +208,7 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ("ship", "船") | |
| .to_container(sub_map)) | |
| - ("faceset", list_of<sub_map_type::value_type> | |
| + ("faceset", list_of<sub_map_pair> | |
| ("monster", "モンスター") | |
| ("faces1", "一般1") | |
| ("faces2", "一般2") | |
| @@ -212,11 +216,11 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ("hero2", "主人公2") | |
| .to_container(sub_map)) | |
| - ("gameover", list_of<sub_map_type::value_type> | |
| + ("gameover", list_of<sub_map_pair> | |
| ("gameover", "ゲームオーバー") | |
| .to_container(sub_map)) | |
| - ("monster", list_of<sub_map_type::value_type> | |
| + ("monster", list_of<sub_map_pair> | |
| ("ariman", "アーリマン") | |
| ("asura", "アスラ") | |
| ("anaconda", "アナコンダ") | |
| @@ -334,7 +338,7 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ("bluedragon", "龍") | |
| .to_container(sub_map)) | |
| - ("music", list_of<sub_map_type::value_type> | |
| + ("music", list_of<sub_map_pair> | |
| ("spring", "2003いやしの泉") | |
| ("casino", "2003カジノ三昧") | |
| ("arena", "2003コロシアム") | |
| @@ -488,7 +492,7 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ("demonic", "魔王") | |
| .to_container(sub_map)) | |
| - ("panorama", list_of<sub_map_type::value_type> | |
| + ("panorama", list_of<sub_map_pair> | |
| ("dusk1", "夕焼け1") | |
| ("dusk2", "夕焼け2") | |
| ("dawn1", "夜明け1") | |
| @@ -504,7 +508,7 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ("sky2", "空2") | |
| .to_container(sub_map)) | |
| - ("sound", list_of<sub_map_type::value_type> | |
| + ("sound", list_of<sub_map_pair> | |
| ("item1", "アイテム1") | |
| ("item2", "アイテム2") | |
| ("jingle1", "あたり1") | |
| @@ -713,20 +717,20 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ("magic2", "魔法2") | |
| .to_container(sub_map)) | |
| - ("system", list_of<sub_map_type::value_type> | |
| + ("system", list_of<sub_map_pair> | |
| ("system1", "システム") | |
| ("system2", "システムa") | |
| ("system3", "システムb") | |
| ("system4", "システムc") | |
| .to_container(sub_map)) | |
| - ("system2", list_of<sub_map_type::value_type> | |
| + ("system2", list_of<sub_map_pair> | |
| ("system2a", "システム２a") | |
| ("system2b", "システム２b") | |
| ("system2c", "システム２c") | |
| .to_container(sub_map)) | |
| - ("title", list_of<sub_map_type::value_type> | |
| + ("title", list_of<sub_map_pair> | |
| ("title1", "タイトル1") | |
| ("title2", "タイトル2") | |
| ("title3", "タイトル3") | |
| @@ -735,7 +739,7 @@ rtp_table_type const RTP_TABLE_2003 = map_list_of | |
| ; | |
| rtp_table_type const RTP_TABLE_2000 = map_list_of | |
| - ("backdrop", list_of<sub_map_type::value_type> | |
| + ("backdrop", list_of<sub_map_pair> | |
| ("cave1", "ダンジョン1") | |
| ("lavacave2", "ダンジョン2") | |
| ("icecave3", "ダンジョン3") | |
| @@ -763,7 +767,7 @@ rtp_table_type const RTP_TABLE_2000 = map_list_of | |
| ("snow", "雪原") | |
| .to_container(sub_map)) | |
| - ("battle", list_of<sub_map_type::value_type> | |
| + ("battle", list_of<sub_map_pair> | |
| ("etc", "その他") | |
| ("barrier", "バリア") | |
| ("poison", "ブレス") | |
| @@ -794,7 +798,7 @@ rtp_table_type const RTP_TABLE_2000 = map_list_of | |
| ("paralysis", "麻痺") | |
| .to_container(sub_map)) | |
| - ("charset", list_of<sub_map_type::value_type> | |
| + ("charset", list_of<sub_map_pair> | |
| ("etc", "その他") | |
| ("barrier", "バリア") | |
| ("poison", "ブレス") | |
| @@ -825,7 +829,7 @@ rtp_table_type const RTP_TABLE_2000 = map_list_of | |
| ("paralysis", "麻痺") | |
| .to_container(sub_map)) | |
| - ("chipset", list_of<sub_map_type::value_type> | |
| + ("chipset", list_of<sub_map_pair> | |
| ("dungeon", "ダンジョン") | |
| ("inner", "内装") | |
| ("basis", "基本") | |
| @@ -833,7 +837,7 @@ rtp_table_type const RTP_TABLE_2000 = map_list_of | |
| ("ship", "船") | |
| .to_container(sub_map)) | |
| - ("faceset", list_of<sub_map_type::value_type> | |
| + ("faceset", list_of<sub_map_pair> | |
| ("monsters", "モンスター") | |
| ("people1", "一般1") | |
| ("people2", "一般2") | |
| @@ -841,11 +845,11 @@ rtp_table_type const RTP_TABLE_2000 = map_list_of | |
| ("chara2", "主人公2") | |
| .to_container(sub_map)) | |
| - ("gameover", list_of<sub_map_type::value_type> | |
| + ("gameover", list_of<sub_map_pair> | |
| ("gameover", "ゲームオーバー") | |
| .to_container(sub_map)) | |
| - ("monster", list_of<sub_map_type::value_type> | |
| + ("monster", list_of<sub_map_pair> | |
| ("vampire", "ヴァンパイア") | |
| ("hog", "オーク") | |
| ("gargoyle", "ガーゴイル") | |
| @@ -913,7 +917,7 @@ rtp_table_type const RTP_TABLE_2000 = map_list_of | |
| ("greendragon2", "龍") | |
| .to_container(sub_map)) | |
| - ("music", list_of<sub_map_type::value_type> | |
| + ("music", list_of<sub_map_pair> | |
| ("item", "jアイテム") | |
| ("gag1", "jギャグ1") | |
| ("gag2", "jギャグ2") | |
| @@ -1013,7 +1017,7 @@ rtp_table_type const RTP_TABLE_2000 = map_list_of | |
| ("devil", "魔王") | |
| .to_container(sub_map)) | |
| - ("panorama", list_of<sub_map_type::value_type> | |
| + ("panorama", list_of<sub_map_pair> | |
| ("dawn1", "夕焼け1") | |
| ("dawn2", "夕焼け2") | |
| ("evening1", "夜明け1") | |
| @@ -1029,7 +1033,7 @@ rtp_table_type const RTP_TABLE_2000 = map_list_of | |
| ("morning2", "空2") | |
| .to_container(sub_map)) | |
| - ("sound", list_of<sub_map_type::value_type> | |
| + ("sound", list_of<sub_map_pair> | |
| ("item1", "アイテム1") | |
| ("item2", "アイテム2") | |
| ("success1", "あたり1") | |
| @@ -1238,14 +1242,16 @@ rtp_table_type const RTP_TABLE_2000 = map_list_of | |
| ("wall2", "魔法2") | |
| .to_container(sub_map)) | |
| - ("system", list_of<sub_map_type::value_type> | |
| + ("system", list_of<sub_map_pair> | |
| ("system", "システム") | |
| .to_container(sub_map)) | |
| - ("title", list_of<sub_map_type::value_type> | |
| + ("title", list_of<sub_map_pair> | |
| ("title1", "タイトル1") | |
| ("title2", "タイトル2") | |
| ("title3", "タイトル3") | |
| ("title4", "タイトル4") | |
| .to_container(sub_map)) | |
| ; | |
| + | |
| +#endif | |
| diff --git a/src/sdl_ui.cpp b/src/sdl_ui.cpp | |
| index 7319c49..b241b90 100644 | |
| --- a/src/sdl_ui.cpp | |
| +++ b/src/sdl_ui.cpp | |
| @@ -131,7 +131,7 @@ SdlUi::SdlUi(long width, long height, const std::string& title, bool fs_flag) : | |
| ShowCursor(false); | |
| #endif | |
| -#if defined(HAVE_MIXER) | |
| +#if defined(HAVE_SDL_MIXER) | |
| audio_.reset(new SdlAudio()); | |
| #elif defined(HAVE_OPENAL) | |
| audio_.reset(new ALAudio()); | |
| diff --git a/src/system.h b/src/system.h | |
| index cbbea6b..138c831 100644 | |
| --- a/src/system.h | |
| +++ b/src/system.h | |
| @@ -94,10 +94,4 @@ | |
| # endif | |
| #endif | |
| -#ifdef _WIN32 | |
| -# define DEFAULT_FONTS { "RM2000", "DejaVuLGCSansMono", "msgothic", "Lucida Console", "MS Sans Serif", "" } | |
| -#else | |
| -# define DEFAULT_FONTS { "ipag", "ipam", "RM2000", "DejaVuLGCSansMono", "" } | |
| -#endif | |
| - | |
| #endif |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment