From e46451b2f445abbb6564e11869c39b0ca903ffd4 Mon Sep 17 00:00:00 2001 From: fallenoak Date: Fri, 9 Jan 2026 21:54:35 -0600 Subject: [PATCH] feat(object): add HIER_TYPE members to OBJECT_TYPE enum --- src/object/Types.hpp | 25 +++++++++++++++++-------- src/object/client/CGObject_C.cpp | 16 ++++++++-------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/object/Types.hpp b/src/object/Types.hpp index 0997b17..9168c91 100644 --- a/src/object/Types.hpp +++ b/src/object/Types.hpp @@ -39,14 +39,23 @@ enum INVENTORY_SLOTS { }; enum OBJECT_TYPE { - TYPE_OBJECT = 0x1, - TYPE_ITEM = 0x2, - TYPE_CONTAINER = 0x4, - TYPE_UNIT = 0x8, - TYPE_PLAYER = 0x10, - TYPE_GAMEOBJECT = 0x20, - TYPE_DYNAMICOBJECT = 0x40, - TYPE_CORPSE = 0x80, + TYPE_OBJECT = 0x1, + TYPE_ITEM = 0x2, + TYPE_CONTAINER = 0x4, + TYPE_UNIT = 0x8, + TYPE_PLAYER = 0x10, + TYPE_GAMEOBJECT = 0x20, + TYPE_DYNAMICOBJECT = 0x40, + TYPE_CORPSE = 0x80, + // TODO + HIER_TYPE_OBJECT = TYPE_OBJECT, + HIER_TYPE_ITEM = TYPE_OBJECT | TYPE_ITEM, + HIER_TYPE_CONTAINER = TYPE_OBJECT | TYPE_ITEM | TYPE_CONTAINER, + HIER_TYPE_UNIT = TYPE_OBJECT | TYPE_UNIT, + HIER_TYPE_PLAYER = TYPE_OBJECT | TYPE_UNIT | TYPE_PLAYER, + HIER_TYPE_GAMEOBJECT = TYPE_OBJECT | TYPE_GAMEOBJECT, + HIER_TYPE_DYNAMICOBJECT = TYPE_OBJECT | TYPE_DYNAMICOBJECT, + HIER_TYPE_CORPSE = TYPE_OBJECT | TYPE_CORPSE, // TODO }; diff --git a/src/object/client/CGObject_C.cpp b/src/object/client/CGObject_C.cpp index 46873e8..c5c8df8 100644 --- a/src/object/client/CGObject_C.cpp +++ b/src/object/client/CGObject_C.cpp @@ -5,35 +5,35 @@ void CGObject_C::SetTypeID(OBJECT_TYPE_ID typeID) { switch (typeID) { case ID_OBJECT: - this->m_obj->m_type = TYPE_OBJECT; + this->m_obj->m_type = HIER_TYPE_OBJECT; break; case ID_ITEM: - this->m_obj->m_type = static_cast(TYPE_OBJECT | TYPE_ITEM); + this->m_obj->m_type = HIER_TYPE_ITEM; break; case ID_CONTAINER: - this->m_obj->m_type = static_cast(TYPE_OBJECT | TYPE_ITEM | TYPE_CONTAINER); + this->m_obj->m_type = HIER_TYPE_CONTAINER; break; case ID_UNIT: - this->m_obj->m_type = static_cast(TYPE_OBJECT | TYPE_UNIT); + this->m_obj->m_type = HIER_TYPE_UNIT; break; case ID_PLAYER: - this->m_obj->m_type = static_cast(TYPE_OBJECT | TYPE_UNIT | TYPE_PLAYER); + this->m_obj->m_type = HIER_TYPE_PLAYER; break; case ID_GAMEOBJECT: - this->m_obj->m_type = static_cast(TYPE_OBJECT | TYPE_GAMEOBJECT); + this->m_obj->m_type = HIER_TYPE_GAMEOBJECT; break; case ID_DYNAMICOBJECT: - this->m_obj->m_type = static_cast(TYPE_OBJECT | TYPE_DYNAMICOBJECT); + this->m_obj->m_type = HIER_TYPE_DYNAMICOBJECT; break; case ID_CORPSE: - this->m_obj->m_type = static_cast(TYPE_OBJECT | TYPE_CORPSE); + this->m_obj->m_type = HIER_TYPE_CORPSE; break; default: