diff options
| author | jackpoz <giacomopoz@gmail.com> | 2020-12-27 20:22:35 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-05 17:03:02 +0100 |
| commit | 90a05037cf13a46beb7b519bf2e155598d1344fe (patch) | |
| tree | 54dee3f38f0509471f7568d7909a7fc75722a296 /src/server/game/Grids/GridDefines.h | |
| parent | bea8894bceba9771de1ed825959d835f96a04ac3 (diff) | |
Core/Maps: Partially revert 0c69316714d0558e32462f5401197fe1e803ae75
Revert define to constexpr as this also broke some calculations
(cherry picked from commit ed1c0b6ec9232cc638fa242ea839c4645bb4be07)
Diffstat (limited to 'src/server/game/Grids/GridDefines.h')
| -rw-r--r-- | src/server/game/Grids/GridDefines.h | 28 |
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; |