Mercurial > mm7
changeset 1943:c193d289f0a5
Merge
| author | Grumpy7 |
|---|---|
| date | Thu, 24 Oct 2013 23:22:46 -0700 |
| parents | e8d329651a2a (current diff) b0d96beedc80 (diff) |
| children | 02bc0fac639f |
| files | |
| diffstat | 12 files changed, 906 insertions(+), 111 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Thu Oct 24 23:21:05 2013 -0700 +++ b/Actor.cpp Thu Oct 24 23:22:46 2013 -0700 @@ -4056,3 +4056,63 @@ else return 0; } +//----- (0042F4DA) -------------------------------------------------------- +bool CheckActors_proximity() +{ + signed int distance; // edi@1 + int for_x; // ebx@5 + int for_y; // [sp+Ch] [bp-10h]@5 + int for_z; // [sp+10h] [bp-Ch]@5 + int v3; // eax@5 + int v4; // ebx@5 + unsigned int v5; // ecx@5 + int v6; // edx@6 + unsigned int v7; // edx@8 + unsigned int v8; // edx@10 + + + distance = 5120; + if ( uCurrentlyLoadedLevelType == LEVEL_Indoor) + distance = 2560; + + if ( (signed int)uNumActors <= 0 ) + return false; + for ( uint i = 0; i < (signed int)uNumActors; ++i ) + { + for_x = abs(pActors[i].vInitialPosition.x - pParty->vPosition.x); + for_y = abs(pActors[i].vInitialPosition.y - pParty->vPosition.y); + for_z = abs(pActors[i].vInitialPosition.z - pParty->vPosition.z); + v3 = for_x; + v4 = for_y; + v5 = for_z; + if ( v3 < for_y ) + { + v6 = v3; + v3 = for_y; + v4 = v6; + } + if ( v3 < for_z ) + { + v7 = v3; + v3 = for_z; + v5 = v7; + } + if ( v4 < (signed int)v5 ) + { + v8 = v5; + v5 = v4; + v4 = v8; + } + if ( (signed int)(((unsigned int)(11 * v4) >> 5) + (v5 >> 2) + v3) < distance ) + { + if ( pActors[i].uAIState != Dead ) + { + if ( pActors[i].uAIState != Dying && pActors[i].uAIState != Removed + && pActors[i].uAIState != Disabled && pActors[i].uAIState != Summoned + && (BYTE2(pActors[i].uAttributes) & 8 || pActors[i].GetActorsRelation(0) ) ) + return true; + } + } + } + return false; +}
--- a/Actor.h Thu Oct 24 23:21:05 2013 -0700 +++ b/Actor.h Thu Oct 24 23:22:46 2013 -0700 @@ -298,3 +298,5 @@ extern std::array<Actor, 500> pActors; extern size_t uNumActors; + +bool CheckActors_proximity(); \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Build/Visual Studio 2010/World of Might and Magic.sln Thu Oct 24 23:22:46 2013 -0700 @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +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 2010/World of Might and Magic.vcxproj Thu Oct 24 23:22:46 2013 -0700 @@ -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>v100</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 2010/World of Might and Magic.vcxproj.filters Thu Oct 24 23:22:46 2013 -0700 @@ -0,0 +1,419 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClInclude Include="MM7.h" /> + <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="AudioPlayer.h" /> + <ClInclude Include="VideoPlayer.h" /> + <ClInclude Include="Texture.h" /> + <ClInclude Include="LOD.h" /> + <ClInclude Include="Mouse.h" /> + <ClInclude Include="LightmapBuilder.h" /> + <ClInclude Include="Vis.h" /> + <ClInclude Include="Render.h" /> + <ClInclude Include="Game.h" /> + <ClInclude Include="VectorTypes.h" /> + <ClInclude Include="ParticleEngine.h" /> + <ClInclude Include="IndoorCameraD3D.h" /> + <ClInclude Include="Keyboard.h" /> + <ClInclude Include="Party.h" /> + <ClInclude Include="Player.h" /> + <ClInclude Include="CShow.h" /> + <ClInclude Include="stru6.h" /> + <ClInclude Include="stru9.h" /> + <ClInclude Include="stru10.h" /> + <ClInclude Include="stru11.h" /> + <ClInclude Include="stru12.h" /> + <ClInclude Include="GammaControl.h" /> + <ClInclude Include="Indoor.h" /> + <ClInclude Include="Outdoor.h" /> + <ClInclude Include="BSPModel.h" /> + <ClInclude Include="Actor.h" /> + <ClInclude Include="Items.h" /> + <ClInclude Include="Monsters.h" /> + <ClInclude Include="NPC.h" /> + <ClInclude Include="PaletteManager.h" /> + <ClInclude Include="GUIButton.h" /> + <ClInclude Include="GUIFont.h" /> + <ClInclude Include="GUIWindow.h" /> + <ClInclude Include="Spells.h" /> + <ClInclude Include="DecalBuilder.h" /> + <ClInclude Include="Lights.h" /> + <ClInclude Include="Arcomage.h" /> + <ClInclude Include="GUIProgressBar.h" /> + <ClInclude Include="Events.h" /> + <ClInclude Include="Sprites.h" /> + <ClInclude Include="Overlays.h" /> + <ClInclude Include="Time.h" /> + <ClInclude Include="Chest.h" /> + <ClInclude Include="mm7_data.h" /> + <ClInclude Include="Viewport.h" /> + <ClInclude Include="MapInfo.h" /> + <ClInclude Include="PlayerFrameTable.h" /> + <ClInclude Include="OSInfo.h" /> + <ClInclude Include="Math.h" /> + <ClInclude Include="Weather.h" /> + <ClInclude Include="IconFrameTable.h" /> + <ClInclude Include="ObjectList.h" /> + <ClInclude Include="DecorationList.h" /> + <ClInclude Include="Outdoor_stuff.h" /> + <ClInclude Include="Random.h" /> + <ClInclude Include="Indoor_stuff.h" /> + <ClInclude Include="stru157.h" /> + <ClInclude Include="stru123.h" /> + <ClInclude Include="AIL.h" /> + <ClInclude Include="Bink_Smacker.h" /> + <ClInclude Include="TurnEngine.h" /> + <ClInclude Include="stru220.h" /> + <ClInclude Include="stru279.h" /> + <ClInclude Include="stru314.h" /> + <ClInclude Include="SaveLoad.h" /> + <ClInclude Include="stru287.h" /> + <ClInclude Include="Awards.h" /> + <ClInclude Include="Autonotes.h" /> + <ClInclude Include="stru160.h" /> + <ClInclude Include="FactionTable.h" /> + <ClInclude Include="StorylineTextTable.h" /> + <ClInclude Include="stru277.h" /> + <ClInclude Include="stru298.h" /> + <ClInclude Include="OSAPI.h" /> + <ClInclude Include="Events2D.h" /> + <ClInclude Include="stru176.h" /> + <ClInclude Include="stru159.h" /> + <ClInclude Include="stru351.h" /> + <ClInclude Include="stru272.h" /> + <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="Log.h" /> + <ClInclude Include="FrameTableInc.h" /> + <ClInclude Include="resource.h" /> + <ClInclude Include="stru346.h" /> + <ClInclude Include="texts.h" /> + <ClInclude Include="UI\UIHouses.h"> + <Filter>UI</Filter> + </ClInclude> + <ClInclude Include="Level\Decoration.h"> + <Filter>Level</Filter> + </ClInclude> + <ClInclude Include="Conditions.h" /> + <ClInclude Include="NZIArray.h" /> + <ClInclude Include="OSWindow.h" /> + <ClInclude Include="NewUI\MainMenu.h"> + <Filter>NewUI</Filter> + </ClInclude> + <ClInclude Include="NewUI\Core\UIControl.h"> + <Filter>NewUI\Core</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <Filter Include="lib"> + <UniqueIdentifier>{674d5845-1afa-4bb4-b0f9-e59bdcf6bf46}</UniqueIdentifier> + </Filter> + <Filter Include="lib\legacy_dx"> + <UniqueIdentifier>{7f786ac2-aa3f-48a5-81ef-d5bcf2ee57bf}</UniqueIdentifier> + </Filter> + <Filter Include="lib\zlib"> + <UniqueIdentifier>{2c8eede3-bdcb-4411-b5e3-86c1c48e8351}</UniqueIdentifier> + </Filter> + <Filter Include="UI"> + <UniqueIdentifier>{d3dc8b56-9b77-4b4f-adae-767b4576537d}</UniqueIdentifier> + </Filter> + <Filter Include="UI\Books"> + <UniqueIdentifier>{e97134e5-029e-4065-bcd8-a4a00333b990}</UniqueIdentifier> + </Filter> + <Filter Include="Level"> + <UniqueIdentifier>{5fd52edd-099a-407a-b897-6a369c82b64f}</UniqueIdentifier> + </Filter> + <Filter Include="NewUI"> + <UniqueIdentifier>{161ab378-81a8-4a60-8b20-691a826dbb7d}</UniqueIdentifier> + </Filter> + <Filter Include="NewUI\Core"> + <UniqueIdentifier>{5905ea57-e631-40d3-9139-94e4ec73c51f}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <None Include="lib\legacy_dx\d3dvec.inl"> + <Filter>lib\legacy_dx</Filter> + </None> + </ItemGroup> + <ItemGroup> + <ClCompile Include="mm7_2.cpp" /> + <ClCompile Include="Game.cpp" /> + <ClCompile Include="GammaControl.cpp" /> + <ClCompile Include="Monsters.cpp" /> + <ClCompile Include="Time.cpp" /> + <ClCompile Include="Actor.cpp" /> + <ClCompile Include="Items.cpp" /> + <ClCompile Include="LOD.cpp" /> + <ClCompile Include="Render.cpp" /> + <ClCompile Include="Spells.cpp" /> + <ClCompile Include="Overlays.cpp" /> + <ClCompile Include="Chest.cpp" /> + <ClCompile Include="GUIWindow.cpp" /> + <ClCompile Include="Keyboard.cpp" /> + <ClCompile Include="LightmapBuilder.cpp" /> + <ClCompile Include="Arcomage.cpp" /> + <ClCompile Include="Mouse.cpp" /> + <ClCompile Include="Texture.cpp" /> + <ClCompile Include="DecalBuilder.cpp" /> + <ClCompile Include="IndoorCameraD3D.cpp" /> + <ClCompile Include="Sprites.cpp" /> + <ClCompile Include="Vis.cpp" /> + <ClCompile Include="GUIFont.cpp" /> + <ClCompile Include="Indoor.cpp" /> + <ClCompile Include="Outdoor.cpp" /> + <ClCompile Include="Player.cpp" /> + <ClCompile Include="stru10.cpp" /> + <ClCompile Include="LightsStack.cpp" /> + <ClCompile Include="BSPModel.cpp" /> + <ClCompile Include="PaletteManager.cpp" /> + <ClCompile Include="ParticleEngine.cpp" /> + <ClCompile Include="Party.cpp" /> + <ClCompile Include="stru9.cpp" /> + <ClCompile Include="stru6.cpp" /> + <ClCompile Include="AudioPlayer.cpp" /> + <ClCompile Include="GUIButton.cpp" /> + <ClCompile Include="VideoPlayer.cpp" /> + <ClCompile Include="GUIProgressBar.cpp" /> + <ClCompile Include="TileFrameTable.h" /> + <ClCompile Include="Weather.cpp" /> + <ClCompile Include="Random.cpp" /> + <ClCompile Include="SaveLoad.cpp" /> + <ClCompile Include="mm7_3.cpp" /> + <ClCompile Include="mm7_data.cpp" /> + <ClCompile Include="AIL.cpp" /> + <ClCompile Include="Bink_Smacker.cpp" /> + <ClCompile Include="Events.cpp" /> + <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="Log.cpp" /> + <ClCompile Include="OSAPI.cpp" /> + <ClCompile Include="mm7_4.cpp" /> + <ClCompile Include="mm7_5.cpp" /> + <ClCompile Include="FrameTableInc.cpp" /> + <ClCompile Include="mm7_6.cpp" /> + <ClCompile Include="StorylineTextTable.cpp" /> + <ClCompile Include="texts.cpp" /> + <ClCompile Include="mm7text_ru.cpp" /> + <ClCompile Include="NPC.cpp" /> + <ClCompile Include="SpriteObject.cpp" /> + <ClCompile Include="Viewport.cpp" /> + <ClCompile Include="_deleted.cpp" /> + <ClCompile Include="TileTable.cpp" /> + <ClCompile Include="CShow.cpp" /> + <ClCompile Include="ArcomageCards.cpp" /> + <ClCompile Include="IconFrameTable.cpp" /> + <ClCompile Include="CastSpellInfo.cpp" /> + <ClCompile Include="ObjectList.cpp" /> + <ClCompile Include="DecorationList.cpp" /> + <ClCompile Include="UI\UIBooks.cpp"> + <Filter>UI</Filter> + </ClCompile> + <ClCompile Include="UI\UITransition.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\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\UIGuilds.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="TurnEngine.cpp" /> + <ClCompile Include="Conditions.cpp" /> + <ClCompile Include="Level\Decoration.cpp"> + <Filter>Level</Filter> + </ClCompile> + <ClCompile Include="VectorTypes.cpp" /> + <ClCompile Include="OSWindow.cpp" /> + <ClCompile Include="NewUI\MainMenu.cpp"> + <Filter>NewUI</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="Might and Magic Trilogy.rc" /> + </ItemGroup> +</Project> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.user Thu Oct 24 23:22:46 2013 -0700 @@ -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'"> + <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> + <LocalDebuggerCommandArguments>-novideo, -nomarg</LocalDebuggerCommandArguments> + <LocalDebuggerCommand>$(OutDir)$(TargetName)$(TargetExt)</LocalDebuggerCommand> + </PropertyGroup> +</Project> \ No newline at end of file
--- a/Build/Visual Studio 2012/World of Might and Magic.sln Thu Oct 24 23:21:05 2013 -0700 +++ b/Build/Visual Studio 2012/World of Might and Magic.sln Thu Oct 24 23:22:46 2013 -0700 @@ -1,4 +1,4 @@ - + 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}"
--- a/Build/init_win.bat Thu Oct 24 23:21:05 2013 -0700 +++ b/Build/init_win.bat Thu Oct 24 23:22:46 2013 -0700 @@ -1,6 +1,5 @@ @echo off -set _mm7_install_dir=E:\g\mm collection\MM_VII - +set _mm7_install_dir=C:\Program Files\Buka\MMCollection\MM_VII @@ -37,10 +36,10 @@ :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 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" +reg query "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v "WoMM_MM7_INSTALL_DIR" goto end :win_vista
--- a/Game.cpp Thu Oct 24 23:21:05 2013 -0700 +++ b/Game.cpp Thu Oct 24 23:22:46 2013 -0700 @@ -3618,7 +3618,7 @@ pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; if ( pCurrentScreen ) continue; - if ( _42F4DA_check_actor_proximity() ) + if ( CheckActors_proximity() ) { if ( pParty->bTurnBasedModeOn == 1 ) {
--- a/Render.cpp Thu Oct 24 23:21:05 2013 -0700 +++ b/Render.cpp Thu Oct 24 23:22:46 2013 -0700 @@ -4964,43 +4964,30 @@ //----- (004A2ED5) -------------------------------------------------------- void Render::DrawIndoorSkyPolygon(signed int uNumVertices, struct Polygon *pSkyPolygon, IDirect3DTexture2 *pTexture) { - signed int v4; // edi@2 int v5; // eax@3 - int v6; // edx@5 - RenderVertexD3D3 *v7; // eax@6 - RenderVertexSoft *v8; // ecx@6 - //double v9; // st6@7 - //int v10; // ebx@7 - //int v11; // ebx@7 if ( this->uNumD3DSceneBegins ) { - v4 = uNumVertices; if ( uNumVertices >= 3 ) { ErrD3D(pRenderD3D->pDevice->SetTextureStageState(0, D3DTSS_ADDRESS, D3DTADDRESS_WRAP)); v5 = 31 - (pSkyPolygon->dimming_level & 0x1F); if ( v5 < pOutdoor->max_terrain_dimming_level ) v5 = pOutdoor->max_terrain_dimming_level; - v6 = 8 * v5 | ((8 * v5 | (v5 << 11)) << 8); - for (uint i = 0; i < uNumVertices; ++i) - { - d3d_vertex_buffer[i].pos.x = array_507D30[i].vWorldViewProjX; - d3d_vertex_buffer[i].pos.y = array_507D30[i].vWorldViewProjY; - d3d_vertex_buffer[i].pos.z = 1.0 - 1.0 / array_507D30[i].vWorldViewPosition.y; - d3d_vertex_buffer[i].rhw = array_507D30[i]._rhw; - d3d_vertex_buffer[i].diffuse = v6; - d3d_vertex_buffer[i].specular = 0; - d3d_vertex_buffer[i].texcoord.x = array_507D30[i].u; - d3d_vertex_buffer[i].texcoord.y = array_507D30[i].v; - } - + for (uint i = 0; i < uNumVertices; ++i) + { + d3d_vertex_buffer[i].pos.x = array_507D30[i].vWorldViewProjX; + d3d_vertex_buffer[i].pos.y = array_507D30[i].vWorldViewProjY; + d3d_vertex_buffer[i].pos.z = 1.0 - 1.0 / array_507D30[i].vWorldViewPosition.y; + d3d_vertex_buffer[i].rhw = array_507D30[i]._rhw; + d3d_vertex_buffer[i].diffuse = 8 * v5 | ((8 * v5 | (v5 << 11)) << 8); + d3d_vertex_buffer[i].specular = 0; + d3d_vertex_buffer[i].texcoord.x = array_507D30[i].u; + d3d_vertex_buffer[i].texcoord.y = array_507D30[i].v; + } ErrD3D(pRenderD3D->pDevice->SetTexture(0, pTexture)); - ErrD3D(pRenderD3D->pDevice->DrawPrimitive(D3DPT_TRIANGLEFAN, - D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1, - d3d_vertex_buffer, - uNumVertices, - 28)); + ErrD3D(pRenderD3D->pDevice->DrawPrimitive(D3DPT_TRIANGLEFAN, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1, + d3d_vertex_buffer, uNumVertices, 28)); } } }
--- a/mm7_6.cpp Thu Oct 24 23:21:05 2013 -0700 +++ b/mm7_6.cpp Thu Oct 24 23:22:46 2013 -0700 @@ -1072,84 +1072,6 @@ pIconsFrameTable->InitializeAnimation(uIconID_CharacterFrame); } -//----- (0042F4DA) -------------------------------------------------------- -int _42F4DA_check_actor_proximity() -{ - signed int v0; // edi@1 - Actor *v1; // esi@4 - int v2; // ebx@5 - int v3; // eax@5 - int v4; // ebx@5 - unsigned int v5; // ecx@5 - int v6; // edx@6 - unsigned int v7; // edx@8 - unsigned int v8; // edx@10 - __int16 v9; // ax@12 - signed int result; // eax@20 - int v11; // [sp+Ch] [bp-10h]@5 - int v12; // [sp+10h] [bp-Ch]@5 - signed int v13; // [sp+14h] [bp-8h]@3 - - v0 = 5120; - if ( uCurrentlyLoadedLevelType == LEVEL_Indoor) - v0 = 2560; - v13 = 0; - if ( (signed int)uNumActors <= 0 ) - { - result = 0; - } - else - { - v1 = pActors.data(); - while ( 1 ) - { - v2 = abs(v1->vInitialPosition.x - pParty->vPosition.x); - v11 = abs(v1->vInitialPosition.y - pParty->vPosition.y); - v12 = abs(v1->vInitialPosition.z - pParty->vPosition.z); - v3 = v2; - v4 = v11; - v5 = v12; - if ( v3 < v11 ) - { - v6 = v3; - v3 = v11; - v4 = v6; - } - if ( v3 < v12 ) - { - v7 = v3; - v3 = v12; - v5 = v7; - } - if ( v4 < (signed int)v5 ) - { - v8 = v5; - v5 = v4; - v4 = v8; - } - if ( (signed int)(((unsigned int)(11 * v4) >> 5) + (v5 >> 2) + v3) < v0 ) - { - v9 = v1->uAIState; - if ( v1->uAIState != 5 ) - { - if ( v9 != 4 - && v9 != 11 - && v9 != 19 - && v9 != 17 - && (BYTE2(v1->uAttributes) & 8 || ((Actor *)nullptr)->GetActorsRelation( v1)) ) - break; - } - } - ++v13; - ++v1; - if ( v13 >= (signed int)uNumActors ) - return 0; - } - result = 1; - } - return result; -} - //----- (0042F7EB) -------------------------------------------------------- bool __fastcall sub_42F7EB_DropItemAt(unsigned int uSpriteID, int x, int y, int z, int a4, int count, int a7, unsigned __int16 attributes, ItemGen *a9) {
--- a/mm7_data.h Thu Oct 24 23:21:05 2013 -0700 +++ b/mm7_data.h Thu Oct 24 23:22:46 2013 -0700 @@ -1097,7 +1097,6 @@ void _42777D_CastSpell_UseWand_ShootArrow(int a1, unsigned int uPlayerID, unsigned int a4, __int16 a5, int a6); void _42ECB5_PlayerAttacksActor(); void InitializeTurnBasedAnimations(void *); -int _42F4DA_check_actor_proximity(); bool __fastcall sub_42F7EB_DropItemAt(unsigned int uSpriteID, int x, int y, int z, int a4, int count, int a7, unsigned __int16 attributes, ItemGen *a9); void __fastcall sub_42F960_create_object(int x, int y, int z); // idb void CompactLayingItemsList();