From a519358a9d995b03a2fb1fad36c8be3e0e7b1d4e Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 2 Jan 2026 12:54:25 +0100
Subject: Core/Objects: Change NUM_CLIENT_OBJECT_TYPES to be part of TypeID
 enum instead of preprocessor define

---
 src/server/game/Entities/Object/BaseEntity.h | 2 +-
 src/server/game/Entities/Object/ObjectGuid.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/server')

diff --git a/src/server/game/Entities/Object/BaseEntity.h b/src/server/game/Entities/Object/BaseEntity.h
index 3a3976fc297..6bde140c4f3 100644
--- a/src/server/game/Entities/Object/BaseEntity.h
+++ b/src/server/game/Entities/Object/BaseEntity.h
@@ -325,7 +325,7 @@ class TC_GAME_API BaseEntity
         virtual UF::UpdateFieldFlag GetUpdateFieldFlagsFor(Player const* target) const;
         static void BuildEntityFragments(ByteBuffer* data, std::span<WowCS::EntityFragment const> fragments);
 
-        TypeID m_objectTypeId = static_cast<TypeID>(NUM_CLIENT_OBJECT_TYPES);
+        TypeID m_objectTypeId = NUM_CLIENT_OBJECT_TYPES;
         CreateObjectBits m_updateFlag = {};
         WowCS::EntityFragmentsHolder m_entityFragments;
 
diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h
index d24c228c872..b5f9b84e29a 100644
--- a/src/server/game/Entities/Object/ObjectGuid.h
+++ b/src/server/game/Entities/Object/ObjectGuid.h
@@ -51,10 +51,10 @@ enum TypeID : uint8
     TYPEID_MESH_OBJECT            = 14,
     TYPEID_AI_GROUP               = 15,
     TYPEID_SCENARIO               = 16,
-    TYPEID_LOOT_OBJECT            = 17
-};
+    TYPEID_LOOT_OBJECT            = 17,
 
-#define NUM_CLIENT_OBJECT_TYPES             18
+    NUM_CLIENT_OBJECT_TYPES
+};
 
 enum TypeMask
 {
-- 
cgit v1.2.3