# HG changeset patch
# User Ritor1
# Date 1361069462 -21600
# Node ID 125354fe1b9f8ba741ebee2c70db1f555306c6e6
# Parent  f7c2689957884c6260eff2dba21df0150c7fe252# Parent  335db7429f7cd28cf73d62cd01638921dd301d34
Слияние

diff -r 335db7429f7c -r 125354fe1b9f AudioPlayer.cpp
--- a/AudioPlayer.cpp	Sun Feb 17 05:31:47 2013 +0200
+++ b/AudioPlayer.cpp	Sun Feb 17 08:51:02 2013 +0600
@@ -737,7 +737,6 @@
   int v102; // [sp+90h] [bp+1Ch]@60
   int v103; // [sp+90h] [bp+1Ch]@68
 
-  uVolume = 120; //Ritor1:It's temporary
   pAudioPlayer = this;
   v35 = this->bPlayerReady == 0;
   //pAudioPlayer = this;
diff -r 335db7429f7c -r 125354fe1b9f GUIWindow.cpp
--- a/GUIWindow.cpp	Sun Feb 17 05:31:47 2013 +0200
+++ b/GUIWindow.cpp	Sun Feb 17 08:51:02 2013 +0600
@@ -1766,7 +1766,6 @@
     DrawText(a2, v4, a4, 0, "_", 0, 0, 0);
 }
 
-
 //----- (0041C432) --------------------------------------------------------
 GUIWindow *GUIWindow::Create(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight, WindowType eWindowType, int pButton, int a5)
 {
diff -r 335db7429f7c -r 125354fe1b9f Indoor.cpp
--- a/Indoor.cpp	Sun Feb 17 05:31:47 2013 +0200
+++ b/Indoor.cpp	Sun Feb 17 08:51:02 2013 +0600
@@ -1257,8 +1257,6 @@
   return result;
 }
 
-
-
 //----- (004B0EA8) --------------------------------------------------------
 void BspRenderer::PrepareFaceRenderList_d3d(int a2, unsigned int uFaceID)
 {
diff -r 335db7429f7c -r 125354fe1b9f LayingItem.cpp
--- a/LayingItem.cpp	Sun Feb 17 05:31:47 2013 +0200
+++ b/LayingItem.cpp	Sun Feb 17 08:51:02 2013 +0600
@@ -113,7 +113,7 @@
   unsigned __int16 *pAttributes; // ecx@2
   unsigned __int16 v3; // ax@2
 
-  __debugbreak(); // find out what's going on
+  //__debugbreak(); // find out what's going on
 
   v1 = uLayingItemID;
   pLayingItems[v1].uObjectDescID = 0;
@@ -123,7 +123,7 @@
     v3 = *pAttributes;
     if ( *pAttributes & 4 )
     {
-      LOBYTE(v3) = v3 & 0xFB;
+      v3 = v3 & 0xFB;
       --pTurnEngine->field_1C;
       *pAttributes = v3;
     }
diff -r 335db7429f7c -r 125354fe1b9f MM7.vcxproj.filters
--- a/MM7.vcxproj.filters	Sun Feb 17 05:31:47 2013 +0200
+++ b/MM7.vcxproj.filters	Sun Feb 17 08:51:02 2013 +0600
@@ -199,6 +199,9 @@
     </ClInclude>
     <ClInclude Include="Log.h" />
     <ClInclude Include="FrameTableInc.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="stru346.h" />
+    <ClInclude Include="texts.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="lib">
@@ -314,5 +317,9 @@
     <ClCompile Include="FrameTableInc.cpp" />
     <ClCompile Include="mm7_6.cpp" />
     <ClCompile Include="GameUIs.cpp" />
+    <ClCompile Include="texts.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Might and Magic Trilogy.rc" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -r 335db7429f7c -r 125354fe1b9f Outdoor.cpp
--- a/Outdoor.cpp	Sun Feb 17 05:31:47 2013 +0200
+++ b/Outdoor.cpp	Sun Feb 17 08:51:02 2013 +0600
@@ -2407,20 +2407,6 @@
   int v3; // esi@5
   unsigned int result; // eax@9
 
-
-/*    v3 = *(&this->pTerrain.pTilemap[128 * uZ] + uX);
-    if ( v3 < 198 )
-    {
-      if ( v3 >= 90 )
-        v3 = v3 + this->pTileTypes[(v3 - 90) / 36].uTileID - 36 * (v3 - 90) / 36 - 90;
-    }
-    else
-    {
-      v3 = v3 + this->pTileTypes[3].uTileID - 198;
-    }
-    result = pTileTable->pTiles[v3].uBitmapID;
-  }
-  return result;*/
    if ( uX < 0 || uX > 127 || uY < 0 || uY > 127)
    return 0;
 
@@ -2452,20 +2438,7 @@
 int OutdoorLocation::ActuallyGetSomeOtherTileInfo(unsigned int uX, unsigned int uY)
 {
   int v3; // esi@5
-  //int result; // eax@7
 
-/*  if ( (uX & 0x80000000u) != 0 || (signed int)uX > 127 || (uY & 0x80000000u) != 0 || (signed int)uY > 127 )
-  {
-    result = 0;
-  }
-  else
-  {
-    v3 = *(&this->pTerrain.pTilemap[128 * uY] + uX);
-    if ( v3 >= 90 )
-      v3 = v3 + this->pTileTypes[(v3 - 90) / 36].uTileID - 36 * (v3 - 90) / 36 - 90;
-    result = pTileTable->pTiles[v3].uAttributes;
-  }
-  return result;*/
   if (uX < 0 || uX > 127 || uY < 0 || uY > 127)
     return 0;
   else
diff -r 335db7429f7c -r 125354fe1b9f Spells.cpp
diff -r 335db7429f7c -r 125354fe1b9f Vis.cpp
diff -r 335db7429f7c -r 125354fe1b9f mm7_3.cpp
--- a/mm7_3.cpp	Sun Feb 17 05:31:47 2013 +0200
+++ b/mm7_3.cpp	Sun Feb 17 08:51:02 2013 +0600
@@ -14668,7 +14668,7 @@
           v77 = (unsigned __int16 *)v36;
           do
           {
-            *(short *)v32 = v78[*((char *)v77 + v37)];
+            *(short *)v32 = v78[*((char *)v77 + v37)];//crash
             v32 += 2;
             v97 = (char *)v97 + v87;
             v37 = (signed int)v97 >> 16;
@@ -14734,7 +14734,7 @@
   v7 = (uint *)pIndoor->pMapOutlines;
   uNumBlueFacesInBLVMinimap = 0;
   v8 = pIndoor->pMapOutlines->uNumOutlines == 0;
-  v9 = (pIndoor->pMapOutlines->uNumOutlines & 0x80000000u) != 0;
+  v9 = pIndoor->pMapOutlines->uNumOutlines < 0;
   v94 = 0;
   if ( !(v9 | v8) )
   {