Mercurial > mm7

diff mm7_3.cpp @ 1345:b99aeb077d4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 11 Jul 2013 17:47:33 +0600
parents 65379a50e4eb 22cb507446a4
children 613c77e51e38 8557d021a31b
line wrap: on
line diff
--- a/mm7_3.cpp	Thu Jul 11 17:47:12 2013 +0600
+++ b/mm7_3.cpp	Thu Jul 11 17:47:33 2013 +0600
@@ -997,7 +997,7 @@
         v8 *= 2;
         v73 = v8;
       }
-      if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 1 )
+      if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 1 )
         v8 = (signed __int64)((double)v73 * flt_6BE3AC_debug_recmod1_x_1_6);
       if ( v8 > 1000 )
         v8 = 1000;
@@ -1176,7 +1176,7 @@
       switch ( PID_TYPE(v38) )
       {
         case OBJECT_Actor:
-          if ( pTurnEngine->field_4 != 2 && pTurnEngine->field_4 != 3 || pParty->bTurnBasedModeOn != 1 )
+          if ( pTurnEngine->turn_stage != 2 && pTurnEngine->turn_stage != 3 || pParty->bTurnBasedModeOn != 1 )
           {
 			//if(pParty->bTurnBasedModeOn == 1)
 				//v34 = 0;
@@ -1874,7 +1874,7 @@
     stru_721530.field_24 = pParty->uFallSpeed;
     stru_721530.uSectorID = uSectorID;
     v38 = 0;
-    if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 )
+    if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 )
       v38 = 13312;
     if ( stru_721530._47050A(v38) )
       break;
@@ -2778,7 +2778,7 @@
     stru_721530.field_24 = v121;
     v36 = 0;
     stru_721530.uSectorID = 0;
-    if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 )
+    if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 )
       v36 = 13312;
     if ( stru_721530._47050A(v36) )
       break;