Mercurial > mm7

diff Indoor.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 14695590d7a6
line wrap: on
line diff
--- a/Indoor.cpp	Thu Jul 11 17:47:12 2013 +0600
+++ b/Indoor.cpp	Thu Jul 11 17:47:33 2013 +0600
@@ -3893,7 +3893,7 @@
           v6 *= 2;
           v61 = v6;
         }
-        if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 1 )
+        if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 1 )
           v6 = (signed __int64)((double)v61 * flt_6BE3AC_debug_recmod1_x_1_6);
         if ( v6 > 1000 )
           v6 = 1000;
@@ -4196,7 +4196,7 @@
               Actor::AI_FaceObject(v63, v36, v22, (AIDirection *)v22);
               goto LABEL_119;
             }
-            if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 2 || pTurnEngine->field_4 == 3) )
+            if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 2 || pTurnEngine->turn_stage == 3) )
               goto LABEL_119;
             if ( v0->pMonsterInfo.uHostilityType )
             {
@@ -4224,7 +4224,7 @@
         }
         else
         {
-          if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 2 || pTurnEngine->field_4 == 3) )
+          if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 2 || pTurnEngine->turn_stage == 3) )
             goto LABEL_123;
           if ( !v0->pMonsterInfo.uHostilityType || v56 != v22 )
           {