Mercurial > mm7
changeset 1924:8cd321994943
MSVS 2012 project file & some compilation warning fixes
author | Nomad |
---|---|
date | Wed, 23 Oct 2013 15:37:17 +0200 |
parents | f04c2f93dacb |
children | f4d5082b4a39 |
files | Build/Visual Studio 2012/World of Might and Magic.sln Build/Visual Studio 2012/World of Might and Magic.v11.suo Build/Visual Studio 2012/World of Might and Magic.vcxproj Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters Build/Visual Studio 2012/World of Might and Magic.vcxproj.user Build/init_win.bat MM7_manifest.rc Might and Magic Trilogy.rc OSAPI.cpp OSWindow.cpp Render.cpp mm7_5.cpp stru9.cpp |
diffstat | 13 files changed, 1105 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Build/Visual Studio 2012/World of Might and Magic.sln Wed Oct 23 15:37:17 2013 +0200 @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "World of Might and Magic", "World of Might and Magic.vcxproj", "{5DA49362-EF43-4753-85DC-88CC41F26764}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5DA49362-EF43-4753-85DC-88CC41F26764}.Debug|Win32.ActiveCfg = Debug|Win32 + {5DA49362-EF43-4753-85DC-88CC41F26764}.Debug|Win32.Build.0 = Debug|Win32 + {5DA49362-EF43-4753-85DC-88CC41F26764}.Release|Win32.ActiveCfg = Release|Win32 + {5DA49362-EF43-4753-85DC-88CC41F26764}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj Wed Oct 23 15:37:17 2013 +0200 @@ -0,0 +1,378 @@ +<?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|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5DA49362-EF43-4753-85DC-88CC41F26764}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>WorldofMightandMagic</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(Configuration)\</IntDir> + <OutDir>$(WoMM_MM7_INSTALL_DIR)\</OutDir> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ObjectFileName>$(IntDir)%(Directory)</ObjectFileName> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>..\..\lib\legacy_dx\lib\ddraw.lib;..\..\lib\legacy_dx\lib\dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\Actor.cpp" /> + <ClCompile Include="..\..\AIL.cpp" /> + <ClCompile Include="..\..\Arcomage.cpp" /> + <ClCompile Include="..\..\ArcomageCards.cpp" /> + <ClCompile Include="..\..\AudioPlayer.cpp" /> + <ClCompile Include="..\..\Bink_Smacker.cpp" /> + <ClCompile Include="..\..\BSPModel.cpp" /> + <ClCompile Include="..\..\CastSpellInfo.cpp" /> + <ClCompile Include="..\..\Chest.cpp" /> + <ClCompile Include="..\..\Conditions.cpp" /> + <ClCompile Include="..\..\CShow.cpp" /> + <ClCompile Include="..\..\DecalBuilder.cpp" /> + <ClCompile Include="..\..\DecorationList.cpp" /> + <ClCompile Include="..\..\Events.cpp" /> + <ClCompile Include="..\..\FrameTableInc.cpp" /> + <ClCompile Include="..\..\Game.cpp" /> + <ClCompile Include="..\..\GammaControl.cpp" /> + <ClCompile Include="..\..\GUIButton.cpp" /> + <ClCompile Include="..\..\GUIFont.cpp" /> + <ClCompile Include="..\..\GUIProgressBar.cpp" /> + <ClCompile Include="..\..\GUIWindow.cpp" /> + <ClCompile Include="..\..\IconFrameTable.cpp" /> + <ClCompile Include="..\..\Indoor.cpp" /> + <ClCompile Include="..\..\IndoorCameraD3D.cpp" /> + <ClCompile Include="..\..\Items.cpp" /> + <ClCompile Include="..\..\Keyboard.cpp" /> + <ClCompile Include="..\..\Level\Decoration.cpp" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lapi.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lauxlib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbaselib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbitlib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcode.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcorolib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lctype.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldblib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldebug.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldo.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldump.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lfunc.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lgc.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\linit.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\liolib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\llex.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmathlib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmem.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\loadlib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lobject.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lopcodes.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\loslib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lparser.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstate.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstring.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstrlib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltable.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltablib.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltm.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lua.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lundump.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lvm.c" /> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lzio.c" /> + <ClCompile Include="..\..\lib\zlib\adler32.c" /> + <ClCompile Include="..\..\lib\zlib\compress.c" /> + <ClCompile Include="..\..\lib\zlib\crc32.c" /> + <ClCompile Include="..\..\lib\zlib\deflate.c" /> + <ClCompile Include="..\..\lib\zlib\infblock.c" /> + <ClCompile Include="..\..\lib\zlib\infcodes.c" /> + <ClCompile Include="..\..\lib\zlib\inffast.c" /> + <ClCompile Include="..\..\lib\zlib\inflate.c" /> + <ClCompile Include="..\..\lib\zlib\inftrees.c" /> + <ClCompile Include="..\..\lib\zlib\infutil.c" /> + <ClCompile Include="..\..\lib\zlib\trees.c" /> + <ClCompile Include="..\..\lib\zlib\uncompr.c" /> + <ClCompile Include="..\..\lib\zlib\zutil.c" /> + <ClCompile Include="..\..\LightmapBuilder.cpp" /> + <ClCompile Include="..\..\LightsStack.cpp" /> + <ClCompile Include="..\..\LOD.cpp" /> + <ClCompile Include="..\..\Log.cpp" /> + <ClCompile Include="..\..\mm7text_ru.cpp" /> + <ClCompile Include="..\..\mm7_2.cpp" /> + <ClCompile Include="..\..\mm7_3.cpp" /> + <ClCompile Include="..\..\mm7_4.cpp" /> + <ClCompile Include="..\..\mm7_5.cpp" /> + <ClCompile Include="..\..\mm7_6.cpp" /> + <ClCompile Include="..\..\mm7_data.cpp" /> + <ClCompile Include="..\..\Monsters.cpp" /> + <ClCompile Include="..\..\Mouse.cpp" /> + <ClCompile Include="..\..\NewUI\MainMenu.cpp" /> + <ClCompile Include="..\..\NPC.cpp" /> + <ClCompile Include="..\..\ObjectList.cpp" /> + <ClCompile Include="..\..\OSAPI.cpp" /> + <ClCompile Include="..\..\OSWindow.cpp" /> + <ClCompile Include="..\..\Outdoor.cpp" /> + <ClCompile Include="..\..\Overlays.cpp" /> + <ClCompile Include="..\..\PaletteManager.cpp" /> + <ClCompile Include="..\..\ParticleEngine.cpp" /> + <ClCompile Include="..\..\Party.cpp" /> + <ClCompile Include="..\..\Player.cpp" /> + <ClCompile Include="..\..\Random.cpp" /> + <ClCompile Include="..\..\Render.cpp" /> + <ClCompile Include="..\..\SaveLoad.cpp" /> + <ClCompile Include="..\..\Spells.cpp" /> + <ClCompile Include="..\..\SpriteObject.cpp" /> + <ClCompile Include="..\..\Sprites.cpp" /> + <ClCompile Include="..\..\StorylineTextTable.cpp" /> + <ClCompile Include="..\..\stru10.cpp" /> + <ClCompile Include="..\..\stru6.cpp" /> + <ClCompile Include="..\..\stru9.cpp" /> + <ClCompile Include="..\..\texts.cpp" /> + <ClCompile Include="..\..\Texture.cpp" /> + <ClCompile Include="..\..\TileTable.cpp" /> + <ClCompile Include="..\..\Time.cpp" /> + <ClCompile Include="..\..\TurnEngine.cpp" /> + <ClCompile Include="..\..\UI\Books\UIMapBook.cpp" /> + <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp" /> + <ClCompile Include="..\..\UI\Books\UISpellBook.cpp" /> + <ClCompile Include="..\..\UI\UIBooks.cpp" /> + <ClCompile Include="..\..\UI\UICharacter.cpp" /> + <ClCompile Include="..\..\UI\UiGame.cpp" /> + <ClCompile Include="..\..\UI\UIGuilds.cpp" /> + <ClCompile Include="..\..\UI\UIHouses.cpp" /> + <ClCompile Include="..\..\UI\UIMainMenu.cpp" /> + <ClCompile Include="..\..\UI\UIMsgProc.cpp" /> + <ClCompile Include="..\..\UI\UIOptions.cpp" /> + <ClCompile Include="..\..\UI\UIPartyCreation.cpp" /> + <ClCompile Include="..\..\UI\UIPopup.cpp" /> + <ClCompile Include="..\..\UI\UIRest.cpp" /> + <ClCompile Include="..\..\UI\UISaveLoad.cpp" /> + <ClCompile Include="..\..\UI\UIShops.cpp" /> + <ClCompile Include="..\..\UI\UITransition.cpp" /> + <ClCompile Include="..\..\VectorTypes.cpp" /> + <ClCompile Include="..\..\VideoPlayer.cpp" /> + <ClCompile Include="..\..\Viewport.cpp" /> + <ClCompile Include="..\..\Vis.cpp" /> + <ClCompile Include="..\..\Weather.cpp" /> + <ClCompile Include="..\..\_deleted.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\Actor.h" /> + <ClInclude Include="..\..\AIL.h" /> + <ClInclude Include="..\..\Arcomage.h" /> + <ClInclude Include="..\..\AudioPlayer.h" /> + <ClInclude Include="..\..\Autonotes.h" /> + <ClInclude Include="..\..\Awards.h" /> + <ClInclude Include="..\..\Bink_Smacker.h" /> + <ClInclude Include="..\..\BSPModel.h" /> + <ClInclude Include="..\..\CastSpellInfo.h" /> + <ClInclude Include="..\..\Chest.h" /> + <ClInclude Include="..\..\Conditions.h" /> + <ClInclude Include="..\..\CShow.h" /> + <ClInclude Include="..\..\DecalBuilder.h" /> + <ClInclude Include="..\..\DecorationList.h" /> + <ClInclude Include="..\..\ErrorHandling.h" /> + <ClInclude Include="..\..\Events.h" /> + <ClInclude Include="..\..\Events2D.h" /> + <ClInclude Include="..\..\FactionTable.h" /> + <ClInclude Include="..\..\FrameTableInc.h" /> + <ClInclude Include="..\..\Game.h" /> + <ClInclude Include="..\..\GammaControl.h" /> + <ClInclude Include="..\..\GUIFont.h" /> + <ClInclude Include="..\..\GUIProgressBar.h" /> + <ClInclude Include="..\..\GUIWindow.h" /> + <ClInclude Include="..\..\IconFrameTable.h" /> + <ClInclude Include="..\..\Indoor.h" /> + <ClInclude Include="..\..\IndoorCameraD3D.h" /> + <ClInclude Include="..\..\Indoor_stuff.h" /> + <ClInclude Include="..\..\Items.h" /> + <ClInclude Include="..\..\Keyboard.h" /> + <ClInclude Include="..\..\Level\Decoration.h" /> + <ClInclude Include="..\..\lib\legacy_dx\d3d.h" /> + <ClInclude Include="..\..\lib\legacy_dx\d3dcaps.h" /> + <ClInclude Include="..\..\lib\legacy_dx\d3drm.h" /> + <ClInclude Include="..\..\lib\legacy_dx\d3drmdef.h" /> + <ClInclude Include="..\..\lib\legacy_dx\d3drmobj.h" /> + <ClInclude Include="..\..\lib\legacy_dx\d3drmwin.h" /> + <ClInclude Include="..\..\lib\legacy_dx\d3dtypes.h" /> + <ClInclude Include="..\..\lib\legacy_dx\ddraw.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dinput.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dinputd.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dmdls.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dmerror.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dmksctrl.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dmplugin.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dmusbuff.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dmusicc.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dmusicf.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dmusici.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dmusics.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dsconf.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dsound.h" /> + <ClInclude Include="..\..\lib\legacy_dx\dvoice.h" /> + <ClInclude Include="..\..\lib\legacy_dx\multimon.h" /> + <ClInclude Include="..\..\lib\legacy_dx\rmxfguid.h" /> + <ClInclude Include="..\..\lib\legacy_dx\rmxftmpl.h" /> + <ClInclude Include="..\..\lib\legacy_dx\strsafe.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lapi.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lauxlib.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lcode.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lctype.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldebug.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldo.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lfunc.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lgc.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\llex.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\llimits.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lmem.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lobject.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lopcodes.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lparser.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstate.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstring.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltable.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltm.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lua.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\luaconf.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lualib.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lundump.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lvm.h" /> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lzio.h" /> + <ClInclude Include="..\..\lib\lua\lua.h" /> + <ClInclude Include="..\..\lib\zlib\deflate.h" /> + <ClInclude Include="..\..\lib\zlib\infblock.h" /> + <ClInclude Include="..\..\lib\zlib\infcodes.h" /> + <ClInclude Include="..\..\lib\zlib\inffast.h" /> + <ClInclude Include="..\..\lib\zlib\inffixed.h" /> + <ClInclude Include="..\..\lib\zlib\inftrees.h" /> + <ClInclude Include="..\..\lib\zlib\infutil.h" /> + <ClInclude Include="..\..\lib\zlib\trees.h" /> + <ClInclude Include="..\..\lib\zlib\zconf.h" /> + <ClInclude Include="..\..\lib\zlib\zlib.h" /> + <ClInclude Include="..\..\lib\zlib\zutil.h" /> + <ClInclude Include="..\..\LightmapBuilder.h" /> + <ClInclude Include="..\..\Lights.h" /> + <ClInclude Include="..\..\LOD.h" /> + <ClInclude Include="..\..\Log.h" /> + <ClInclude Include="..\..\MapInfo.h" /> + <ClInclude Include="..\..\Math.h" /> + <ClInclude Include="..\..\MM7.h" /> + <ClInclude Include="..\..\mm7_data.h" /> + <ClInclude Include="..\..\Monsters.h" /> + <ClInclude Include="..\..\Mouse.h" /> + <ClInclude Include="..\..\NewUI\Core\UIControl.h" /> + <ClInclude Include="..\..\NewUI\MainMenu.h" /> + <ClInclude Include="..\..\NPC.h" /> + <ClInclude Include="..\..\NZIArray.h" /> + <ClInclude Include="..\..\ObjectList.h" /> + <ClInclude Include="..\..\OSAPI.h" /> + <ClInclude Include="..\..\OSInfo.h" /> + <ClInclude Include="..\..\OSWindow.h" /> + <ClInclude Include="..\..\Outdoor.h" /> + <ClInclude Include="..\..\Outdoor_stuff.h" /> + <ClInclude Include="..\..\Overlays.h" /> + <ClInclude Include="..\..\PaletteManager.h" /> + <ClInclude Include="..\..\ParticleEngine.h" /> + <ClInclude Include="..\..\Party.h" /> + <ClInclude Include="..\..\Player.h" /> + <ClInclude Include="..\..\PlayerFrameTable.h" /> + <ClInclude Include="..\..\Random.h" /> + <ClInclude Include="..\..\Render.h" /> + <ClInclude Include="..\..\resource.h" /> + <ClInclude Include="..\..\SaveLoad.h" /> + <ClInclude Include="..\..\Spells.h" /> + <ClInclude Include="..\..\SpriteObject.h" /> + <ClInclude Include="..\..\Sprites.h" /> + <ClInclude Include="..\..\StorylineTextTable.h" /> + <ClInclude Include="..\..\stru10.h" /> + <ClInclude Include="..\..\stru123.h" /> + <ClInclude Include="..\..\stru159.h" /> + <ClInclude Include="..\..\stru160.h" /> + <ClInclude Include="..\..\stru176.h" /> + <ClInclude Include="..\..\stru298.h" /> + <ClInclude Include="..\..\stru314.h" /> + <ClInclude Include="..\..\stru367.h" /> + <ClInclude Include="..\..\stru6.h" /> + <ClInclude Include="..\..\stru9.h" /> + <ClInclude Include="..\..\texts.h" /> + <ClInclude Include="..\..\Texture.h" /> + <ClInclude Include="..\..\TileFrameTable.h" /> + <ClInclude Include="..\..\Time.h" /> + <ClInclude Include="..\..\TurnEngine.h" /> + <ClInclude Include="..\..\UI\UIBooks.h" /> + <ClInclude Include="..\..\UI\UIHouses.h" /> + <ClInclude Include="..\..\VectorTypes.h" /> + <ClInclude Include="..\..\VideoPlayer.h" /> + <ClInclude Include="..\..\Viewport.h" /> + <ClInclude Include="..\..\Vis.h" /> + <ClInclude Include="..\..\Weather.h" /> + </ItemGroup> + <ItemGroup> + <None Include="..\..\lib\legacy_dx\d3dvec.inl" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters Wed Oct 23 15:37:17 2013 +0200 @@ -0,0 +1,592 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="lib"> + <UniqueIdentifier>{01df770d-32ca-4bfa-8448-de7b6ae4b15c}</UniqueIdentifier> + </Filter> + <Filter Include="Level"> + <UniqueIdentifier>{e6df15ec-967c-40ca-b954-c78fe66daed1}</UniqueIdentifier> + </Filter> + <Filter Include="lib\legacy_dx"> + <UniqueIdentifier>{23711e0a-ee63-4da3-9c0d-22d02dd41747}</UniqueIdentifier> + </Filter> + <Filter Include="lib\lua"> + <UniqueIdentifier>{9448e73a-c435-43ee-8586-08607774a0d0}</UniqueIdentifier> + </Filter> + <Filter Include="lib\zlib"> + <UniqueIdentifier>{1d2c44d0-de33-46dd-a3bf-dce44afda794}</UniqueIdentifier> + </Filter> + <Filter Include="lib\lua\lua-5.2.2"> + <UniqueIdentifier>{501083c0-a7b6-445f-a8fb-fa12cd345924}</UniqueIdentifier> + </Filter> + <Filter Include="UI"> + <UniqueIdentifier>{6fea8cb0-1887-4477-a64d-16e64b5de807}</UniqueIdentifier> + </Filter> + <Filter Include="NewUI"> + <UniqueIdentifier>{8f45576f-cc60-4d3a-837e-deb373a67f8a}</UniqueIdentifier> + </Filter> + <Filter Include="NewUI\Core"> + <UniqueIdentifier>{d61aec30-ad58-4a9f-8f0a-e129f1947429}</UniqueIdentifier> + </Filter> + <Filter Include="UI\Books"> + <UniqueIdentifier>{c0b8b696-9a12-4b22-b8c1-0262d7fbb306}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\Level\Decoration.cpp"> + <Filter>Level</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\adler32.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\compress.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\crc32.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\deflate.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\infblock.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\infcodes.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\inffast.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\inflate.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\inftrees.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\infutil.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\trees.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\uncompr.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\zlib\zutil.c"> + <Filter>lib\zlib</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lapi.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lauxlib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbaselib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbitlib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcode.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcorolib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lctype.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldblib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldebug.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldo.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldump.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lfunc.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lgc.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\linit.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\liolib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\llex.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmathlib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmem.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\loadlib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lobject.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lopcodes.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\loslib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lparser.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstate.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstring.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstrlib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltable.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltablib.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltm.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lua.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lundump.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lvm.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\lua\lua-5.2.2\lzio.c"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClCompile> + <ClCompile Include="..\..\NewUI\MainMenu.cpp"> + <Filter>NewUI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UIBooks.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UICharacter.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UiGame.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UIGuilds.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UIHouses.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UIMainMenu.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UIMsgProc.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UIOptions.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UIPartyCreation.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UIPopup.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UIRest.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UISaveLoad.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UIShops.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\UITransition.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\Books\UIMapBook.cpp"> + <Filter>UI\Books</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp"> + <Filter>UI\Books</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\Books\UISpellBook.cpp"> + <Filter>UI\Books</Filter> + </ClCompile> + <ClCompile Include="..\..\_deleted.cpp" /> + <ClCompile Include="..\..\Actor.cpp" /> + <ClCompile Include="..\..\AIL.cpp" /> + <ClCompile Include="..\..\Arcomage.cpp" /> + <ClCompile Include="..\..\ArcomageCards.cpp" /> + <ClCompile Include="..\..\AudioPlayer.cpp" /> + <ClCompile Include="..\..\Bink_Smacker.cpp" /> + <ClCompile Include="..\..\BSPModel.cpp" /> + <ClCompile Include="..\..\CastSpellInfo.cpp" /> + <ClCompile Include="..\..\Chest.cpp" /> + <ClCompile Include="..\..\Conditions.cpp" /> + <ClCompile Include="..\..\CShow.cpp" /> + <ClCompile Include="..\..\DecalBuilder.cpp" /> + <ClCompile Include="..\..\DecorationList.cpp" /> + <ClCompile Include="..\..\Events.cpp" /> + <ClCompile Include="..\..\FrameTableInc.cpp" /> + <ClCompile Include="..\..\Game.cpp" /> + <ClCompile Include="..\..\GammaControl.cpp" /> + <ClCompile Include="..\..\GUIButton.cpp" /> + <ClCompile Include="..\..\GUIFont.cpp" /> + <ClCompile Include="..\..\GUIProgressBar.cpp" /> + <ClCompile Include="..\..\GUIWindow.cpp" /> + <ClCompile Include="..\..\IconFrameTable.cpp" /> + <ClCompile Include="..\..\Indoor.cpp" /> + <ClCompile Include="..\..\IndoorCameraD3D.cpp" /> + <ClCompile Include="..\..\Items.cpp" /> + <ClCompile Include="..\..\Keyboard.cpp" /> + <ClCompile Include="..\..\LightmapBuilder.cpp" /> + <ClCompile Include="..\..\LightsStack.cpp" /> + <ClCompile Include="..\..\LOD.cpp" /> + <ClCompile Include="..\..\Log.cpp" /> + <ClCompile Include="..\..\mm7_2.cpp" /> + <ClCompile Include="..\..\mm7_3.cpp" /> + <ClCompile Include="..\..\mm7_4.cpp" /> + <ClCompile Include="..\..\mm7_5.cpp" /> + <ClCompile Include="..\..\mm7_6.cpp" /> + <ClCompile Include="..\..\mm7_data.cpp" /> + <ClCompile Include="..\..\mm7text_ru.cpp" /> + <ClCompile Include="..\..\Monsters.cpp" /> + <ClCompile Include="..\..\Mouse.cpp" /> + <ClCompile Include="..\..\NPC.cpp" /> + <ClCompile Include="..\..\ObjectList.cpp" /> + <ClCompile Include="..\..\OSAPI.cpp" /> + <ClCompile Include="..\..\OSWindow.cpp" /> + <ClCompile Include="..\..\Outdoor.cpp" /> + <ClCompile Include="..\..\Overlays.cpp" /> + <ClCompile Include="..\..\PaletteManager.cpp" /> + <ClCompile Include="..\..\ParticleEngine.cpp" /> + <ClCompile Include="..\..\Party.cpp" /> + <ClCompile Include="..\..\Player.cpp" /> + <ClCompile Include="..\..\Random.cpp" /> + <ClCompile Include="..\..\Render.cpp" /> + <ClCompile Include="..\..\SaveLoad.cpp" /> + <ClCompile Include="..\..\Spells.cpp" /> + <ClCompile Include="..\..\SpriteObject.cpp" /> + <ClCompile Include="..\..\Sprites.cpp" /> + <ClCompile Include="..\..\StorylineTextTable.cpp" /> + <ClCompile Include="..\..\stru6.cpp" /> + <ClCompile Include="..\..\stru9.cpp" /> + <ClCompile Include="..\..\stru10.cpp" /> + <ClCompile Include="..\..\texts.cpp" /> + <ClCompile Include="..\..\Texture.cpp" /> + <ClCompile Include="..\..\TileTable.cpp" /> + <ClCompile Include="..\..\Time.cpp" /> + <ClCompile Include="..\..\TurnEngine.cpp" /> + <ClCompile Include="..\..\VectorTypes.cpp" /> + <ClCompile Include="..\..\VideoPlayer.cpp" /> + <ClCompile Include="..\..\Viewport.cpp" /> + <ClCompile Include="..\..\Vis.cpp" /> + <ClCompile Include="..\..\Weather.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\Level\Decoration.h"> + <Filter>Level</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\d3d.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\d3dcaps.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\d3drm.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\d3drmdef.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\d3drmobj.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\d3drmwin.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\d3dtypes.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\ddraw.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dinput.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dinputd.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dmdls.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dmerror.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dmksctrl.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dmplugin.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dmusbuff.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dmusicc.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dmusicf.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dmusici.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dmusics.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dsconf.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dsound.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\dvoice.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\multimon.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\rmxfguid.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\rmxftmpl.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\legacy_dx\strsafe.h"> + <Filter>lib\legacy_dx</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\deflate.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\infblock.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\infcodes.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\inffast.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\inffixed.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\inftrees.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\infutil.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\trees.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\zconf.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\zlib.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\zlib\zutil.h"> + <Filter>lib\zlib</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua.h"> + <Filter>lib\lua</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lapi.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lauxlib.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lcode.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lctype.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldebug.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldo.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lfunc.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lgc.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\llex.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\llimits.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lmem.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lobject.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lopcodes.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lparser.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstate.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstring.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltable.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltm.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lua.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\luaconf.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lualib.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lundump.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lvm.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\lua\lua-5.2.2\lzio.h"> + <Filter>lib\lua\lua-5.2.2</Filter> + </ClInclude> + <ClInclude Include="..\..\NewUI\MainMenu.h"> + <Filter>NewUI</Filter> + </ClInclude> + <ClInclude Include="..\..\NewUI\Core\UIControl.h"> + <Filter>NewUI\Core</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\UIBooks.h"> + <Filter>UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\UIHouses.h"> + <Filter>UI</Filter> + </ClInclude> + <ClInclude Include="..\..\Actor.h" /> + <ClInclude Include="..\..\AIL.h" /> + <ClInclude Include="..\..\Arcomage.h" /> + <ClInclude Include="..\..\AudioPlayer.h" /> + <ClInclude Include="..\..\Autonotes.h" /> + <ClInclude Include="..\..\Awards.h" /> + <ClInclude Include="..\..\Bink_Smacker.h" /> + <ClInclude Include="..\..\BSPModel.h" /> + <ClInclude Include="..\..\CastSpellInfo.h" /> + <ClInclude Include="..\..\Chest.h" /> + <ClInclude Include="..\..\Conditions.h" /> + <ClInclude Include="..\..\CShow.h" /> + <ClInclude Include="..\..\DecalBuilder.h" /> + <ClInclude Include="..\..\DecorationList.h" /> + <ClInclude Include="..\..\ErrorHandling.h" /> + <ClInclude Include="..\..\Events.h" /> + <ClInclude Include="..\..\Events2D.h" /> + <ClInclude Include="..\..\FactionTable.h" /> + <ClInclude Include="..\..\FrameTableInc.h" /> + <ClInclude Include="..\..\Game.h" /> + <ClInclude Include="..\..\GammaControl.h" /> + <ClInclude Include="..\..\GUIFont.h" /> + <ClInclude Include="..\..\GUIProgressBar.h" /> + <ClInclude Include="..\..\GUIWindow.h" /> + <ClInclude Include="..\..\IconFrameTable.h" /> + <ClInclude Include="..\..\Indoor.h" /> + <ClInclude Include="..\..\Indoor_stuff.h" /> + <ClInclude Include="..\..\IndoorCameraD3D.h" /> + <ClInclude Include="..\..\Items.h" /> + <ClInclude Include="..\..\Keyboard.h" /> + <ClInclude Include="..\..\LightmapBuilder.h" /> + <ClInclude Include="..\..\Lights.h" /> + <ClInclude Include="..\..\LOD.h" /> + <ClInclude Include="..\..\Log.h" /> + <ClInclude Include="..\..\MapInfo.h" /> + <ClInclude Include="..\..\Math.h" /> + <ClInclude Include="..\..\MM7.h" /> + <ClInclude Include="..\..\mm7_data.h" /> + <ClInclude Include="..\..\Monsters.h" /> + <ClInclude Include="..\..\Mouse.h" /> + <ClInclude Include="..\..\NPC.h" /> + <ClInclude Include="..\..\NZIArray.h" /> + <ClInclude Include="..\..\ObjectList.h" /> + <ClInclude Include="..\..\OSAPI.h" /> + <ClInclude Include="..\..\OSInfo.h" /> + <ClInclude Include="..\..\OSWindow.h" /> + <ClInclude Include="..\..\Outdoor.h" /> + <ClInclude Include="..\..\Outdoor_stuff.h" /> + <ClInclude Include="..\..\Overlays.h" /> + <ClInclude Include="..\..\PaletteManager.h" /> + <ClInclude Include="..\..\ParticleEngine.h" /> + <ClInclude Include="..\..\Party.h" /> + <ClInclude Include="..\..\Player.h" /> + <ClInclude Include="..\..\PlayerFrameTable.h" /> + <ClInclude Include="..\..\Random.h" /> + <ClInclude Include="..\..\Render.h" /> + <ClInclude Include="..\..\resource.h" /> + <ClInclude Include="..\..\SaveLoad.h" /> + <ClInclude Include="..\..\Spells.h" /> + <ClInclude Include="..\..\SpriteObject.h" /> + <ClInclude Include="..\..\Sprites.h" /> + <ClInclude Include="..\..\StorylineTextTable.h" /> + <ClInclude Include="..\..\stru6.h" /> + <ClInclude Include="..\..\stru9.h" /> + <ClInclude Include="..\..\stru10.h" /> + <ClInclude Include="..\..\stru123.h" /> + <ClInclude Include="..\..\stru159.h" /> + <ClInclude Include="..\..\stru160.h" /> + <ClInclude Include="..\..\stru176.h" /> + <ClInclude Include="..\..\stru298.h" /> + <ClInclude Include="..\..\stru314.h" /> + <ClInclude Include="..\..\stru367.h" /> + <ClInclude Include="..\..\texts.h" /> + <ClInclude Include="..\..\Texture.h" /> + <ClInclude Include="..\..\TileFrameTable.h" /> + <ClInclude Include="..\..\Time.h" /> + <ClInclude Include="..\..\TurnEngine.h" /> + <ClInclude Include="..\..\VectorTypes.h" /> + <ClInclude Include="..\..\VideoPlayer.h" /> + <ClInclude Include="..\..\Viewport.h" /> + <ClInclude Include="..\..\Vis.h" /> + <ClInclude Include="..\..\Weather.h" /> + </ItemGroup> + <ItemGroup> + <None Include="..\..\lib\legacy_dx\d3dvec.inl"> + <Filter>lib\legacy_dx</Filter> + </None> + </ItemGroup> +</Project> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj.user Wed Oct 23 15:37:17 2013 +0200 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LocalDebuggerCommand>$(OutDir)$(TargetName)$(TargetExt)</LocalDebuggerCommand> + <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + <LocalDebuggerCommandArguments>-novideo -nomarg</LocalDebuggerCommandArguments> + </PropertyGroup> +</Project> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Build/init_win.bat Wed Oct 23 15:37:17 2013 +0200 @@ -0,0 +1,58 @@ +@echo off +set _mm7_install_dir=E:\g\mm collection\MM_VII + + + + +REM Check Windows Version + +ver | findstr /i "5\.0\." > nul +IF %ERRORLEVEL% EQU 0 goto win_2000 + +ver | findstr /i "5\.1\." > nul +IF %ERRORLEVEL% EQU 0 goto win_xp + +ver | findstr /i "5\.2\." > nul +IF %ERRORLEVEL% EQU 0 goto win_2003 + +ver | findstr /i "6\.0\." > nul +IF %ERRORLEVEL% EQU 0 goto win_vista + +ver | findstr /i "6\.1\." > nul +IF %ERRORLEVEL% EQU 0 goto win_7 + +echo Machine OS cannot be determined. +goto end + +:win_7 +echo Win 7 +reg add HKCU\Environment /f /v "WoMM_MM7_INSTALL_DIR" /t REG_SZ /d "%_mm7_install_dir%" + +reg query HKCU\Environment /v "WoMM_MM7_INSTALL_DIR" +goto end + +:win_2000 +echo Win 2000 +goto end + +:win_xp +echo Win XP +reg add HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment /f /v "WoMM_MM7_INSTALL_DIR" /t REG_SZ /d "%_mm7_install_dir%" + + +reg query HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment /v "WoMM_MM7_INSTALL_DIR" +goto end + +:win_vista +echo Win Vista +goto end + +:win_2003 +echo Win 2003 +goto end + +:check_vars +goto end + +:end +pause \ No newline at end of file
--- a/OSAPI.cpp Wed Oct 23 15:27:25 2013 +0600 +++ b/OSAPI.cpp Wed Oct 23 15:37:17 2013 +0200 @@ -6,10 +6,53 @@ OSVersion *pVersion = nullptr; +#include <stdio.h> //----- (00462C94) -------------------------------------------------------- int __stdcall wWinMain(HINSTANCE hInstance, HINSTANCE, wchar_t *lpCmdLine, int nShowCmd) { + auto cvt = [] (const char *filename) + { + char ico_filename[512]; + sprintf(ico_filename, "%s.ico", filename); + + char c_filename[512]; + sprintf(c_filename, "%s.c", filename); + auto file = fopen(ico_filename, "rb"); + { + auto o = fopen(c_filename, "w+t"); + fprintf(o, "unsigned char %s[] =\n{\n\t", filename); + + int position = 0; + bool once = true; + while (!feof(file)) + { + unsigned char c; + fread(&c, 1, 1, file); + + if (position == 7) + fprintf(o, ",\t"); + else if (position != 0) + fprintf(o, ", "); + + fprintf(o, "0x%02X", (unsigned int)c); + if (++position == 15) + { + fprintf(o, ",\n\t"); + position = 0; + } + } + + fprintf(o, "\n};"); + fclose(o); + } + fclose(file); + }; + + cvt("mm6_icon"); + cvt("mm7_icon"); + cvt("mm8_icon"); + Log::Initialize(); //if (HWND hMM7Window = FindWindowW(L"MM7", 0))
--- a/OSWindow.cpp Wed Oct 23 15:27:25 2013 +0600 +++ b/OSWindow.cpp Wed Oct 23 15:37:17 2013 +0200 @@ -787,4 +787,4 @@ } return true; -} \ No newline at end of file +}
--- a/Render.cpp Wed Oct 23 15:27:25 2013 +0600 +++ b/Render.cpp Wed Oct 23 15:37:17 2013 +0200 @@ -34,8 +34,8 @@ #include "Lights.h" #include "Level/Decoration.h" -#pragma comment(lib, "lib\\legacy_dx\\lib\\ddraw.lib") -#pragma comment(lib, "lib\\legacy_dx\\lib\\dxguid.lib") +//#pragma comment(lib, "lib\\legacy_dx\\lib\\ddraw.lib") +//#pragma comment(lib, "lib\\legacy_dx\\lib\\dxguid.lib") struct IDirectDrawClipper *pDDrawClipper; struct Render *pRenderer; // idb
--- a/mm7_5.cpp Wed Oct 23 15:27:25 2013 +0600 +++ b/mm7_5.cpp Wed Oct 23 15:37:17 2013 +0200 @@ -406,7 +406,7 @@ { int v4; // ebx@1 SpriteObject *v5; // eax@2 - bool v6; // eax@3 + int v6; // eax@3 Actor *v7; // esi@4 Actor *v8; // edi@4 char v9; // zf@5
--- a/stru9.cpp Wed Oct 23 15:27:25 2013 +0600 +++ b/stru9.cpp Wed Oct 23 15:37:17 2013 +0200 @@ -267,7 +267,7 @@ bool stru9::_498774(struct RenderVertexSoft *a1, struct RenderVertexSoft *a2, struct RenderVertexSoft *a3, struct stru312 *a4, struct RenderVertexSoft *a5) { RenderVertexSoft *v6; // ecx@5 - bool result; // eax@5 + int result; // eax@5 double v8; // st7@5 __int16 v9; // fps@5 double v10; // st7@6