From 02acc6604362f577168536122596729243cbe400 Mon Sep 17 00:00:00 2001 From: silver1ce Date: Wed, 3 Feb 2010 05:23:32 +0200 Subject: cleanup into grid containers grid containers doesn't contains guid keys, so guid parameter is useless, removed find functions(anyway result of search would be null always) --HG-- branch : trunk --- src/framework/GameSystem/Grid.h | 26 +++---- src/framework/GameSystem/NGrid.h | 26 +++---- src/framework/GameSystem/TypeContainer.h | 13 ++-- src/framework/GameSystem/TypeContainerFunctions.h | 83 ++++------------------- 4 files changed, 32 insertions(+), 116 deletions(-) (limited to 'src/framework/GameSystem') diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h index b52ca9f878d..a928bbba9a6 100644 --- a/src/framework/GameSystem/Grid.h +++ b/src/framework/GameSystem/Grid.h @@ -60,25 +60,20 @@ class TRINITY_DLL_DECL Grid /** an object of interested enters the grid */ - template void AddWorldObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl) + template void AddWorldObject(SPECIFIC_OBJECT *obj) { - if(!i_objects.template insert(hdl, obj)) + if(!i_objects.template insert(obj)) assert(false); } /** an object of interested exits the grid */ - template void RemoveWorldObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl) + template void RemoveWorldObject(SPECIFIC_OBJECT *obj) { - if(!i_objects.template remove(obj, hdl)) + if(!i_objects.template remove(obj)) assert(false); } - /** Accessors: Returns a specific type of object in the WORDL_OBJECT_TYPES - */ - template const SPECIFIC_OBJECT* GetWorldObject(OBJECT_HANDLE hdl, SPECIFIC_OBJECT* fake) const { return i_objects.template find(hdl); } - template SPECIFIC_OBJECT* GetWorldObject(OBJECT_HANDLE hdl, SPECIFIC_OBJECT *fake) { return i_objects.template find(hdl, fake); } - /** Refreshes/update the grid. This required for remote grids. */ void RefreshGrid(void) { /* TBI */} @@ -109,24 +104,19 @@ class TRINITY_DLL_DECL Grid */ unsigned int ActiveObjectsInGrid(void) const { return /*m_activeGridObjects.size()+*/i_objects.template Count(); } - /** Accessors: Returns a specific type of object in the GRID_OBJECT_TYPES - */ - template const SPECIFIC_OBJECT* GetGridObject(OBJECT_HANDLE hdl, SPECIFIC_OBJECT *fake) const { return i_container.template find(hdl, fake); } - template SPECIFIC_OBJECT* GetGridObject(OBJECT_HANDLE hdl, SPECIFIC_OBJECT *fake) { return i_container.template find(hdl, fake); } - /** Inserts a container type object into the grid. */ - template void AddGridObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl) + template void AddGridObject(SPECIFIC_OBJECT *obj) { - if(!i_container.template insert(hdl, obj)) + if(!i_container.template insert(obj)) assert(false); } /** Removes a containter type object from the grid */ - template void RemoveGridObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl) + template void RemoveGridObject(SPECIFIC_OBJECT *obj) { - if(!i_container.template remove(obj, hdl)) + if(!i_container.template remove(obj)) assert(false); } diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h index 7f7c6f1a9fb..6cbe7d6a84c 100644 --- a/src/framework/GameSystem/NGrid.h +++ b/src/framework/GameSystem/NGrid.h @@ -119,14 +119,14 @@ class TRINITY_DLL_DECL NGrid void ResetTimeTracker(time_t interval) { i_GridInfo.ResetTimeTracker(interval); } void UpdateTimeTracker(time_t diff) { i_GridInfo.UpdateTimeTracker(diff); } - template void AddWorldObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl) + template void AddWorldObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj) { - getGridType(x, y).AddWorldObject(obj, hdl); + getGridType(x, y).AddWorldObject(obj); } - template void RemoveWorldObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl) + template void RemoveWorldObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj) { - getGridType(x, y).RemoveWorldObject(obj, hdl); + getGridType(x, y).RemoveWorldObject(obj); } template void Visit(TypeContainerVisitor > &visitor) @@ -150,24 +150,14 @@ class TRINITY_DLL_DECL NGrid return count; } - template const SPECIFIC_OBJECT* GetGridObject(const uint32 x, const uint32 y, OBJECT_HANDLE hdl) const + template bool AddGridObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj) { - return getGridType(x, y).template GetGridObject(hdl); + return getGridType(x, y).AddGridObject(obj); } - template SPECIFIC_OBJECT* GetGridObject(const uint32 x, const uint32 y, OBJECT_HANDLE hdl) + template bool RemoveGridObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj) { - return getGridType(x, y).template GetGridObject(hdl); - } - - template bool AddGridObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl) - { - return getGridType(x, y).AddGridObject(hdl, obj); - } - - template bool RemoveGridObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl) - { - return getGridType(x, y).RemoveGridObject(obj, hdl); + return getGridType(x, y).RemoveGridObject(obj); } private: diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h index 7978201ad62..4297aaf32e7 100644 --- a/src/framework/GameSystem/TypeContainer.h +++ b/src/framework/GameSystem/TypeContainer.h @@ -102,22 +102,17 @@ class TRINITY_DLL_DECL TypeMapContainer public: template size_t Count() const { return Trinity::Count(i_elements, (SPECIFIC_TYPE*)NULL); } - template SPECIFIC_TYPE* find(OBJECT_HANDLE hdl, SPECIFIC_TYPE *fake) { return Trinity::Find(i_elements, hdl,fake); } - - /// find a specific type of object in the container - template const SPECIFIC_TYPE* find(OBJECT_HANDLE hdl, SPECIFIC_TYPE *fake) const { return Trinity::Find(i_elements, hdl,fake); } - /// inserts a specific object into the container - template bool insert(OBJECT_HANDLE hdl, SPECIFIC_TYPE *obj) + template bool insert(SPECIFIC_TYPE *obj) { - SPECIFIC_TYPE* t = Trinity::Insert(i_elements, obj, hdl); + SPECIFIC_TYPE* t = Trinity::Insert(i_elements, obj); return (t != NULL); } /// Removes the object from the container, and returns the removed object - template bool remove(SPECIFIC_TYPE* obj, OBJECT_HANDLE hdl) + template bool remove(SPECIFIC_TYPE* obj) { - SPECIFIC_TYPE* t = Trinity::Remove(i_elements, obj, hdl); + SPECIFIC_TYPE* t = Trinity::Remove(i_elements, obj); return (t != NULL); } diff --git a/src/framework/GameSystem/TypeContainerFunctions.h b/src/framework/GameSystem/TypeContainerFunctions.h index c94dc4f1e3e..edfbb40e659 100644 --- a/src/framework/GameSystem/TypeContainerFunctions.h +++ b/src/framework/GameSystem/TypeContainerFunctions.h @@ -60,114 +60,55 @@ namespace Trinity return Count(elements._TailElements, fake); } - // non-const find functions - template SPECIFIC_TYPE* Find(ContainerMapList &/*elements*/, OBJECT_HANDLE /*hdl*/, SPECIFIC_TYPE* /*fake*/) - { - //typename std::map::iterator iter = elements._element.find(hdl); - //return (iter == elements._element.end() ? NULL : iter->second); - return NULL; - }; - - template SPECIFIC_TYPE* Find(ContainerMapList &/*elements*/, OBJECT_HANDLE /*hdl*/, SPECIFIC_TYPE* /*fake*/) - { - return NULL; // terminate recursion - } - - template SPECIFIC_TYPE* Find(ContainerMapList &/*elements*/, OBJECT_HANDLE /*hdl*/, SPECIFIC_TYPE* /*fake*/) - { - return NULL; // this is a missed - } - - template SPECIFIC_TYPE* Find(ContainerMapList >&/*elements*/, OBJECT_HANDLE /*hdl*/, SPECIFIC_TYPE* /*fake*/) - { - //SPECIFIC_TYPE* t = Find(elements._elements, hdl,fake); - //return (t != NULL ? t :Find(elements._TailElements, hdl,fake)); - return NULL; - } - - // const find functions - template const SPECIFIC_TYPE* Find(const ContainerMapList &/*elements*/, OBJECT_HANDLE /*hdl*/, SPECIFIC_TYPE* /*fake*/) - { - //typename SPECIFIC_TYPE::iterator iter = elements._element.find(hdl); - //return (iter == elements._element.end() ? NULL : iter->second); - return NULL; - }; - - template const SPECIFIC_TYPE* Find(const ContainerMapList &/*elements*/, OBJECT_HANDLE /*hdl*/, SPECIFIC_TYPE* /*fake*/) - { - return NULL; - } - - template const SPECIFIC_TYPE* Find(const ContainerMapList &/*elements*/, OBJECT_HANDLE /*hdl*/, SPECIFIC_TYPE* /*fake*/) - { - return NULL; - } - - template SPECIFIC_TYPE* Find(const ContainerMapList >&elements, OBJECT_HANDLE hdl, SPECIFIC_TYPE* fake) - { - SPECIFIC_TYPE* t = Find(elements._elements, hdl,fake); - if( t) - return t; - - return Find(elements._TailElement, hdl,fake); - } - // non-const insert functions - template SPECIFIC_TYPE* Insert(ContainerMapList &elements, SPECIFIC_TYPE *obj, OBJECT_HANDLE /*hdl*/) + template SPECIFIC_TYPE* Insert(ContainerMapList &elements, SPECIFIC_TYPE *obj) { //elements._element[hdl] = obj; obj->GetGridRef().link(&elements._element, obj); return obj; }; - template SPECIFIC_TYPE* Insert(ContainerMapList &/*elements*/, SPECIFIC_TYPE * /*obj*/, OBJECT_HANDLE /*hdl*/) + template SPECIFIC_TYPE* Insert(ContainerMapList &/*elements*/, SPECIFIC_TYPE * /*obj*/) { return NULL; } // this is a missed - template SPECIFIC_TYPE* Insert(ContainerMapList &/*elements*/, SPECIFIC_TYPE * /*obj*/, OBJECT_HANDLE /*hdl*/) + template SPECIFIC_TYPE* Insert(ContainerMapList &/*elements*/, SPECIFIC_TYPE * /*obj*/) { return NULL; // a missed } // Recursion - template SPECIFIC_TYPE* Insert(ContainerMapList >&elements, SPECIFIC_TYPE *obj, OBJECT_HANDLE hdl) + template SPECIFIC_TYPE* Insert(ContainerMapList >&elements, SPECIFIC_TYPE *obj) { - SPECIFIC_TYPE* t= Insert(elements._elements, obj, hdl); - return (t != NULL ? t : Insert(elements._TailElements, obj, hdl)); + SPECIFIC_TYPE* t= Insert(elements._elements, obj); + return (t != NULL ? t : Insert(elements._TailElements, obj)); } // non-const remove method - template SPECIFIC_TYPE* Remove(ContainerMapList & /*elements*/, SPECIFIC_TYPE *obj, OBJECT_HANDLE /*hdl*/) + template SPECIFIC_TYPE* Remove(ContainerMapList & /*elements*/, SPECIFIC_TYPE *obj) { - /*typename std::map::iterator iter = elements._element.find(hdl); - if( iter != elements._element.end() ) - { - SPECIFIC_TYPE* t = iter->second; - elements._element.erase(iter); - return t; - }*/ obj->GetGridRef().unlink(); return obj; } - template SPECIFIC_TYPE* Remove(ContainerMapList &/*elements*/, SPECIFIC_TYPE * /*obj*/, OBJECT_HANDLE /*hdl*/) + template SPECIFIC_TYPE* Remove(ContainerMapList &/*elements*/, SPECIFIC_TYPE * /*obj*/) { return NULL; } // this is a missed - template SPECIFIC_TYPE* Remove(ContainerMapList &/*elements*/, SPECIFIC_TYPE * /*obj*/, OBJECT_HANDLE /*hdl*/) + template SPECIFIC_TYPE* Remove(ContainerMapList &/*elements*/, SPECIFIC_TYPE * /*obj*/) { return NULL; // a missed } - template SPECIFIC_TYPE* Remove(ContainerMapList > &elements, SPECIFIC_TYPE *obj, OBJECT_HANDLE hdl) + template SPECIFIC_TYPE* Remove(ContainerMapList > &elements, SPECIFIC_TYPE *obj) { // The head element is bad - SPECIFIC_TYPE* t = Remove(elements._elements, obj, hdl); - return ( t != NULL ? t : Remove(elements._TailElements, obj, hdl) ); + SPECIFIC_TYPE* t = Remove(elements._elements, obj); + return ( t != NULL ? t : Remove(elements._TailElements, obj) ); } } -- cgit v1.2.3