Merge pull request #3350 from LiMCrosS/master

Core/GameObjects: Damage range of DestructibleGameObjects, after intact state.
This commit is contained in:
Shocker
2011-10-07 09:22:34 -07:00
@@ -1660,7 +1660,7 @@ void GameObject::SendCustomAnim(uint32 anim)
bool GameObject::IsInRange(float x, float y, float z, float radius) const 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) if (!info)
return IsWithinDist3d(x, y, z, radius); return IsWithinDist3d(x, y, z, radius);