Mercurial > mm7

diff mm7_5.cpp @ 1450:8ff3c675a726

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more renaming TE
author Gloval
date Wed, 07 Aug 2013 08:55:34 +0400
parents 27b7ee003c7c
children bfe342ae0c1f
line wrap: on
line diff
--- a/mm7_5.cpp	Tue Aug 06 00:56:33 2013 +0400
+++ b/mm7_5.cpp	Wed Aug 07 08:55:34 2013 +0400
@@ -2410,7 +2410,7 @@
           }
           if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3 )
             continue;
-          if ( !(pTurnEngine->field_18 & TE_FLAG_2) )
+          if ( !(pTurnEngine->field_18 & TE_HAVE_PENDING_ACTIONS) )
           {
             if ( pActors[uMessageParam].uAIState == 5 )
               stru_50C198.LootActor(&pActors[uMessageParam]);
@@ -2429,7 +2429,7 @@
           }
           if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3 )
             continue;
-          if ( !(pTurnEngine->field_18 & TE_FLAG_2) )
+          if ( !(pTurnEngine->field_18 & TE_HAVE_PENDING_ACTIONS) )
             _42ECB5_PlayerAttacksActor();
           continue;
         case UIMSG_ExitRest: