diff Player.cpp @ 1347:84db43e7db93

Merge
author Grumpy7
date Fri, 12 Jul 2013 23:08:35 +0200
parents 1434b36f4bdb 22cb507446a4
children 3ed6dcf82912
line wrap: on
line diff
--- a/Player.cpp	Fri Jul 12 23:07:14 2013 +0200
+++ b/Player.cpp	Fri Jul 12 23:08:35 2013 +0200
@@ -906,10 +906,12 @@
 {
   bool result; // eax@2
 
-  if ( this->pConditions[2] | this->pConditions[12] | this->pConditions[13] | this->pConditions[14] | this->pConditions[15] | this->pConditions[16] )
-    result = 0;
+  if ( this->pConditions[Condition_Sleep] || this->pConditions[Condition_Paralyzed] || 
+       this->pConditions[Condition_Unconcious] || this->pConditions[Condition_Dead] || 
+       this->pConditions[Condition_Pertified] || this->pConditions[Condition_Eradicated] )
+    result = false;
   else
-    result = 1;
+    result = true;
   return result;
 }
 
@@ -6523,7 +6525,7 @@
     thisb = this;
     v3 = &pParty->pPlayers[player_num-1];
     v73 = 1;
-    if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 1 || pTurnEngine->field_4 == 3) )
+    if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) )
         return;
     if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_REAGENT )
         {