Core/Maps: Partially revert 0c69316714d0558e32462f5401197fe1e803ae75

Revert define to constexpr as this also broke some calculations

(cherry picked from commit ed1c0b6ec9232cc638fa242ea839c4645bb4be07)

1 files changed, 14 insertions, 14 deletions

diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index 100338a6dd2..3fd667dd718 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -33,29 +33,29 @@ class AreaTrigger;
 class SceneObject;
 class Conversation;
 
-constexpr uint32 MAX_NUMBER_OF_CELLS           = 8;
+#define MAX_NUMBER_OF_CELLS     8
 
-constexpr uint32 MAX_NUMBER_OF_GRIDS           = 64;
+#define MAX_NUMBER_OF_GRIDS      64
 
-constexpr float SIZE_OF_GRIDS                  = 533.3333f;
-constexpr uint32 CENTER_GRID_ID                = (MAX_NUMBER_OF_GRIDS / 2);
+#define SIZE_OF_GRIDS            533.3333f
+#define CENTER_GRID_ID           (MAX_NUMBER_OF_GRIDS/2)
 
-constexpr float CENTER_GRID_OFFSET             = (SIZE_OF_GRIDS / 2);
+#define CENTER_GRID_OFFSET      (SIZE_OF_GRIDS/2)
 
-#define MIN_GRID_DELAY                           (MINUTE*IN_MILLISECONDS)
-#define MIN_MAP_UPDATE_DELAY                     1
+#define MIN_GRID_DELAY          (MINUTE*IN_MILLISECONDS)
+#define MIN_MAP_UPDATE_DELAY    1
 
-constexpr float SIZE_OF_GRID_CELL              = (SIZE_OF_GRIDS / MAX_NUMBER_OF_CELLS);
+#define SIZE_OF_GRID_CELL       (SIZE_OF_GRIDS/MAX_NUMBER_OF_CELLS)
 
-constexpr uint32 CENTER_GRID_CELL_ID           = (MAX_NUMBER_OF_CELLS * MAX_NUMBER_OF_GRIDS / 2);
-constexpr float CENTER_GRID_CELL_OFFSET        = (SIZE_OF_GRID_CELL / 2);
+#define CENTER_GRID_CELL_ID     (MAX_NUMBER_OF_CELLS*MAX_NUMBER_OF_GRIDS/2)
+#define CENTER_GRID_CELL_OFFSET (SIZE_OF_GRID_CELL/2)
 
-constexpr uint32 TOTAL_NUMBER_OF_CELLS_PER_MAP = (MAX_NUMBER_OF_GRIDS * MAX_NUMBER_OF_CELLS);
+#define TOTAL_NUMBER_OF_CELLS_PER_MAP    (MAX_NUMBER_OF_GRIDS*MAX_NUMBER_OF_CELLS)
 
-constexpr uint32 MAP_RESOLUTION                = 128;
+#define MAP_RESOLUTION 128
 
-constexpr float MAP_SIZE                       = (SIZE_OF_GRIDS * MAX_NUMBER_OF_GRIDS);
-constexpr float MAP_HALFSIZE                   = (MAP_SIZE / 2);
+#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;