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

chore(object): tidy up return type for ClntObjMgrAllocObject
Some checks are pending
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:cl compiler_name:MSVC cxx:cl os:windows-latest system_name:Windows test_path:WhoaTest]) (push) Waiting to run
Details
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:clang compiler_name:Clang cxx:clang++ os:macos-latest system_name:macOS test_path:WhoaTest]) (push) Waiting to run
Details
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:gcc compiler_name:GCC cxx:g++ os:ubuntu-latest system_name:Linux test_path:WhoaTest]) (push) Waiting to run
Details

Browse Source
This commit is contained in:
fallenoak 2026-01-17 20:34:46 -06:00
parent 2efef87898
commit 553a59c808
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

9
src/object/client/ObjMgr.cpp
View File

@ -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() {

2
src/object/client/ObjMgr.hpp
View File

@ -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();