From 90a5b215f9cb28daf094120957d31df17b5d3578 Mon Sep 17 00:00:00 2001 From: w12x Date: Sun, 19 Oct 2008 07:24:36 -0500 Subject: [PATCH] [svn] Fixed compile errors. Hopefully. --HG-- branch : trunk --- src/game/Unit.cpp | 6 ++++++ src/game/Unit.h | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 472afbcba4..eff464f110 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9385,6 +9385,12 @@ Unit* Unit::GetUnit(WorldObject& object, uint64 guid) return ObjectAccessor::GetUnit(object,guid); } +template T* +Unit::GetObjectInWorld(uint64 guid, T* /*fake*/) +{ + return ObjectAccessor::GetObjectInWorld(uint64 guid, T* /*fake*/); +} + bool Unit::isVisibleForInState( Player const* u, bool inVisibleList ) const { return isVisibleForOrDetect(u,false,inVisibleList); diff --git a/src/game/Unit.h b/src/game/Unit.h index fa6e2cdf11..0fccbc8605 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1218,10 +1218,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject void addFollower(FollowerReference* pRef) { m_FollowingRefManager.insertFirst(pRef); } void removeFollower(FollowerReference* /*pRef*/ ) { /* nothing to do yet */ } static Unit* GetUnit(WorldObject& object, uint64 guid); - template static T* GetObjectInWorld(uint64 guid, T* /*fake*/) - { - return ObjectAccessor::GetObjectInWorld(uint64 guid, T* /*fake*/) - } + template static T* GetObjectInWorld(uint64 guid, T* /*fake*/); MotionMaster* GetMotionMaster() { return &i_motionMaster; }