Mercurial > mm7

changeset 2468:48cc5e0d8fc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bool use_MMT = false;
author Ritor1
date Mon, 18 Aug 2014 11:26:34 +0600
parents 43faa2865d57
children 8516bb27d7f0
files Build/Visual Studio 2010/World of Might and Magic.vcxproj Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters Game.cpp
diffstat 3 files changed, 15 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Sun Aug 17 20:58:38 2014 +0100
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Mon Aug 18 11:26:34 2014 +0600
@@ -100,6 +100,7 @@
     <ClCompile Include="..\..\DecorationList.cpp" />
     <ClCompile Include="..\..\DirectX11.cpp" />
     <ClCompile Include="..\..\Events.cpp" />
+    <ClCompile Include="..\..\FactionTable.cpp" />
     <ClCompile Include="..\..\FrameTableInc.cpp" />
     <ClCompile Include="..\..\Game.cpp" />
     <ClCompile Include="..\..\GammaControl.cpp" />
@@ -182,11 +183,6 @@
     <ClCompile Include="..\..\MapInfo.cpp" />
     <ClCompile Include="..\..\MediaPlayer.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_7.cpp" />
     <ClCompile Include="..\..\mm7_data.cpp" />
     <ClCompile Include="..\..\MMT.cpp" />
@@ -205,18 +201,21 @@
     <ClCompile Include="..\..\ParticleEngine.cpp" />
     <ClCompile Include="..\..\Party.cpp" />
     <ClCompile Include="..\..\Player.cpp" />
+    <ClCompile Include="..\..\PlayerFrameTable.cpp" />
     <ClCompile Include="..\..\Player_wrap.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\Random.cpp" />
     <ClCompile Include="..\..\Registry.cpp" />
     <ClCompile Include="..\..\Render.cpp" />
+    <ClCompile Include="..\..\RenderD3D11.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="..\..\stru298.cpp" />
     <ClCompile Include="..\..\stru6.cpp" />
     <ClCompile Include="..\..\stru9.cpp" />
     <ClCompile Include="..\..\texts.cpp" />
@@ -279,6 +278,7 @@
     <ClInclude Include="..\..\Indoor.h" />
     <ClInclude Include="..\..\IndoorCameraD3D.h" />
     <ClInclude Include="..\..\Indoor_stuff.h" />
+    <ClInclude Include="..\..\IRender.h" />
     <ClInclude Include="..\..\Items.h" />
     <ClInclude Include="..\..\Keyboard.h" />
     <ClInclude Include="..\..\Level\Decoration.h" />
@@ -457,6 +457,7 @@
     <ClInclude Include="..\..\Random.h" />
     <ClInclude Include="..\..\Registry.h" />
     <ClInclude Include="..\..\Render.h" />
+    <ClInclude Include="..\..\RenderD3D11.h" />
     <ClInclude Include="..\..\RenderStruct.h" />
     <ClInclude Include="..\..\resource.h" />
     <ClInclude Include="..\..\SaveLoad.h" />
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Sun Aug 17 20:58:38 2014 +0100
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Mon Aug 18 11:26:34 2014 +0600
@@ -532,6 +532,8 @@
     </ClInclude>
     <ClInclude Include="..\..\DirectX11.h" />
     <ClInclude Include="..\..\RenderStruct.h" />
+    <ClInclude Include="..\..\IRender.h" />
+    <ClInclude Include="..\..\RenderD3D11.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="lib">
@@ -669,11 +671,6 @@
     <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_7.cpp" />
     <ClCompile Include="..\..\mm7_data.cpp" />
     <ClCompile Include="..\..\Monsters.cpp" />
@@ -963,6 +960,10 @@
       <Filter>UI</Filter>
     </ClCompile>
     <ClCompile Include="..\..\DirectX11.cpp" />
+    <ClCompile Include="..\..\RenderD3D11.cpp" />
+    <ClCompile Include="..\..\PlayerFrameTable.cpp" />
+    <ClCompile Include="..\..\stru298.cpp" />
+    <ClCompile Include="..\..\FactionTable.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig">
--- a/Game.cpp	Sun Aug 17 20:58:38 2014 +0100
+++ b/Game.cpp	Mon Aug 18 11:26:34 2014 +0600
@@ -5452,7 +5452,9 @@
 	FinalInitialization();
 
 	//Ritor1: include
-	MMT_MainMenu_Loop();
+	bool use_MMT = false;
+    if (use_MMT)
+	  MMT_MainMenu_Loop();
 
 	Log::Warning(L"MM: entering main loop");
 	while (1)