From c106914e945dbf5ce9a249a80f1e30ca10bf06e2 Mon Sep 17 00:00:00 2001 From: megamage Date: Fri, 10 Apr 2009 17:56:42 -0500 Subject: *Remove some invalid template functions. --HG-- branch : trunk --- src/game/Object.h | 2 +- src/game/ObjectAccessor.h | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'src') diff --git a/src/game/Object.h b/src/game/Object.h index 43add24d98d..2fd45b45688 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -127,7 +127,7 @@ class TRINITY_DLL_SPEC Object public: virtual ~Object ( ); - const bool& IsInWorld() const { return m_inWorld; } + const bool IsInWorld() const { return m_inWorld; } virtual void AddToWorld() { if(m_inWorld) diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h index d1549712f30..1f413e2db40 100644 --- a/src/game/ObjectAccessor.h +++ b/src/game/ObjectAccessor.h @@ -164,22 +164,11 @@ class TRINITY_DLL_DECL ObjectAccessor : public Trinity::Singleton::GetContainer(); } - HashMapHolder::MapType& GetUnits() - { - return HashMapHolder::GetContainer(); - } - HashMapHolder::MapType& GetGameObjects() { return HashMapHolder::GetContainer(); } - // note: possibly very heavy - HashMapHolder::MapType& GetWorldObjects() - { - return HashMapHolder::GetContainer(); - } - template void AddObject(T *object) { HashMapHolder::Insert(object); -- cgit v1.2.3