Mercurial > mm7

diff CastSpellInfo.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/CastSpellInfo.cpp	Wed Feb 26 01:14:18 2014 +0100
+++ b/CastSpellInfo.cpp	Wed Feb 26 01:15:58 2014 +0100
@@ -3327,7 +3327,7 @@
   //  || (result = pTurnEngine->field_4, pTurnEngine->field_4 != 1) && pTurnEngine->field_4 != 3 )
   if (pParty->bTurnBasedModeOn)
   {
-    if (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3)
+    if ( pTurnEngine->turn_stage == TE_WAIT || pTurnEngine->turn_stage == TE_MOVEMENT )
       return;
   }