Mercurial > mm7

comparison CastSpellInfo.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 e70fe5d77928
children b3ac17fd12de
comparison
equal deleted inserted replaced
1339:8bfdc44cebfd 1340:22cb507446a4
4163 4163
4164 //if ( pParty->bTurnBasedModeOn != 1 4164 //if ( pParty->bTurnBasedModeOn != 1
4165 // || (result = pTurnEngine->field_4, pTurnEngine->field_4 != 1) && pTurnEngine->field_4 != 3 ) 4165 // || (result = pTurnEngine->field_4, pTurnEngine->field_4 != 1) && pTurnEngine->field_4 != 3 )
4166 if (pParty->bTurnBasedModeOn) 4166 if (pParty->bTurnBasedModeOn)
4167 { 4167 {
4168 if (pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3) 4168 if (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3)
4169 return; 4169 return;
4170 } 4170 }
4171 4171
4172 4172
4173 //v6 = a5; 4173 //v6 = a5;