Mercurial > mm7

changeset 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 (diff) b99aeb077d4f (current diff)
children 3ed6dcf82912
files Player.cpp
diffstat 2 files changed, 26 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Thu Jul 11 17:47:33 2013 +0600
+++ b/Player.cpp	Fri Jul 12 23:08:35 2013 +0200
@@ -235,22 +235,22 @@
 
 
 //----- (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)
-      {
-     item_idx=pEquipment.pIndices[i];
-     if (item_idx)
-         {
-         item_id=pOwnItems[item_idx-1].uItemID;
-         if (item_id!=64 &&  item_id!= 65 ) //blaster& blaster rifle
-             return false;
-         }
-      }
-      return true;
-  }
+  for (int i = 0; i < 16; ++i)
+  {
+    item_idx = pEquipment.pIndices[i];
+    if (item_idx)
+    {
+      item_id = pOwnItems[item_idx - 1].uItemID;
+      if ( item_id != 64 && item_id != 65 ) //blaster& blaster rifle
+          return false;
+    }
+  }
+  return true;
+}
   
 
 
@@ -424,14 +424,21 @@
   {
     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 1;
@@ -986,7 +993,7 @@
         if ( uItemID != 604 )                   // 
                                                 //  if (uItemID == 532)                         // item073  Эльфийская Кольчуга       артефакт, эльф
           return 1;
-        v5 = _43EEF3() == 0;
+        v5 = NothingOrJustBlastersEquipped() == 0;
         goto LABEL_23;
       }
       v2 = GetRace() == 3;                     // 
--- a/Player.h	Thu Jul 11 17:47:33 2013 +0600
+++ b/Player.h	Fri Jul 12 23:08:35 2013 +0200
@@ -587,7 +587,7 @@
   int GetPriceSell(int uRealValue, float price_multiplier);
   int GetTempleHealCostModifier(float a2);
   int GetConditionDayOfWeek(unsigned int uCondition);
-  bool _43EEF3();
+  bool NothingOrJustBlastersEquipped();
   void SalesProcess(unsigned int inventory_idnx, int item_index, int _2devent_idx);//0x4BE2DD
   bool Recover(signed int a2);
   bool CanCastSpell(unsigned int uRequiredMana);