RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-01 00:02:45 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(object): add HIER_TYPE members to OBJECT_TYPE enum

Browse Source
This commit is contained in:
fallenoak 2026-01-09 21:54:35 -06:00
parent 551fd7f4b1
commit e46451b2f4
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/object/Types.hpp
View File

@ -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
};

16
src/object/client/CGObject_C.cpp
View File

@ -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<OBJECT_TYPE>(TYPE_OBJECT | TYPE_ITEM);
this->m_obj->m_type = HIER_TYPE_ITEM;
break;
case ID_CONTAINER:
this->m_obj->m_type = static_cast<OBJECT_TYPE>(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<OBJECT_TYPE>(TYPE_OBJECT | TYPE_UNIT);
this->m_obj->m_type = HIER_TYPE_UNIT;
break;
case ID_PLAYER:
this->m_obj->m_type = static_cast<OBJECT_TYPE>(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<OBJECT_TYPE>(TYPE_OBJECT | TYPE_GAMEOBJECT);
this->m_obj->m_type = HIER_TYPE_GAMEOBJECT;
break;
case ID_DYNAMICOBJECT:
this->m_obj->m_type = static_cast<OBJECT_TYPE>(TYPE_OBJECT | TYPE_DYNAMICOBJECT);
this->m_obj->m_type = HIER_TYPE_DYNAMICOBJECT;
break;
case ID_CORPSE:
this->m_obj->m_type = static_cast<OBJECT_TYPE>(TYPE_OBJECT | TYPE_CORPSE);
this->m_obj->m_type = HIER_TYPE_CORPSE;
break;
default: