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

feat(object): finish reenabling objects in object update handler

Browse Source
This commit is contained in:
fallenoak 2026-01-19 11:23:18 -06:00
parent 5a8fb5e2d3
commit 1de58d83e5
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,14 @@ int32_t CGObject_C::IsObjectLocked() {
return this->m_lockCount != 0; return this->m_lockCount != 0;
} }
void CGObject_C::PostReenable() {
// TODO
this->m_inReenable = false;
// TODO
}
void CGObject_C::Reenable() { void CGObject_C::Reenable() {
this->m_disabled = false; this->m_disabled = false;
this->m_inReenable = true; this->m_inReenable = true;

4
src/object/client/CGObject_C.hpp
View File

@ -25,7 +25,8 @@ class CGObject_C : public CGObject, public TSHashObject<CGObject_C, CHashKeyGUID
// Virtual public member functions // Virtual public member functions
virtual ~CGObject_C(); virtual ~CGObject_C();
virtual void Disable(); virtual void Disable();
// TODO void Reenable();
void PostReenable();
virtual void HandleOutOfRange(OUT_OF_RANGE_TYPE type) {}; virtual void HandleOutOfRange(OUT_OF_RANGE_TYPE type) {};
// TODO // TODO
@ -35,7 +36,6 @@ class CGObject_C : public CGObject, public TSHashObject<CGObject_C, CHashKeyGUID
void AddWorldObject(); void AddWorldObject();
int32_t IsInReenable(); int32_t IsInReenable();
int32_t IsObjectLocked(); int32_t IsObjectLocked();
void Reenable();
void SetBlock(uint32_t block, uint32_t value); void SetBlock(uint32_t block, uint32_t value);
void SetDisablePending(int32_t pending); void SetDisablePending(int32_t pending);
void SetObjectLocked(int32_t locked); void SetObjectLocked(int32_t locked);

10
src/object/client/MessageHandlers.cpp
View File

@ -323,7 +323,15 @@ int32_t ObjectUpdateFirstPass(CDataStore* msg, uint32_t time, uint32_t updateIdx
int32_t ObjectUpdateSecondPass(CDataStore* msg, uint32_t time, uint32_t updateCount) { int32_t ObjectUpdateSecondPass(CDataStore* msg, uint32_t time, uint32_t updateCount) {
// TODO // TODO
return 0;
// Finish reenabling objects
while (auto reenabledObject = ClntObjMgrGetCurrent()->m_reenabledObjects.Head()) {
ClntObjMgrGetCurrent()->m_visibleObjects.LinkToTail(reenabledObject);
reenabledObject->PostReenable();
}
return 1;
} }
int32_t ObjectCompressedUpdateHandler(void* param, NETMESSAGE msgId, uint32_t time, CDataStore* msg) { int32_t ObjectCompressedUpdateHandler(void* param, NETMESSAGE msgId, uint32_t time, CDataStore* msg) {