Mercurial > mm7

changeset 1380:635500df9320

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 16 Jul 2013 14:11:43 +0600
parents db3769ae574c (diff) 1fb9f4b9b6a7 (current diff)
children 729635c2bb40
files Indoor.cpp
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Indoor.cpp	Tue Jul 16 11:05:52 2013 +0200
+++ b/Indoor.cpp	Tue Jul 16 14:11:43 2013 +0600
@@ -6852,7 +6852,7 @@
   int v34; // eax@66
   int v35; // dx@66
   __int16 v36; // dx@67
-  __int16 v37; // di@67
+  //__int16 v37; // di@67
   __int16 v38; // dx@67
   int v46; // edx@87
   int v49; // esi@93
@@ -7027,9 +7027,9 @@
       if ( far_portal->viewport_left_side[v70] > far_portal->viewport_right_side[v70] )
       {
         v36 = far_portal->viewport_left_side[v70] ^ far_portal->viewport_right_side[v70];
-        v37 = far_portal->viewport_right_side[v70];
+        //v37 = far_portal->viewport_right_side[v70];
         far_portal->viewport_left_side[v70] = v36;
-        v38 = v37 ^ v36;
+        v38 = far_portal->viewport_right_side[v70] ^ v36;
         far_portal->viewport_left_side[v70] ^= v38;
         far_portal->viewport_right_side[v70] = v38;
       }
@@ -7066,7 +7066,7 @@
       break;
   }
   if ( min_y >= max_y )
-    return false;// incorect working portal faceID 1105(      1105   )
+    return false;// incorect working portal faceID 1105(       1105   )
   //*************************************************************************************************************************************
   v59 = min_y;
   for ( v46 = max_y - min_y + 1; v46; --v46 )
@@ -7080,9 +7080,9 @@
   far_portal->_viewport_space_y = min_y;
   far_portal->_viewport_space_w = max_y;
   far_portal->_viewport_space_x = far_portal->viewport_left_side[min_y];
+  far_portal->_viewport_space_z = far_portal->viewport_right_side[min_y];
   far_portal->_viewport_x_minID = min_y;
   far_portal->_viewport_z_maxID = min_y;
-  far_portal->_viewport_space_z = far_portal->viewport_right_side[min_y];
   v49 = min_y + 1;
   if ( v49 <= max_y )
   {