Mercurial > might-and-magic-trilogy

diff mm7_4.cpp @ 127:9eac46182d8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 04 Nov 2012 09:37:39 +0600
parents 6305c1cd9f6e
children 8be5293b6b33 ccc0cf95706a
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Nov 04 09:37:15 2012 +0600
+++ b/mm7_4.cpp	Sun Nov 04 09:37:39 2012 +0600
@@ -7958,7 +7958,7 @@
               v89 = v4->pLevelOfDetail3;
               v98 = stru_F8A590._viewport_space_y * pRenderer->uTargetSurfacePitch;
               v104 = 2 * pBLVRenderParams->field_0_timer_;
-              if ( stru_F8A590._viewport_space_y <= stru_F8A590.field_4 )
+              if ( stru_F8A590._viewport_space_y <= stru_F8A590._viewport_space_w )
               {
                 v12 = 2 * stru_F8A590._viewport_space_y;
                 v101 = 2 * stru_F8A590._viewport_space_y;
@@ -8290,7 +8290,7 @@
                   result = a2;
                   v101 += 2;
                   v99 += 640;
-                  if ( a2 > stru_F8A590.field_4 )
+                  if ( a2 > stru_F8A590._viewport_space_w )
                     break;
                   v12 = v101;
                   result = a2;
@@ -8444,7 +8444,7 @@
           v12 = stru_F8A590._viewport_space_y;
           v51 = v11;
           v60 = stru_F8A590._viewport_space_y;
-          if ( stru_F8A590._viewport_space_y <= stru_F8A590.field_4 )
+          if ( stru_F8A590._viewport_space_y <= stru_F8A590._viewport_space_w )
           {
             v13 = 2 * stru_F8A590._viewport_space_y;
             v14 = &stru_F83B80[stru_F8A590._viewport_space_y];
@@ -8573,7 +8573,7 @@
               ++i;
               v56 += 640;
               v55 += 2;
-              if ( v60 > stru_F8A590.field_4 )
+              if ( v60 > stru_F8A590._viewport_space_w )
                 break;
               v13 = v55;
               v12 = v60;