Mercurial > mm7

comparison UI/UiGame.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 10c909eb6766
children aff7a7b072b7
comparison
equal deleted inserted replaced
2235:6ab7d7c112bb 2242:c4f87fb3cfee
1769 continue; 1769 continue;
1770 } 1770 }
1771 } 1771 }
1772 if ( pParty->bTurnBasedModeOn == 1 ) 1772 if ( pParty->bTurnBasedModeOn == 1 )
1773 { 1773 {
1774 if ( pTurnEngine->turn_stage != 1 ) 1774 if ( pTurnEngine->turn_stage != TE_WAIT )
1775 { 1775 {
1776 if (PID_TYPE(pTurnEngine->pQueue[0].uPackedID) == OBJECT_Player) 1776 if (PID_TYPE(pTurnEngine->pQueue[0].uPackedID) == OBJECT_Player)
1777 { 1777 {
1778 if ( pTurnEngine->uActorQueueSize > 0 ) 1778 if ( pTurnEngine->uActorQueueSize > 0 )
1779 { 1779 {