Merge 4a102c6ace into 5a8fb5e2d3

src/object/client/CGCorpse_C.cpp

@@ -8,14 +8,6 @@ CGCorpse_C::~CGCorpse_C() {
     // TODO
 }
 
-void CGCorpse_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
-    // TODO
-
-    this->CGObject_C::PostInit(time, init, a4);
-
-    // TODO
-}
-
 void CGCorpse_C::SetStorage(uint32_t* storage, uint32_t* saved) {
     this->CGObject_C::SetStorage(storage, saved);
 

src/object/client/CGCorpse_C.hpp

@@ -12,7 +12,6 @@ class CGCorpse_C : public CGObject_C, public CGCorpse {
 
         // Public member functions
         CGCorpse_C(uint32_t time, CClientObjCreate& objCreate);
-        void PostInit(uint32_t time, const CClientObjCreate& init, bool a4);
         void SetStorage(uint32_t* storage, uint32_t* saved);
 };
 

src/object/client/CGDynamicObject_C.cpp

@@ -8,14 +8,6 @@ CGDynamicObject_C::~CGDynamicObject_C() {
     // TODO
 }
 
-void CGDynamicObject_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
-    // TODO
-
-    this->CGObject_C::PostInit(time, init, a4);
-
-    // TODO
-}
-
 void CGDynamicObject_C::SetStorage(uint32_t* storage, uint32_t* saved) {
     this->CGObject_C::SetStorage(storage, saved);
 

src/object/client/CGDynamicObject_C.hpp

@@ -12,7 +12,6 @@ class CGDynamicObject_C : public CGObject_C, public CGDynamicObject {
 
         // Public member functions
         CGDynamicObject_C(uint32_t time, CClientObjCreate& objCreate);
-        void PostInit(uint32_t time, const CClientObjCreate& init, bool a4);
         void SetStorage(uint32_t* storage, uint32_t* saved);
 };
 

src/object/client/CGGameObject_C.cpp

@@ -8,14 +8,6 @@ CGGameObject_C::~CGGameObject_C() {
     // TODO
 }
 
-void CGGameObject_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
-    // TODO
-
-    this->CGObject_C::PostInit(time, init, a4);
-
-    // TODO
-}
-
 void CGGameObject_C::SetStorage(uint32_t* storage, uint32_t* saved) {
     this->CGObject_C::SetStorage(storage, saved);
 

src/object/client/CGGameObject_C.hpp

@@ -12,7 +12,6 @@ class CGGameObject_C : public CGObject_C, public CGGameObject {
 
         // Public member functions
         CGGameObject_C(uint32_t time, CClientObjCreate& objCreate);
-        void PostInit(uint32_t time, const CClientObjCreate& init, bool a4);
         void SetStorage(uint32_t* storage, uint32_t* saved);
 };
 

src/object/client/CGItem_C.cpp

@@ -8,12 +8,6 @@ CGItem_C::~CGItem_C() {
     // TODO
 }
 
-void CGItem_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
-    this->CGObject_C::PostInit(time, init, a4);
-
-    // TODO
-}
-
 void CGItem_C::SetStorage(uint32_t* storage, uint32_t* saved) {
     this->CGObject_C::SetStorage(storage, saved);
 

src/object/client/CGItem_C.hpp

@@ -12,7 +12,6 @@ class CGItem_C : public CGObject_C, public CGItem {
 
         // Public member functions
         CGItem_C(uint32_t time, CClientObjCreate& objCreate);
-        void PostInit(uint32_t time, const CClientObjCreate& init, bool a4);
         void SetStorage(uint32_t* storage, uint32_t* saved);
 };
 

src/object/client/CGObject_C.cpp

@@ -44,14 +44,6 @@ int32_t CGObject_C::IsObjectLocked() {
     return this->m_lockCount != 0;
 }
 
-void CGObject_C::PostReenable() {
-    // TODO
-
-    this->m_inReenable = false;
-
-    // TODO
-}
-
 void CGObject_C::Reenable() {
     this->m_disabled = false;
     this->m_inReenable = true;
@@ -59,12 +51,6 @@ void CGObject_C::Reenable() {
     // TODO
 }
 
-void CGObject_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
-    this->m_postInited = true;
-
-    // TODO
-}
-
 void CGObject_C::SetBlock(uint32_t block, uint32_t value) {
     auto storage = reinterpret_cast<uint32_t*>(this->m_obj);
     storage[block] = value;

src/object/client/CGObject_C.hpp

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

src/object/client/CGPlayer_C.cpp

@@ -11,14 +11,6 @@ CGPlayer_C::~CGPlayer_C() {
     // TODO
 }
 
-void CGPlayer_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
-    // TODO
-
-    this->CGUnit_C::PostInit(time, init, a4);
-
-    // TODO
-}
-
 void CGPlayer_C::SetStorage(uint32_t* storage, uint32_t* saved) {
     this->CGUnit_C::SetStorage(storage, saved);
 

src/object/client/CGPlayer_C.hpp

@@ -15,7 +15,6 @@ class CGPlayer_C : public CGUnit_C, public CGPlayer {
 
         // Public member functions
         CGPlayer_C(uint32_t time, CClientObjCreate& objCreate);
-        void PostInit(uint32_t time, const CClientObjCreate& init, bool a4);
         void SetStorage(uint32_t* storage, uint32_t* saved);
 };
 

src/object/client/CGUnit_C.cpp

@@ -1,8 +1,6 @@
 #include "object/client/CGUnit_C.hpp"
 #include "db/Db.hpp"
 
-WOWGUID CGUnit_C::s_activeMover;
-
 const char* CGUnit_C::GetDisplayClassNameFromRecord(const ChrClassesRec* classRec, UNIT_SEX sex, UNIT_SEX* displaySex) {
     if (displaySex) {
         *displaySex = sex;
@@ -99,18 +97,6 @@ CGUnit_C::~CGUnit_C() {
     // TODO
 }
 
-void CGUnit_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
-    // TODO
-
-    this->CGObject_C::PostInit(time, init, a4);
-
-    // TODO
-}
-
-void CGUnit_C::PostMovementUpdate(const CClientMoveUpdate& move, int32_t activeMover) {
-    // TODO
-}
-
 void CGUnit_C::SetStorage(uint32_t* storage, uint32_t* saved) {
     this->CGObject_C::SetStorage(storage, saved);
 

src/object/client/CGUnit_C.hpp

@@ -5,16 +5,12 @@
 #include "object/client/CGObject_C.hpp"
 #include "object/client/CGUnit.hpp"
 #include "object/Types.hpp"
-#include "util/GUID.hpp"
 
 class ChrClassesRec;
 class ChrRacesRec;
 
 class CGUnit_C : public CGObject_C, public CGUnit {
     public:
-        // Public static variables
-        static WOWGUID s_activeMover;
-
         // Public static functions
         static const char* GetDisplayClassNameFromRecord(const ChrClassesRec* classRec, UNIT_SEX sex, UNIT_SEX* displaySex);
         static const char* GetDisplayRaceNameFromRecord(const ChrRacesRec* raceRec, UNIT_SEX sex, UNIT_SEX* displaySex);
@@ -24,8 +20,6 @@ class CGUnit_C : public CGObject_C, public CGUnit {
 
         // Public member functions
         CGUnit_C(uint32_t time, CClientObjCreate& objCreate);
-        void PostInit(uint32_t time, const CClientObjCreate& init, bool a4);
-        void PostMovementUpdate(const CClientMoveUpdate& move, int32_t activeMover);
         void SetStorage(uint32_t* storage, uint32_t* saved);
 };
 

src/object/client/MessageHandlers.cpp

@@ -28,122 +28,9 @@ enum UPDATE_TYPE {
     UPDATE_IN_RANGE     = 5,
 };
 
-void SkipSetOfObjects(CDataStore* msg) {
-    uint32_t count;
-    msg->Get(count);
-
-    for (int32_t i = 0; i < count; i++) {
-        SmartGUID guid;
-        *msg >> guid;
-    }
-}
-
-int32_t PostInitObject(CDataStore* msg, uint32_t time, bool a3) {
-    SmartGUID guid;
-    *msg >> guid;
-
-    uint8_t _typeID;
-    msg->Get(_typeID);
-    auto typeID = static_cast<OBJECT_TYPE_ID>(_typeID);
-
-    if (guid == 0) {
-        return 0;
-    }
-
-    auto object = FindActiveObject(guid);
-
-    if (!object) {
-        return 0;
-    }
-
-    CClientObjCreate init;
-    if (!init.Get(msg)) {
-        return 0;
-    }
-
-    if (object->m_inReenable && object->m_obj->m_type & TYPE_UNIT) {
-        // TODO
-    }
-
-    if (object->m_postInited) {
-        return CallMirrorHandlers(msg, true, guid);
-    }
-
-    switch (typeID) {
-        case ID_OBJECT: {
-            object->PostInit(time, init, a3);
-
-            break;
-        }
-
-        case ID_ITEM:
-        case ID_CONTAINER: {
-            static_cast<CGItem_C*>(object)->PostInit(time, init, a3);
-
-            break;
-        }
-
-        case ID_UNIT: {
-            static_cast<CGUnit_C*>(object)->PostInit(time, init, a3);
-
-            break;
-        }
-
-        case ID_PLAYER: {
-            static_cast<CGPlayer_C*>(object)->PostInit(time, init, a3);
-
-            break;
-        }
-
-        case ID_GAMEOBJECT: {
-            static_cast<CGGameObject_C*>(object)->PostInit(time, init, a3);
-
-            break;
-        }
-
-        case ID_DYNAMICOBJECT: {
-            static_cast<CGDynamicObject_C*>(object)->PostInit(time, init, a3);
-
-            break;
-        }
-
-        case ID_CORPSE: {
-            static_cast<CGCorpse_C*>(object)->PostInit(time, init, a3);
-
-            break;
-        }
-
-        default: {
-            STORM_APP_FATAL("PostInitObject: unknown object type %d", typeID);
-        }
-    }
-
-    return SkipPartialObjectUpdate(msg);
-}
-
-void PostMovementUpdate(CDataStore* msg) {
-    SmartGUID guid;
-    *msg >> guid;
-
-    CClientMoveUpdate move;
-    *msg >> move;
-
-    if (guid == CGUnit_C::s_activeMover) {
-        return;
-    }
-
-    int32_t reenable;
-    auto unit = static_cast<CGUnit_C*>(GetUpdateObject(guid, &reenable));
-
-    if (!unit) {
-        return;
-    }
-
-    unit->PostMovementUpdate(move, unit->m_obj->m_guid == CGUnit_C::s_activeMover);
-
-    if (reenable) {
-        unit->Reenable();
-    }
+int32_t SkipPartialObjectUpdate(CDataStore* msg) {
+    // TODO
+    return 0;
 }
 
 void UpdateOutOfRangeObjects(CDataStore* msg) {
@@ -435,57 +322,8 @@ int32_t ObjectUpdateFirstPass(CDataStore* msg, uint32_t time, uint32_t updateIdx
 }
 
 int32_t ObjectUpdateSecondPass(CDataStore* msg, uint32_t time, uint32_t updateCount) {
-    // Handle post updates
-
-    for (int32_t i = 0; i < updateCount; i++) {
-        uint8_t updateType;
-        msg->Get(updateType);
-
-        switch (updateType) {
-            case UPDATE_PARTIAL: {
-                if (!CallMirrorHandlers(msg, false, 0)) {
-                    return 0;
-                }
-
-                break;
-            }
-
-            case UPDATE_MOVEMENT: {
-                PostMovementUpdate(msg);
-
-                break;
-            }
-
-            case UPDATE_FULL:
-            case UPDATE_3: {
-                if (!PostInitObject(msg, time, updateType == UPDATE_3)) {
-                    return 0;
-                }
-
-                break;
-            }
-
-            case UPDATE_IN_RANGE:
-            case UPDATE_OUT_OF_RANGE: {
-                SkipSetOfObjects(msg);
-
-                break;
-            }
-
-            default: {
-                break;
-            }
-        }
-    }
-
-    // Finish reenabling objects
-
-    while (auto reenabledObject = ClntObjMgrGetCurrent()->m_reenabledObjects.Head()) {
-        ClntObjMgrGetCurrent()->m_visibleObjects.LinkToTail(reenabledObject);
-        reenabledObject->PostReenable();
-    }
-
-    return 1;
+    // TODO
+    return 0;
 }
 
 int32_t ObjectCompressedUpdateHandler(void* param, NETMESSAGE msgId, uint32_t time, CDataStore* msg) {

src/object/client/Mirror.cpp

@@ -8,7 +8,6 @@
 #include "object/client/CGPlayer.hpp"
 #include "object/client/CGUnit.hpp"
 #include "object/client/ObjMgr.hpp"
-#include "object/client/Util.hpp"
 #include "object/Types.hpp"
 #include <common/DataStore.hpp>
 
@@ -151,49 +150,6 @@ int32_t IsMaskBitSet(uint32_t* masks, uint32_t block) {
     return masks[block / 32] & (1 << (block % 32));
 }
 
-int32_t CallMirrorHandlers(CDataStore* msg, bool a2, WOWGUID guid) {
-    if (!a2) {
-        SmartGUID _guid;
-        *msg >> _guid;
-
-        guid = _guid;
-    }
-
-    auto object = FindActiveObject(guid);
-
-    if (!object) {
-        return SkipPartialObjectUpdate(msg);
-    }
-
-    uint8_t changeMaskCount;
-    uint32_t changeMasks[MAX_CHANGE_MASKS];
-    if (!ExtractDirtyMasks(msg, &changeMaskCount, changeMasks)) {
-        return 0;
-    }
-
-    OBJECT_TYPE_ID typeID = ID_OBJECT;
-    uint32_t blockOffset = 0;
-    uint32_t numBlocks = GetNumDwordBlocks(object->m_obj->m_type, guid);
-
-    for (int32_t block = 0; block < numBlocks; block++) {
-        if (block >= s_objMirrorBlocks[typeID]) {
-            blockOffset = s_objMirrorBlocks[typeID];
-            typeID = IncTypeID(object, typeID);
-        }
-
-        // TODO
-
-        if (IsMaskBitSet(changeMasks, block)) {
-            uint32_t blockValue = 0;
-            msg->Get(blockValue);
-        }
-
-        // TODO
-    }
-
-    return 1;
-}
-
 int32_t FillInPartialObjectData(CGObject_C* object, WOWGUID guid, CDataStore* msg, bool forFullUpdate, bool zeroZeroBits) {
     uint8_t changeMaskCount;
     uint32_t changeMasks[MAX_CHANGE_MASKS];

src/object/client/Mirror.hpp

@@ -7,8 +7,6 @@
 class CDataStore;
 class CGObject_C;
 
-int32_t CallMirrorHandlers(CDataStore* msg, bool a2, WOWGUID guid);
-
 int32_t FillInPartialObjectData(CGObject_C* object, WOWGUID guid, CDataStore* msg, bool forFullUpdate, bool zeroZeroBits);
 
 #endif

src/object/client/Util.cpp

@@ -164,8 +164,3 @@ void InitObject(CGObject_C* object, uint32_t time, CClientObjCreate& objCreate)
         }
     }
 }
-
-int32_t SkipPartialObjectUpdate(CDataStore* msg) {
-    // TODO
-    return 0;
-}

src/object/client/Util.hpp

@@ -20,6 +20,4 @@ void HandleObjectOutOfRangePass2(CGObject_C* object);
 
 void InitObject(CGObject_C* object, uint32_t time, CClientObjCreate& objCreate);
 
-int32_t SkipPartialObjectUpdate(CDataStore* msg);
-
 #endif

src/world/Types.hpp

@@ -1,8 +0,0 @@
-#ifndef WORLD_TYPES_HPP
-#define WORLD_TYPES_HPP
-
-#include <cstdint>
-
-typedef uintptr_t HWORLDOBJECT;
-
-#endif

src/world/map/CMap.cpp

@@ -1,7 +1,6 @@
 #include "world/map/CMap.hpp"
 #include <storm/String.hpp>
 
-STORM_EXPLICIT_LIST(CMapBaseObj, m_lameAssLink) CMap::s_entityList;
 char CMap::s_mapName[256];
 char CMap::s_mapPath[256];
 char CMap::s_wdtFilename[256];

src/world/map/CMap.hpp

@@ -1,14 +1,11 @@
 #ifndef WORLD_MAP_C_MAP_HPP
 #define WORLD_MAP_C_MAP_HPP
 
-#include "world/map/CMapBaseObj.hpp"
-#include <storm/List.hpp>
 #include <cstdint>
 
 class CMap {
     public:
         // Static variables
-        static STORM_EXPLICIT_LIST(CMapBaseObj, m_lameAssLink) s_entityList;
         static char s_mapName[];
         static char s_mapPath[];
         static char s_wdtFilename[];

src/world/map/CMapBaseObj.cpp

@@ -1,5 +0,0 @@
-#include "world/map/CMapBaseObj.hpp"
-
-uint32_t CMapBaseObj::GetType() {
-    return this->m_type;
-}

src/world/map/CMapBaseObj.hpp

@@ -1,54 +0,0 @@
-#ifndef WORLD_MAP_C_MAP_BASE_OBJ_HPP
-#define WORLD_MAP_C_MAP_BASE_OBJ_HPP
-
-#include <storm/List.hpp>
-#include <cstdint>
-
-class CM2Lighting;
-class CMapBaseObj;
-
-class CMapBaseObjLink {
-    public:
-        // Member variables
-        uint32_t memHandle;
-        CMapBaseObj* owner;
-        CMapBaseObj* ref;
-        TSLink<CMapBaseObjLink> refLink;
-        TSLink<CMapBaseObjLink> ownerLink;
-};
-
-class CMapBaseObj {
-    public:
-        // Enums
-        enum {
-            Type_BaseObj        = 0x1,
-            Type_Area           = 0x2,
-            Type_Chunk          = 0x4,
-            Type_MapObjDef      = 0x8,
-            Type_MapObjDefGroup = 0x10,
-            Type_Entity         = 0x20,
-            Type_DoodadDef      = 0x40,
-            Type_Light          = 0x80,
-        };
-
-        // Public member variables
-        uint32_t m_memHandle;
-        TSLink<CMapBaseObj> m_lameAssLink;
-        STORM_EXPLICIT_LIST(CMapBaseObjLink, ownerLink) m_parentLinkList;
-
-        // TODO
-
-        // Public virtual member functions
-        virtual ~CMapBaseObj() = default;
-        virtual void SelectLights(CM2Lighting* lighting) {};
-        virtual void SelectUnderwater(CM2Lighting* lighting) {};
-
-        // Public member functions
-        uint32_t GetType();
-
-    protected:
-        // Protected member variables
-        uint16_t m_type = Type_BaseObj;
-};
-
-#endif

src/world/map/CMapEntity.hpp

@@ -1,11 +0,0 @@
-#ifndef WORLD_MAP_C_MAP_ENTITY_HPP
-#define WORLD_MAP_C_MAP_ENTITY_HPP
-
-#include "world/map/CMapStaticEntity.hpp"
-
-class CMapEntity : public CMapStaticEntity {
-    public:
-        // TODO
-};
-
-#endif

src/world/map/CMapStaticEntity.hpp

@@ -1,11 +0,0 @@
-#ifndef WORLD_MAP_C_MAP_STATIC_ENTITY_HPP
-#define WORLD_MAP_C_MAP_STATIC_ENTITY_HPP
-
-#include "world/map/CMapBaseObj.hpp"
-
-class CMapStaticEntity : public CMapBaseObj {
-    public:
-        // TODO
-};
-
-#endif