Mercurial > mm7

diff mm7_5.cpp @ 1340:22cb507446a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
turnengine refactoring continue
author Gloval
date Sat, 06 Jul 2013 00:29:29 +0400
parents 8bfdc44cebfd
children 61010a655c94
line wrap: on
line diff
--- a/mm7_5.cpp	Fri Jul 05 17:37:30 2013 +0600
+++ b/mm7_5.cpp	Sat Jul 06 00:29:29 2013 +0400
@@ -2427,7 +2427,7 @@
               Actor::StealFrom(uMessageParam);
             continue;
           }
-          if ( pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3 )
+          if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3 )
             continue;
           if ( !(pTurnEngine->field_18 & TE_FLAG_2) )
           {
@@ -2446,7 +2446,7 @@
             _42ECB5_PlayerAttacksActor();
             continue;
           }
-          if ( pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3 )
+          if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3 )
             continue;
           if ( !(pTurnEngine->field_18 & TE_FLAG_2) )
             _42ECB5_PlayerAttacksActor();
@@ -2720,7 +2720,7 @@
           pAudioPlayer->PlaySound((SoundID)v127, 0, 0, -1, 0, 0, 0, 0);
           continue;
         case UIMSG_OpenSpellbookPage:
-          if ( pTurnEngine->field_4 == 3 || !uActiveCharacter || uMessageParam == pPlayers[uActiveCharacter]->lastOpenedSpellbookPage )
+          if ( pTurnEngine->turn_stage == 3 || !uActiveCharacter || uMessageParam == pPlayers[uActiveCharacter]->lastOpenedSpellbookPage )
             continue;
           sub_41140B();
           pPlayers[uActiveCharacter]->lastOpenedSpellbookPage = uMessageParam;
@@ -2730,7 +2730,7 @@
           continue;
         case UIMSG_SelectSpell:
         {
-          if (pTurnEngine->field_4 == 3)
+          if (pTurnEngine->turn_stage == 3)
             continue;
           if (!uActiveCharacter)
             continue;
@@ -2768,17 +2768,17 @@
         continue;
 
         case UIMSG_CastSpellFromBook:
-          if ( pTurnEngine->field_4 != 3 )
+          if ( pTurnEngine->turn_stage != 3 )
             _42777D_CastSpell_UseWand_ShootArrow(uMessageParam, v199, 0, 0, 0);
         continue;
 
         case UIMSG_SpellScrollUse:
 			__debugbreak();
-          if ( pTurnEngine->field_4 != 3 )
+          if ( pTurnEngine->turn_stage != 3 )
             _42777D_CastSpell_UseWand_ShootArrow(uMessageParam, v199, 133, 1, 0);
           continue;
         case UIMSG_SpellBookWindow:
-          if ( pTurnEngine->field_4 == 3 )
+          if ( pTurnEngine->turn_stage == 3 )
             continue;
           if ( bUnderwater == 1 )
           {