Mercurial > mm7

diff Player.cpp @ 2242:c4f87fb3cfee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
for NextTurn()
author Ritor1
date Mon, 24 Feb 2014 16:19:01 +0600
parents 080fd5a5433d
children aff7a7b072b7
line wrap: on
line diff
--- a/Player.cpp	Sun Feb 23 03:07:46 2014 +0100
+++ b/Player.cpp	Mon Feb 24 16:19:01 2014 +0600
@@ -4275,7 +4275,7 @@
   //thisb = this;
   playerAffected = &pParty->pPlayers[player_num-1];
   v73 = 1;
-  if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) )
+  if ( pParty->bTurnBasedModeOn == true && (pTurnEngine->turn_stage == TE_WAIT || pTurnEngine->turn_stage == TE_MOVEMENT) )
       return;
   if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_REAGENT )
   {