*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 26 insertions, 0 deletions

diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h
index f6dac7db955..6ba5d10ffc1 100644
--- a/src/framework/GameSystem/NGrid.h
+++ b/src/framework/GameSystem/NGrid.h
@@ -17,13 +17,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+
 #ifndef TRINITY_NGRID_H
 #define TRINITY_NGRID_H
+
 /** NGrid is nothing more than a wrapper of the Grid with an NxN cells
  */
+
 #include "GameSystem/Grid.h"
 #include "GameSystem/GridReference.h"
 #include "Timer.h"
+
 class GridInfo
 {
 public:
@@ -37,15 +41,18 @@ public:
     void setUnloadReferenceLock( bool on ) { i_unloadReferenceLock = on; }
     void incUnloadActiveLock() { ++i_unloadActiveLockCount; }
     void decUnloadActiveLock() { if(i_unloadActiveLockCount) --i_unloadActiveLockCount; }
+
     void setTimer(const TimeTracker& pTimer) { i_timer = pTimer; }
     void ResetTimeTracker(time_t interval) { i_timer.Reset(interval); }
     void UpdateTimeTracker(time_t diff) { i_timer.Update(diff); }
+
 private:
     TimeTracker i_timer;
     uint16 i_unloadActiveLockCount : 16;                    // lock from active object spawn points (prevent clone loading)
     bool   i_unloadExplicitLock    : 1;                     // explicit manual lock or config setting
     bool   i_unloadReferenceLock   : 1;                     // lock from instance map copy
 };
+
 typedef enum
 {
     GRID_STATE_INVALID = 0,
@@ -54,6 +61,7 @@ typedef enum
     GRID_STATE_REMOVAL= 3,
     MAX_GRID_STATE = 4
 } grid_state_t;
+
 template
 <
 unsigned int N,
@@ -65,36 +73,42 @@ class ThreadModel = Trinity::SingleThreaded<ACTIVE_OBJECT>
 class TRINITY_DLL_DECL NGrid
 {
     public:
+
         typedef Grid<ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES, ThreadModel> GridType;
         NGrid(uint32 id, int32 x, int32 y, time_t expiry, bool unload = true)
             : i_gridId(id), i_x(x), i_y(y), i_cellstate(GRID_STATE_INVALID), i_GridObjectDataLoaded(false)
         {
             i_GridInfo = GridInfo(expiry, unload);
         }
+
         const GridType& operator()(unsigned short x, unsigned short y) const
         {
             ASSERT(x < N);
             ASSERT(y < N);
             return i_cells[x][y];
         }
+ 
         GridType& operator()(unsigned short x, unsigned short y)
         {
             ASSERT(x < N);
             ASSERT(y < N);
             return i_cells[x][y];
         }
+
         const uint32& GetGridId(void) const { return i_gridId; }
         void SetGridId(const uint32 id) const { i_gridId = id; }
         grid_state_t GetGridState(void) const { return i_cellstate; }
         void SetGridState(grid_state_t s) { i_cellstate = s; }
         int32 getX() const { return i_x; }
         int32 getY() const { return i_y; }
+
         void link(GridRefManager<NGrid<N, ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES, ThreadModel> >* pTo)
         {
             i_Reference.link(pTo, this);
         }
         bool isGridObjectDataLoaded() const { return i_GridObjectDataLoaded; }
         void setGridObjectDataLoaded(bool pLoaded) { i_GridObjectDataLoaded = pLoaded; }
+
         GridInfo* getGridInfoRef() { return &i_GridInfo; }
         const TimeTracker& getTimeTracker() const { return i_GridInfo.getTimeTracker(); }
         bool getUnloadLock() const { return i_GridInfo.getUnloadLock(); }
@@ -104,24 +118,29 @@ class TRINITY_DLL_DECL NGrid
         void decUnloadActiveLock() { i_GridInfo.decUnloadActiveLock(); }
         void ResetTimeTracker(time_t interval) { i_GridInfo.ResetTimeTracker(interval); }
         void UpdateTimeTracker(time_t diff) { i_GridInfo.UpdateTimeTracker(diff); }
+
         template<class SPECIFIC_OBJECT> void AddWorldObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
         {
             getGridType(x, y).AddWorldObject(obj, hdl);
         }
+
         template<class SPECIFIC_OBJECT> void RemoveWorldObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
         {
             getGridType(x, y).RemoveWorldObject(obj, hdl);
         }
+
         template<class T, class TT> void Visit(TypeContainerVisitor<T, TypeMapContainer<TT> > &visitor)
         {
             for(unsigned int x=0; x < N; ++x)
                 for(unsigned int y=0; y < N; ++y)
                     getGridType(x, y).Visit(visitor);
         }
+
         template<class T, class TT> void Visit(const uint32 &x, const uint32 &y, TypeContainerVisitor<T, TypeMapContainer<TT> > &visitor)
         {
             getGridType(x, y).Visit(visitor);
         }
+
         unsigned int ActiveObjectsInGrid(void) const
         {
             unsigned int count=0;
@@ -130,29 +149,36 @@ class TRINITY_DLL_DECL NGrid
                     count += i_cells[x][y].ActiveObjectsInGrid();
             return count;
         }
+
         template<class SPECIFIC_OBJECT> const SPECIFIC_OBJECT* GetGridObject(const uint32 x, const uint32 y, OBJECT_HANDLE hdl) const
         {
             return getGridType(x, y).template GetGridObject<SPECIFIC_OBJECT>(hdl);
         }
+
         template<class SPECIFIC_OBJECT> SPECIFIC_OBJECT* GetGridObject(const uint32 x, const uint32 y, OBJECT_HANDLE hdl)
         {
             return getGridType(x, y).template GetGridObject<SPECIFIC_OBJECT>(hdl);
         }
+
         template<class SPECIFIC_OBJECT> bool AddGridObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
         {
             return getGridType(x, y).AddGridObject(hdl, obj);
         }
+
         template<class SPECIFIC_OBJECT> bool RemoveGridObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
         {
             return getGridType(x, y).RemoveGridObject(obj, hdl);
         }
+
     private:
+
         GridType& getGridType(const uint32& x, const uint32& y)
         {
             ASSERT(x < N);
             ASSERT(y < N);
             return i_cells[x][y];
         }
+
         uint32 i_gridId;
         GridInfo i_GridInfo;
         GridReference<NGrid<N, ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES, ThreadModel> > i_Reference;