Mercurial > mm7

diff Overlays.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 7ef4b64f6329
line wrap: on
line diff
--- a/Overlays.cpp	Thu Jul 11 17:47:12 2013 +0600
+++ b/Overlays.cpp	Thu Jul 11 17:47:33 2013 +0600
@@ -110,14 +110,14 @@
   if ( pCurrentScreen != SCREEN_GAME || !pParty->bTurnBasedModeOn)
     return;
 
-  if ( pTurnEngine->field_4 == 3 )
+  if ( pTurnEngine->turn_stage == 3 )
   {
     v6 = pEventTimer->uStartTime;
     v5 = pIconIDs_Turn[5 - pTurnEngine->uActionPointsLeft / 26];
   }
   else
   {
-    if ( pTurnEngine->field_4 == 1 )
+    if ( pTurnEngine->turn_stage == 1 )
     {
       v6 = dword_50C994;
       v3 = pIconsFrameTable;
@@ -127,7 +127,7 @@
         v5 = uIconID_TurnHour;
       goto LABEL_12;
     }
-    if ( pTurnEngine->field_4 != 2 )
+    if ( pTurnEngine->turn_stage != 2 )
     {
       v4 = this;
       goto LABEL_14;