Mercurial > might-and-magic-trilogy

diff mm7_1.cpp @ 107:ccc0cf95706a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 05 Nov 2012 09:16:17 +0600
parents f76e4ea4a224
children 8be5293b6b33
line wrap: on
line diff
--- a/mm7_1.cpp	Mon Nov 05 09:15:53 2012 +0600
+++ b/mm7_1.cpp	Mon Nov 05 09:16:17 2012 +0600
@@ -7261,7 +7261,7 @@
   v10 = v65;
   v68 = 0;
   v5->_viewport_space_y = v7;
-  v5->field_4 = v8;
+  v5->_viewport_space_w = v8;
   v55 = v65;
   if ( v4 > 0 )
   {
@@ -7449,14 +7449,14 @@
   }
   v39 = a3;
   v40 = v73;
-  if ( v73 < a3->_viewport_space_y || (v41 = a3->field_4, v7 > v41) )
+  if ( v73 < a3->_viewport_space_y || (v41 = a3->_viewport_space_w, v7 > v41) )
     return 0;
   if ( v7 < a3->_viewport_space_y )
     v7 = a3->_viewport_space_y;
   if ( v73 > v41 )
   {
-    v40 = a3->field_4;
-    v73 = a3->field_4;
+    v40 = a3->_viewport_space_w;
+    v73 = a3->_viewport_space_w;
   }
   v71 = v7;
   if ( v7 <= v40 )
@@ -7510,7 +7510,7 @@
   }
   while ( v46 );
   v5->_viewport_space_y = v7;
-  v5->field_4 = v73;
+  v5->_viewport_space_w = v73;
   v5->field_8 = v5->array_18[v7];
   v48 = v5->array_3D8[v7];
   v5->field_10 = v7;