aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShocker <shocker@freakz.ro>2011-10-07 09:22:34 -0700
committerShocker <shocker@freakz.ro>2011-10-07 09:22:34 -0700
commit181647c71454cf6e652e1f19e04fd875a6aa0f55 (patch)
treee0a7ab8eda9f28c2c5cb86d07959eded833bd7a8 /src
parentac01eaa4e46334e43c2e582414867394a48dd770 (diff)
parent2be0207c1d185be7683cc9a20664d967e826adc6 (diff)
Merge pull request #3350 from LiMCrosS/master
Core/GameObjects: Damage range of DestructibleGameObjects, after intact state.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Entities/GameObject/GameObject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 4ec77e38bcf..ccd7ad4133c 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1660,7 +1660,7 @@ void GameObject::SendCustomAnim(uint32 anim)
bool GameObject::IsInRange(float x, float y, float z, float radius) const
{
- GameObjectDisplayInfoEntry const* info = sGameObjectDisplayInfoStore.LookupEntry(GetUInt32Value(GAMEOBJECT_DISPLAYID));
+ GameObjectDisplayInfoEntry const* info = sGameObjectDisplayInfoStore.LookupEntry(m_goInfo->displayId);
if (!info)
return IsWithinDist3d(x, y, z, radius);