Mercurial > mm7

diff Indoor.cpp @ 2242:c4f87fb3cfee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
for NextTurn()
author Ritor1
date Mon, 24 Feb 2014 16:19:01 +0600
parents 6ab7d7c112bb
children 47bcb700b74b aff7a7b072b7
line wrap: on
line diff
--- a/Indoor.cpp	Sun Feb 23 03:07:46 2014 +0100
+++ b/Indoor.cpp	Mon Feb 24 16:19:01 2014 +0600
@@ -2819,7 +2819,7 @@
       }
       if ( pActors[actor_id].uAIState == Pursuing || pActors[actor_id].uAIState == Fleeing )
         v6 *= 2;
-      if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 1 )
+      if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == TE_WAIT )
         v6 = (signed __int64)((double)v6 * flt_6BE3AC_debug_recmod1_x_1_6);
       if ( v6 > 1000 )
         v6 = 1000;
@@ -2945,7 +2945,7 @@
               v37 = PID_ID(stru_721530.uFaceID);
               if ( PID_TYPE(stru_721530.uFaceID) == OBJECT_Actor)
               {
-                if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 2 || pTurnEngine->turn_stage == 3) )
+                if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == TE_ATTACK || pTurnEngine->turn_stage == TE_MOVEMENT) )
                 {
                   pActors[actor_id].vVelocity.x = fixpoint_mul(58500, pActors[actor_id].vVelocity.x);
                   pActors[actor_id].vVelocity.y = fixpoint_mul(58500, pActors[actor_id].vVelocity.y);
@@ -3093,7 +3093,7 @@
           }
           else
           {
-            if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 2 || pTurnEngine->turn_stage == 3) )
+            if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == TE_ATTACK || pTurnEngine->turn_stage == TE_MOVEMENT) )
               goto LABEL_123;
             if ( !pActors[actor_id].pMonsterInfo.uHostilityType || v56 != v22 )
             {
@@ -6256,7 +6256,7 @@
 
     stru_721530.uSectorID = uSectorID;
     v38 = 0;
-    if ( pParty->bTurnBasedModeOn == true && pTurnEngine->turn_stage == 3 )
+    if ( pParty->bTurnBasedModeOn == true && pTurnEngine->turn_stage == TE_MOVEMENT )
       v38 = 13312;
     if ( stru_721530._47050A(v38) )
       break;