Mercurial > mm7

comparison UI/UiGame.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 8c2f689b5f0b
children d6cf8ead9242
comparison
equal deleted inserted replaced
1339:8bfdc44cebfd 1340:22cb507446a4
2287 continue; 2287 continue;
2288 } 2288 }
2289 } 2289 }
2290 if ( pParty->bTurnBasedModeOn == 1 ) 2290 if ( pParty->bTurnBasedModeOn == 1 )
2291 { 2291 {
2292 if ( pTurnEngine->field_4 != 1 ) 2292 if ( pTurnEngine->turn_stage != 1 )
2293 { 2293 {
2294 if (PID_TYPE(pTurnEngine->pQueue[0].uPackedID) == OBJECT_Player) 2294 if (PID_TYPE(pTurnEngine->pQueue[0].uPackedID) == OBJECT_Player)
2295 { 2295 {
2296 //v14 = 0; 2296 //v14 = 0;
2297 if ( pTurnEngine->uActorQueueSize > 0 ) 2297 if ( pTurnEngine->uActorQueueSize > 0 )