mm7: Player.cpp comparison

comparison Player.cpp @ 1346:1434b36f4bdb

Player::_43EEF3 renamed to NothingOrJustBlastersEquipped

author	Grumpy7
date	Fri, 12 Jul 2013 23:07:14 +0200
parents	d9e4c0bbb2d2
children	84db43e7db93

comparison

equal deleted inserted replaced

-:27a699abee51
+:1434b36f4bdb
 }
 //----- (0043EEF3) --------------------------------------------------------
-bool Player::_43EEF3()
+bool Player::NothingOrJustBlastersEquipped()
 {
 signed int item_idx; // esi@1
 signed int item_id; // esi@1
-for (int i=0; i<16;++i)
+for (int i = 0; i < 16; ++i)
 {
-item_idx=pEquipment.pIndices[i];
+item_idx = pEquipment.pIndices[i];
 if (item_idx)
 {
-item_id=pOwnItems[item_idx-1].uItemID;
+item_id = pOwnItems[item_idx - 1].uItemID;
-if (item_id!=64 &&  item_id!= 65 ) //blaster& blaster rifle
+if ( item_id != 64 && item_id != 65 ) //blaster& blaster rifle
 return false;
 }
 }
 return true;
 }
 //----- (004B8040) --------------------------------------------------------
 if ( this->sHealth < GetMaxHealth() || this->sMana < GetMaxMana() )
 {
 return 1;
 }
+else if (GetMajorConditionIdx() == Condition_Zombie)
+{
+if ((v2 == 78 || v2 == 81 || v2 == 82))
+{
+return 1;
+}
+else
+{
+return 0;
+}
+}
 else if (GetMajorConditionIdx() == Condition_Good)
-{
-return 0;
-}
-else if (GetMajorConditionIdx() == Condition_Zombie && (v2 == 78 || v2 == 81 || v2 == 82))
 {
 return 0;
 }
 else
 {
 return 0;
 }
 if ( uItemID != 604 )                   //
 //  if (uItemID == 532)                         // item073  Эльфийская Кольчуга       артефакт, эльф
 return 1;
-v5 = _43EEF3() == 0;
+v5 = NothingOrJustBlastersEquipped() == 0;
 goto LABEL_23;
 }
 v2 = GetRace() == 3;                     //
 //  if (uItemID == 533)                         // item113  Кованые Латные Рукавицы   артефакт, гном
 }

Mercurial > mm7

comparison Player.cpp @ 1346:1434b36f4bdb