# HG changeset patch
# User Ritor1
# Date 1360223672 -21600
# Node ID 8c0fcfa72fce80785b4ceed4abc0fcf9a1a73304
# Parent  bb449743ee81df1bee54f55066f7f2b5bdfe7aa0# Parent  448b02e9b8a35d91affe0e33ef78502e6af4cb41
Слияние

diff -r 448b02e9b8a3 -r 8c0fcfa72fce IndoorCameraD3D.cpp
--- a/IndoorCameraD3D.cpp	Wed Feb 06 23:55:12 2013 +0000
+++ b/IndoorCameraD3D.cpp	Thu Feb 07 13:54:32 2013 +0600
@@ -1619,7 +1619,7 @@
 
       if ( a4 )
       {
-        __debugbreak();
+//        __debugbreak();
         v8 = (double)(signed int)pViewport->uViewportZ;
         if ( v8 >= pVertices[i].vWorldViewProjX )
           v9 = pVertices[i].vWorldViewProjX;
diff -r 448b02e9b8a3 -r 8c0fcfa72fce Render.cpp
--- a/Render.cpp	Wed Feb 06 23:55:12 2013 +0000
+++ b/Render.cpp	Thu Feb 07 13:54:32 2013 +0600
@@ -1026,7 +1026,7 @@
   int v125; // [sp+6Ch] [bp-8h]@9
   int v126; // [sp+70h] [bp-4h]@9
 
-  v105 = pIndoorCamera->sRotationY / ((signed int)stru_5C6E00->uIntegerHalfPi / 2);
+  v105 = pIndoorCamera->sRotationY / ((signed int)stru_5C6E00->uIntegerHalfPi / 2);//2
   pDirectionIndicator1 = stru_5C6E00->uDoublePiMask & (stru_5C6E00->uIntegerDoublePi - pIndoorCamera->sRotationY);//1536
   pDirectionIndicator2 = stru_5C6E00->uDoublePiMask & (stru_5C6E00->uIntegerPi + pDirectionIndicator1);//512
   v124 = ((pIndoorCamera->uMapGridCellX << 16) + 3 * stru_5C6E00->SinCos(stru_5C6E00->uDoublePiMask & (stru_5C6E00->uIntegerPi + pDirectionIndicator1))) >> 16;
@@ -1624,7 +1624,7 @@
 	  v102.v103 = abs((int)pIndoorCamera->uMapGridCellZ - terrain_76D9C8[i]);
       v102.v104 = abs((int)pIndoorCamera->uMapGridCellX - terrain_76DBC8[i]);
 	  if ( pRenderer->pRenderD3D )//Ritor1: do comment to test
-        Render::RenderTerrainD3D();//Render::DrawTerrainD3D(v111, 0, (int)&v102);
+        Render::DrawTerrainD3D(v111, 0, (int)&v102);//Render::RenderTerrainD3D();
       else
         Render::DrawTerrainSW(v111, 0, (int)&v102);
     }
@@ -2165,12 +2165,12 @@
           if ( pOutdoorCamera->numStru148s >= 1999 )
             return;
           ++pOutdoorCamera->numStru148s;
-          if ( !sub_481FC9(v8, pVertices, v101, v16) )
+          //if ( !sub_481FC9(v8, pVertices, v101, v16) )//Ritor1: It's temporary
           //goto LABEL_126;
-          {
-            --pOutdoorCamera->numStru148s;
-            goto LABEL_162;
-          }
+          //{
+            //--pOutdoorCamera->numStru148s;
+            //goto LABEL_162;
+          //}
           memcpy(&array_50AC10[0], v102, 0x30u);
           array_50AC10[0].flt_20 = 1.0 / (v102->vWorldViewPosition.x + 0.0000001000000011686097);
           array_50AC10[0].u = 0.0;