Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
2235:6ab7d7c112bb 2242:c4f87fb3cfee
4273 unsigned int thisa; // [sp+28h] [bp-4h]@22 4273 unsigned int thisa; // [sp+28h] [bp-4h]@22
4274 4274
4275 //thisb = this; 4275 //thisb = this;
4276 playerAffected = &pParty->pPlayers[player_num-1]; 4276 playerAffected = &pParty->pPlayers[player_num-1];
4277 v73 = 1; 4277 v73 = 1;
4278 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) ) 4278 if ( pParty->bTurnBasedModeOn == true && (pTurnEngine->turn_stage == TE_WAIT || pTurnEngine->turn_stage == TE_MOVEMENT) )
4279 return; 4279 return;
4280 if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_REAGENT ) 4280 if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_REAGENT )
4281 { 4281 {
4282 if ( pParty->pPickedItem.uItemID == 160 ) 4282 if ( pParty->pPickedItem.uItemID == 160 )
4283 { 4283 {