aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-16 15:57:34 -0600
committermegamage <none@none>2009-03-16 15:57:34 -0600
commit0213ad8a1f21de1a76c63e67f35b1f2061f6e7d4 (patch)
tree3542e680015b0bcdda29ef7994134a21afe41c90 /src/game/Unit.cpp
parent610b3315351bf66012826af97fb24a333b75bc08 (diff)
[7475] Move Player::IsInFeralForm to Unit::IsInFeralForm Author: VladimirMangos
--HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index d957988cc05..e369c322277 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -3259,7 +3259,7 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target)
return 0;
}
- if(((Player*)this)->IsInFeralForm())
+ if(IsInFeralForm())
return GetMaxSkillValueForLevel(); // always maximized SKILL_FERAL_COMBAT in fact
// weapon skill or (unarmed for base attack)
@@ -10903,7 +10903,7 @@ uint32 Unit::GetCreatureType() const
{
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)
return ssEntry->creatureType;
else