From 5410539f0528fb31f9b9635bd80e9f23aabe958b Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Sat, 28 Jun 2025 12:44:18 +0200
Subject: [PATCH] Core/Misc: replace more macros with constexpr

---
 .../game/Entities/Creature/CreatureData.h     | 10 +++++-----
 src/server/game/Spells/Spell.h                |  7 +++----
 src/server/game/Spells/SpellDefines.h         |  2 +-
 src/server/game/Spells/SpellMgr.h             | 20 +++++++++----------
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h
index cd6d3fc45d..f8192d6c12 100644
--- a/src/server/game/Entities/Creature/CreatureData.h
+++ b/src/server/game/Entities/Creature/CreatureData.h
@@ -329,12 +329,12 @@ struct TC_GAME_API CreatureMovementData
     std::string ToString() const;
 };
 
-static uint32 const CREATURE_NOPATH_EVADE_TIME = 5 * IN_MILLISECONDS;
+constexpr uint32 const CREATURE_NOPATH_EVADE_TIME = 5 * IN_MILLISECONDS;
 
-static uint8 const MAX_KILL_CREDIT = 2;
-static uint32 const MAX_CREATURE_MODELS = 4;
-static uint32 const MAX_CREATURE_QUEST_ITEMS = 6;
-static uint32 const MAX_CREATURE_SPELLS = 8;
+constexpr uint8 const MAX_KILL_CREDIT = 2;
+constexpr uint32 const MAX_CREATURE_MODELS = 4;
+constexpr uint32 const MAX_CREATURE_QUEST_ITEMS = 6;
+constexpr uint32 const MAX_CREATURE_SPELLS = 8;
 
 struct CreatureModel
 {
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 68a8973031..a36cc7c4df 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -73,9 +73,8 @@ enum SpellValueMod : uint8;
 enum TriggerCastFlags : uint32;
 enum WeaponAttackType : uint8;
 
-#define SPELL_CHANNEL_UPDATE_INTERVAL (1 * IN_MILLISECONDS)
-#define MAX_SPELL_RANGE_TOLERANCE 3.0f
-#define TRAJECTORY_MISSILE_SIZE 3.0f
+constexpr float MAX_SPELL_RANGE_TOLERANCE = 3.0f;
+constexpr float TRAJECTORY_MISSILE_SIZE = 3.0f;
 
 enum SpellCastFlags
 {
@@ -277,7 +276,7 @@ enum SpellEffectHandleMode
 
 typedef std::vector<std::pair<uint32, ObjectGuid>> DispelList;
 
-static const uint32 SPELL_INTERRUPT_NONPLAYER = 32747;
+constexpr uint32 SPELL_INTERRUPT_NONPLAYER = 32747;
 
 class TC_GAME_API Spell
 {
diff --git a/src/server/game/Spells/SpellDefines.h b/src/server/game/Spells/SpellDefines.h
index b2f533b7b0..971ee2b7d7 100644
--- a/src/server/game/Spells/SpellDefines.h
+++ b/src/server/game/Spells/SpellDefines.h
@@ -139,7 +139,7 @@ enum class SpellModOp : uint8
     PowerCostOnMiss             = 30
 };
 
-#define MAX_SPELLMOD 32
+constexpr uint8 MAX_SPELLMOD = 32;
 
 enum SpellValueMod : uint8
 {
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index e0a9ebeac3..16cda071fc 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -96,7 +96,7 @@ enum SpellFamilyFlag
 };
 
 
-#define SPELL_LINKED_MAX_SPELLS  200000
+constexpr uint32 SPELL_LINKED_MAX_SPELLS = 200000;
 
 enum SpellLinkedType
 {
@@ -194,14 +194,14 @@ enum ProcFlags
     REQ_SPELL_PHASE_PROC_FLAG_MASK             = SPELL_PROC_FLAG_MASK & DONE_HIT_PROC_FLAG_MASK
 };
 
-#define MELEE_BASED_TRIGGER_MASK (PROC_FLAG_DEAL_MELEE_SWING    | \
-                                  PROC_FLAG_TAKE_MELEE_SWING    | \
-                                  PROC_FLAG_DEAL_MELEE_ABILITY  | \
-                                  PROC_FLAG_TAKE_MELEE_ABILITY  | \
-                                  PROC_FLAG_DEAL_RANGED_ATTACK  | \
-                                  PROC_FLAG_TAKE_RANGED_ATTACK  | \
-                                  PROC_FLAG_DEAL_RANGED_ABILITY | \
-                                  PROC_FLAG_TAKE_RANGED_ABILITY)
+constexpr uint32 MELEE_BASED_TRIGGER_MASK = PROC_FLAG_DEAL_MELEE_SWING |
+                                  PROC_FLAG_TAKE_MELEE_SWING    |
+                                  PROC_FLAG_DEAL_MELEE_ABILITY  |
+                                  PROC_FLAG_TAKE_MELEE_ABILITY  |
+                                  PROC_FLAG_DEAL_RANGED_ATTACK  |
+                                  PROC_FLAG_TAKE_RANGED_ATTACK  |
+                                  PROC_FLAG_DEAL_RANGED_ABILITY |
+                                  PROC_FLAG_TAKE_RANGED_ABILITY;
 
 enum ProcFlagsSpellType
 {
@@ -312,7 +312,7 @@ namespace std
     };
 }
 
-#define SPELL_GROUP_DB_RANGE_MIN 1000
+constexpr uint32 SPELL_GROUP_DB_RANGE_MIN = 1000;
 
 //                  spell_id, group_id
 typedef std::unordered_multimap<uint32, SpellGroup> SpellSpellGroupMap;