Mercurial > mm7

comparison Player.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 1e35cfed7928
children 84db43e7db93
comparison
equal deleted inserted replaced
1339:8bfdc44cebfd 1340:22cb507446a4
6516 unsigned int thisa; // [sp+28h] [bp-4h]@22 6516 unsigned int thisa; // [sp+28h] [bp-4h]@22
6517 6517
6518 thisb = this; 6518 thisb = this;
6519 v3 = &pParty->pPlayers[player_num-1]; 6519 v3 = &pParty->pPlayers[player_num-1];
6520 v73 = 1; 6520 v73 = 1;
6521 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3) ) 6521 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) )
6522 return; 6522 return;
6523 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_REAGENT ) 6523 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_REAGENT )
6524 { 6524 {
6525 if ( pParty->pPickedItem.uItemID == 160 ) 6525 if ( pParty->pPickedItem.uItemID == 160 )
6526 { 6526 {