Mercurial > mm7

diff Viewport.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 22cb507446a4
children 61010a655c94
line wrap: on
line diff
--- a/Viewport.cpp	Thu Jul 11 17:47:12 2013 +0600
+++ b/Viewport.cpp	Thu Jul 11 17:47:33 2013 +0600
@@ -467,7 +467,7 @@
         pMessageQueue_50CBD0->AddMessage(UIMSG_StartNPCDialogue, v18, 0);
         return;
       }
-      if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 )
+      if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 )
       {
         pTurnEngine->field_18 |= TE_FLAG_8;
         return;
@@ -476,7 +476,7 @@
     }
     else
     {
-      if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 )
+      if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 )
       {
         pParty->uFlags |= PARTY_FLAGS_1_FALLING;
         return;