Mercurial > mm7

comparison Player.cpp @ 1347:84db43e7db93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Fri, 12 Jul 2013 23:08:35 +0200
parents 1434b36f4bdb 22cb507446a4
children 3ed6dcf82912
comparison
equal deleted inserted replaced
1346:1434b36f4bdb 1347:84db43e7db93
904 //----- (00492C0B) -------------------------------------------------------- 904 //----- (00492C0B) --------------------------------------------------------
905 bool Player::CanAct() 905 bool Player::CanAct()
906 { 906 {
907 bool result; // eax@2 907 bool result; // eax@2
908 908
909 if ( this->pConditions[2] | this->pConditions[12] | this->pConditions[13] | this->pConditions[14] | this->pConditions[15] | this->pConditions[16] ) 909 if ( this->pConditions[Condition_Sleep] || this->pConditions[Condition_Paralyzed] ||
910 result = 0; 910 this->pConditions[Condition_Unconcious] || this->pConditions[Condition_Dead] ||
911 this->pConditions[Condition_Pertified] || this->pConditions[Condition_Eradicated] )
912 result = false;
911 else 913 else
912 result = 1; 914 result = true;
913 return result; 915 return result;
914 } 916 }
915 917
916 //----- (00492C40) -------------------------------------------------------- 918 //----- (00492C40) --------------------------------------------------------
917 bool Player::CanSteal() 919 bool Player::CanSteal()
6521 unsigned int thisa; // [sp+28h] [bp-4h]@22 6523 unsigned int thisa; // [sp+28h] [bp-4h]@22
6522 6524
6523 thisb = this; 6525 thisb = this;
6524 v3 = &pParty->pPlayers[player_num-1]; 6526 v3 = &pParty->pPlayers[player_num-1];
6525 v73 = 1; 6527 v73 = 1;
6526 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3) ) 6528 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) )
6527 return; 6529 return;
6528 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_REAGENT ) 6530 if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_REAGENT )
6529 { 6531 {
6530 if ( pParty->pPickedItem.uItemID == 160 ) 6532 if ( pParty->pPickedItem.uItemID == 160 )
6531 { 6533 {