*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

src/game/GridDefines.h

@@ -17,11 +17,14 @@
  * 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_GRIDDEFINES_H
 #define TRINITY_GRIDDEFINES_H
+
 #include "Common.h"
 #include "GameSystem/NGrid.h"
 #include <cmath>
+
 // Forward class definitions
 class Corpse;
 class Creature;
@@ -29,32 +32,47 @@ class DynamicObject;
 class GameObject;
 class Pet;
 class Player;
+
 #define MAX_NUMBER_OF_CELLS     8
+
 #define MAX_NUMBER_OF_GRIDS      64
+
 #define SIZE_OF_GRIDS            533.33333f
 #define CENTER_GRID_ID           (MAX_NUMBER_OF_GRIDS/2)
+
 #define CENTER_GRID_OFFSET      (SIZE_OF_GRIDS/2)
+
 #define MIN_GRID_DELAY          (MINUTE*IN_MILISECONDS)
 #define MIN_MAP_UPDATE_DELAY    50
+
 #define SIZE_OF_GRID_CELL       (SIZE_OF_GRIDS/MAX_NUMBER_OF_CELLS)
+
 #define CENTER_GRID_CELL_ID     (MAX_NUMBER_OF_CELLS*MAX_NUMBER_OF_GRIDS/2)
 #define CENTER_GRID_CELL_OFFSET (SIZE_OF_GRID_CELL/2)
+
 #define TOTAL_NUMBER_OF_CELLS_PER_MAP    (MAX_NUMBER_OF_GRIDS*MAX_NUMBER_OF_CELLS)
+
 #define MAP_RESOLUTION 128
+
 #define MAP_SIZE                (SIZE_OF_GRIDS*MAX_NUMBER_OF_GRIDS)
 #define MAP_HALFSIZE            (MAP_SIZE/2)
+
 // Creature used instead pet to simplify *::Visit templates (not required duplicate code for Creature->Pet case)
 typedef TYPELIST_4(Player, Creature/*pets*/, Corpse/*resurrectable*/, DynamicObject/*farsight target*/) AllWorldObjectTypes;
 typedef TYPELIST_4(GameObject, Creature/*except pets*/, DynamicObject, Corpse/*Bones*/) AllGridObjectTypes;
+
 typedef GridRefManager<Corpse>          CorpseMapType;
 typedef GridRefManager<Creature>        CreatureMapType;
 typedef GridRefManager<DynamicObject>   DynamicObjectMapType;
 typedef GridRefManager<GameObject>      GameObjectMapType;
 typedef GridRefManager<Player>          PlayerMapType;
+
 typedef Grid<Player, AllWorldObjectTypes,AllGridObjectTypes> GridType;
 typedef NGrid<MAX_NUMBER_OF_CELLS, Player, AllWorldObjectTypes, AllGridObjectTypes> NGridType;
+
 typedef TypeMapContainer<AllGridObjectTypes> GridTypeMapContainer;
 typedef TypeMapContainer<AllWorldObjectTypes> WorldTypeMapContainer;
+
 template<const unsigned int LIMIT>
 struct TRINITY_DLL_DECL CoordPair
 {
@@ -68,6 +86,7 @@ struct TRINITY_DLL_DECL CoordPair
         y_coord = obj.y_coord;
         return *this;
     }
+
     void operator<<(const uint32 val)
     {
         if( x_coord > val )
@@ -75,6 +94,7 @@ struct TRINITY_DLL_DECL CoordPair
         else
             x_coord = 0;
     }
+
     void operator>>(const uint32 val)
     {
         if( x_coord+val < LIMIT )
@@ -82,6 +102,7 @@ struct TRINITY_DLL_DECL CoordPair
         else
             x_coord = LIMIT - 1;
     }
+
     void operator-=(const uint32 val)
     {
         if( y_coord > val )
@@ -89,6 +110,7 @@ struct TRINITY_DLL_DECL CoordPair
         else
             y_coord = 0;
     }
+
     void operator+=(const uint32 val)
     {
         if( y_coord+val < LIMIT )
@@ -96,11 +118,14 @@ struct TRINITY_DLL_DECL CoordPair
         else
             y_coord = LIMIT - 1;
     }
+
     uint32 x_coord;
     uint32 y_coord;
 };
+
 typedef CoordPair<MAX_NUMBER_OF_GRIDS> GridPair;
 typedef CoordPair<TOTAL_NUMBER_OF_CELLS_PER_MAP> CellPair;
+
 namespace Trinity
 {
     template<class RET_TYPE, int CENTER_VAL>
@@ -109,28 +134,34 @@ namespace Trinity
         // calculate and store temporary values in double format for having same result as same mySQL calculations
         double x_offset = (double(x) - center_offset)/size;
         double y_offset = (double(y) - center_offset)/size;
+
         int x_val = int(x_offset+CENTER_VAL + 0.5);
         int y_val = int(y_offset+CENTER_VAL + 0.5);
         return RET_TYPE(x_val, y_val);
     }
+
     inline GridPair ComputeGridPair(float x, float y)
     {
         return Compute<GridPair, CENTER_GRID_ID>(x, y, CENTER_GRID_OFFSET, SIZE_OF_GRIDS);
     }
+
     inline CellPair ComputeCellPair(float x, float y)
     {
         return Compute<CellPair, CENTER_GRID_CELL_ID>(x, y, CENTER_GRID_CELL_OFFSET, SIZE_OF_GRID_CELL);
     }
+
     inline CellPair ComputeCellPair(float x, float y, float &x_off, float &y_off)
     {
         double x_offset = (double(x) - CENTER_GRID_CELL_OFFSET)/SIZE_OF_GRID_CELL;
         double y_offset = (double(y) - CENTER_GRID_CELL_OFFSET)/SIZE_OF_GRID_CELL;
+
         int x_val = int(x_offset + CENTER_GRID_CELL_ID + 0.5);
         int y_val = int(y_offset + CENTER_GRID_CELL_ID + 0.5);
         x_off = (float(x_offset) - x_val + CENTER_GRID_CELL_ID) * SIZE_OF_GRID_CELL;
         y_off = (float(y_offset) - y_val + CENTER_GRID_CELL_ID) * SIZE_OF_GRID_CELL;
         return CellPair(x_val, y_val);
     }
+
     inline void NormalizeMapCoord(float &c)
     {
         if(c > MAP_HALFSIZE - 0.5)
@@ -138,18 +169,22 @@ namespace Trinity
         else if(c < -(MAP_HALFSIZE - 0.5))
             c = -(MAP_HALFSIZE - 0.5);
     }
+
     inline bool IsValidMapCoord(float c)
     {
         return finite(c) && (std::fabs(c) <= MAP_HALFSIZE - 0.5);
     }
+
     inline bool IsValidMapCoord(float x, float y)
     {
         return IsValidMapCoord(x) && IsValidMapCoord(y);
     }
+
     inline bool IsValidMapCoord(float x, float y, float z)
     {
         return IsValidMapCoord(x,y) && finite(z);
     }
+
     inline bool IsValidMapCoord(float x, float y, float z, float o)
     {
         return IsValidMapCoord(x,y,z) && finite(o);