From 43dcfae6b0225d838cc3f45fcb8df68bffed168f Mon Sep 17 00:00:00 2001
From: fallenoak <git@fallenoak.me>
Date: Fri, 16 Jan 2026 16:56:27 -0600
Subject: [PATCH] feat(object): add type-specific cleanup queues to ClntObjMgr

---
 src/object/client/ClntObjMgr.hpp | 2 +-
 src/object/client/Util.cpp       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/object/client/ClntObjMgr.hpp b/src/object/client/ClntObjMgr.hpp
index 7cd4fe3..30f8c97 100644
--- a/src/object/client/ClntObjMgr.hpp
+++ b/src/object/client/ClntObjMgr.hpp
@@ -13,7 +13,7 @@ class ClntObjMgr {
         // Member variables
         TSHashTable<CGObject_C, CHashKeyGUID> m_objects;
         TSHashTable<CGObject_C, CHashKeyGUID> m_lazyCleanupObjects;
-        // TODO
+        STORM_EXPLICIT_LIST(CGObject_C, m_link) m_lazyCleanupFifo[NUM_CLIENT_OBJECT_TYPES - 1];
         STORM_EXPLICIT_LIST(CGObject_C, m_link) m_visibleObjects;
         STORM_EXPLICIT_LIST(CGObject_C, m_link) m_reenabledObjects;
         // TODO
diff --git a/src/object/client/Util.cpp b/src/object/client/Util.cpp
index 619b298..574960c 100644
--- a/src/object/client/Util.cpp
+++ b/src/object/client/Util.cpp
@@ -83,8 +83,7 @@ void HandleObjectOutOfRangePass2(CGObject_C* object) {
     }
 
     ClntObjMgrGetCurrent()->m_lazyCleanupObjects.Insert(object, object->m_hashval, CHashKeyGUID(object->m_key));
-
-    // TODO link to type specific (disabled?) list in ClntObjMgrGetCurrent()
+    ClntObjMgrGetCurrent()->m_lazyCleanupFifo[object->m_typeID - 1].LinkToTail(object);
 }
 
 void InitObject(CGObject_C* object, uint32_t time, CClientObjCreate& objCreate) {