comparison Player.cpp @ 1091:9c7eb4037567

data moving
author Gloval
date Sun, 26 May 2013 14:13:22 +0400
parents 7033eb155558
children c40d40027b77
comparison
equal deleted inserted replaced
1082:7033eb155558 1091:9c7eb4037567
3249 } 3249 }
3250 3250
3251 //----- (0048D676) -------------------------------------------------------- 3251 //----- (0048D676) --------------------------------------------------------
3252 bool Player::IsUnarmed() 3252 bool Player::IsUnarmed()
3253 { 3253 {
3254 return HasItemEquipped(EQUIP_MAIN_HAND) != EQUIP_MAIN_HAND && 3254 return HasItemEquipped(EQUIP_MAIN_HAND) != 0 &&
3255 !(HasItemEquipped(EQUIP_OFF_HAND) == EQUIP_MAIN_HAND && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD); 3255 !(HasItemEquipped(EQUIP_OFF_HAND) == 0 && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD);
3256 } 3256 }
3257 3257
3258 //----- (0048D6AA) -------------------------------------------------------- 3258 //----- (0048D6AA) --------------------------------------------------------
3259 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex) 3259 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex)
3260 { 3260 {
3286 3286
3287 if ( equip_type >= 16 ) 3287 if ( equip_type >= 16 )
3288 { 3288 {
3289 v6 = 0; 3289 v6 = 0;
3290 while ( !HasItemEquipped((ITEM_EQUIP_TYPE)v6) 3290 while ( !HasItemEquipped((ITEM_EQUIP_TYPE)v6)
3291 || this->pInventoryItems[pEquipment.pIndices[v6] - 1].uItemID != item_id ) 3291 || pInventoryItems[pEquipment.pIndices[v6] - 1].uItemID != item_id )
3292 { 3292 {
3293 ++v6; 3293 ++v6;
3294 if ( (signed int)v6 >= 16 ) 3294 if ( (signed int)v6 >= 16 )
3295 return 0; 3295 return 0;
3296 } 3296 }
3938 // 48DCF6: using guessed type char var_94[140]; 3938 // 48DCF6: using guessed type char var_94[140];
3939 3939
3940 //----- (0048E1A3) -------------------------------------------------------- 3940 //----- (0048E1A3) --------------------------------------------------------
3941 unsigned int Player::GetSpellSchool(unsigned int uSpellID) 3941 unsigned int Player::GetSpellSchool(unsigned int uSpellID)
3942 { 3942 {
3943 return LOBYTE(pSpellStats->pInfos[uSpellID].uSchool); 3943 return pSpellStats->pInfos[uSpellID].uSchool;
3944 } 3944 }
3945 3945
3946 //----- (0048E1B5) -------------------------------------------------------- 3946 //----- (0048E1B5) --------------------------------------------------------
3947 int Player::GetAttackRecoveryTime(bool bRangedAttack) 3947 int Player::GetAttackRecoveryTime(bool bRangedAttack)
3948 { 3948 {