Mercurial > mm7

diff Player.cpp @ 1091:9c7eb4037567

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
data moving
author Gloval
date Sun, 26 May 2013 14:13:22 +0400
parents 7033eb155558
children c40d40027b77
line wrap: on
line diff
--- a/Player.cpp	Sun May 26 00:03:16 2013 +0400
+++ b/Player.cpp	Sun May 26 14:13:22 2013 +0400
@@ -3251,8 +3251,8 @@
 //----- (0048D676) --------------------------------------------------------
 bool Player::IsUnarmed()
 {
-  return HasItemEquipped(EQUIP_MAIN_HAND) != EQUIP_MAIN_HAND &&
-        !(HasItemEquipped(EQUIP_OFF_HAND) == EQUIP_MAIN_HAND && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD);
+  return HasItemEquipped(EQUIP_MAIN_HAND) != 0 &&
+        !(HasItemEquipped(EQUIP_OFF_HAND) == 0 && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD);
 }
 
 //----- (0048D6AA) --------------------------------------------------------
@@ -3288,7 +3288,7 @@
   {
     v6 = 0;
     while ( !HasItemEquipped((ITEM_EQUIP_TYPE)v6)
-         || this->pInventoryItems[pEquipment.pIndices[v6] - 1].uItemID != item_id )
+         || pInventoryItems[pEquipment.pIndices[v6] - 1].uItemID != item_id )
     {
       ++v6;
       if ( (signed int)v6 >= 16 )
@@ -3940,7 +3940,7 @@
 //----- (0048E1A3) --------------------------------------------------------
 unsigned int Player::GetSpellSchool(unsigned int uSpellID)
 {
-  return LOBYTE(pSpellStats->pInfos[uSpellID].uSchool);
+  return pSpellStats->pInfos[uSpellID].uSchool;
 }
 
 //----- (0048E1B5) --------------------------------------------------------