From 553a59c8083c1ecc1df4533ee0e8fe977bad9a7d Mon Sep 17 00:00:00 2001
From: fallenoak <git@fallenoak.me>
Date: Sat, 17 Jan 2026 20:34:46 -0600
Subject: [PATCH] chore(object): tidy up return type for ClntObjMgrAllocObject

---
 src/object/client/MessageHandlers.cpp | 2 +-
 src/object/client/ObjMgr.cpp          | 9 +++++----
 src/object/client/ObjMgr.hpp          | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/object/client/MessageHandlers.cpp b/src/object/client/MessageHandlers.cpp
index 1d64e77..cac7254 100644
--- a/src/object/client/MessageHandlers.cpp
+++ b/src/object/client/MessageHandlers.cpp
@@ -236,7 +236,7 @@ int32_t CreateObject(CDataStore* msg, uint32_t time) {
         ClntObjMgrSetActivePlayer(guid);
     }
 
-    auto newObject = static_cast<CGObject_C*>(ClntObjMgrAllocObject(typeID, guid));
+    auto newObject = ClntObjMgrAllocObject(typeID, guid);
 
     SetupObjectStorage(typeID, newObject, guid);
 
diff --git a/src/object/client/ObjMgr.cpp b/src/object/client/ObjMgr.cpp
index d65b186..a159c4f 100644
--- a/src/object/client/ObjMgr.cpp
+++ b/src/object/client/ObjMgr.cpp
@@ -67,12 +67,12 @@ void MirrorInitialize() {
     // TODO
 }
 
-void* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid) {
+CGObject_C* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid) {
     auto playerGUID = ClntObjMgrGetActivePlayer();
 
     // Heap allocate player object for current player
     if (guid == playerGUID) {
-        return STORM_ALLOC(sizeof(CGPlayer_C) + CGPlayer::GetDataSize() + CGPlayer::GetDataSizeSaved());
+        return static_cast<CGObject_C*>(STORM_ALLOC(sizeof(CGPlayer_C) + CGPlayer::GetDataSize() + CGPlayer::GetDataSizeSaved()));
     }
 
     // TODO GarbageCollect(typeID, 10000);
@@ -85,9 +85,10 @@ void* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid) {
     }
 
     // TODO pointer should be fetched via ObjectPtr
-    static_cast<CGObject_C*>(mem)->m_memHandle = memHandle;
+    auto object = static_cast<CGObject_C*>(mem);
+    object->m_memHandle = memHandle;
 
-    return mem;
+    return object;
 }
 
 WOWGUID ClntObjMgrGetActivePlayer() {
diff --git a/src/object/client/ObjMgr.hpp b/src/object/client/ObjMgr.hpp
index c5ea706..6d5fd09 100644
--- a/src/object/client/ObjMgr.hpp
+++ b/src/object/client/ObjMgr.hpp
@@ -6,7 +6,7 @@
 #include "object/Types.hpp"
 #include <cstdint>
 
-void* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid);
+CGObject_C* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid);
 
 WOWGUID ClntObjMgrGetActivePlayer();