josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[7475] Move Player::IsInFeralForm to Unit::IsInFeralForm Author: VladimirMangos

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-16 15:57:34 -06:00
parent 610b331535
commit 0213ad8a1f
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.h
+5 -1
View File
@@ -1180,7 +1180,11 @@ class TRINITY_DLL_SPEC Player : public Unit
void AddArmorProficiency(uint32 newflag) { m_ArmorProficiency |= newflag; } void AddArmorProficiency(uint32 newflag) { m_ArmorProficiency |= newflag; }
uint32 GetWeaponProficiency() const { return m_WeaponProficiency; } uint32 GetWeaponProficiency() const { return m_WeaponProficiency; }
uint32 GetArmorProficiency() const { return m_ArmorProficiency; } uint32 GetArmorProficiency() const { return m_ArmorProficiency; }
bool IsInFeralForm() const { return m_form == FORM_CAT || m_form == FORM_BEAR || m_form == FORM_DIREBEAR; } bool IsUseEquipedWeapon( bool mainhand ) const
{
// disarm applied only to mainhand weapon
return !IsInFeralForm() && (!mainhand || !HasFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISARMED) );
}
bool IsTwoHandUsed() const bool IsTwoHandUsed() const
{ {
Item* mainItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND); Item* mainItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
src/game/Unit.cpp
+2 -2
View File
@@ -3259,7 +3259,7 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target)
return 0; return 0;
} }
if(((Player*)this)->IsInFeralForm()) if(IsInFeralForm())
return GetMaxSkillValueForLevel(); // always maximized SKILL_FERAL_COMBAT in fact return GetMaxSkillValueForLevel(); // always maximized SKILL_FERAL_COMBAT in fact
// weapon skill or (unarmed for base attack) // weapon skill or (unarmed for base attack)
@@ -10903,7 +10903,7 @@ uint32 Unit::GetCreatureType() const
{ {
if(GetTypeId() == TYPEID_PLAYER) if(GetTypeId() == TYPEID_PLAYER)
{ {
SpellShapeshiftEntry const* ssEntry = sSpellShapeshiftStore.LookupEntry(((Player*)this)->m_form); SpellShapeshiftEntry const* ssEntry = sSpellShapeshiftStore.LookupEntry(m_form);
if(ssEntry && ssEntry->creatureType > 0) if(ssEntry && ssEntry->creatureType > 0)
return ssEntry->creatureType; return ssEntry->creatureType;
else else
src/game/Unit.h
+3
View File
@@ -1302,8 +1302,11 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
uint64 m_ObjectSlot[4]; uint64 m_ObjectSlot[4];
uint32 m_detectInvisibilityMask; uint32 m_detectInvisibilityMask;
uint32 m_invisibilityMask; uint32 m_invisibilityMask;
uint32 m_ShapeShiftFormSpellId; uint32 m_ShapeShiftFormSpellId;
ShapeshiftForm m_form; ShapeshiftForm m_form;
bool IsInFeralForm() const { return m_form == FORM_CAT || m_form == FORM_BEAR || m_form == FORM_DIREBEAR; }
float m_modMeleeHitChance; float m_modMeleeHitChance;
float m_modRangedHitChance; float m_modRangedHitChance;
float m_modSpellHitChance; float m_modSpellHitChance;