Mercurial > mm7

diff Viewport.cpp @ 2247:529bf95fb0d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Wed, 26 Feb 2014 01:15:58 +0100
parents c4f87fb3cfee
children aff7a7b072b7
line wrap: on
line diff
--- a/Viewport.cpp	Wed Feb 26 01:14:18 2014 +0100
+++ b/Viewport.cpp	Wed Feb 26 01:15:58 2014 +0100
@@ -471,7 +471,7 @@
         pMessageQueue_50CBD0->AddMessage(UIMSG_StartNPCDialogue, mon_id, 0);
         return;
       }
-      if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 )
+      if ( pParty->bTurnBasedModeOn == true && pTurnEngine->turn_stage == TE_MOVEMENT )
       {
         pTurnEngine->field_18 |= TE_FLAG_8;
         return;
@@ -480,7 +480,7 @@
     }
     else
     {
-      if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 )
+      if ( pParty->bTurnBasedModeOn == true && pTurnEngine->turn_stage == TE_MOVEMENT )
       {
         pParty->uFlags |= PARTY_FLAGS_1_FALLING;
         return;