Merge 4a102c6ace into 8a062e5631

src/client/Client.cpp

@@ -520,9 +520,8 @@ void WowClientDestroy() {
 }
 
 void WowClientInit() {
-    EventRegister(EVENT_ID_TICK, reinterpret_cast<EVENTHANDLERFUNC>(&CWorld::OnTick));
-
     // TODO
+    // EventRegister(EVENT_ID_5, (int)sub_4020E0);
     // _cfltcvt_init_0();
 
     ClientRegisterConsoleCommands();

src/event/Scheduler.cpp

@@ -286,10 +286,12 @@ int32_t SchedulerThreadProcProcess(uint32_t a1) {
             }
         }
 
-        float elapsedSec = (currTime - context->m_schedLastIdle) * 0.001;
+        uint32_t v9 = (currTime - context->m_schedLastIdle);
         context->m_schedLastIdle = currTime;
+        double elapsedSec = v9 * 0.001;
 
-        SynthesizeTick(context, currTime, elapsedSec);
+        // TODO
+        // FrameTime::Update(currTime, elapsedSec);
 
         IEvtTimerDispatch(context);
 

src/event/Synthesize.cpp

@@ -91,17 +91,3 @@ void SynthesizePoll(EvtContext* context) {
 
     IEvtQueueDispatch(context, EVENT_ID_POLL, nullptr);
 }
-
-void SynthesizeTick(EvtContext* context, uint32_t currTime, float elapsedSec) {
-    context->m_critsect.Enter();
-    bool closed = context->m_schedState == EvtContext::SCHEDSTATE_CLOSED;
-    context->m_critsect.Leave();
-
-    if (closed) {
-        return;
-    }
-
-    EVENT_DATA_TICK data = { elapsedSec, currTime };
-
-    IEvtQueueDispatch(context, EVENT_ID_TICK, &data);
-}

src/event/Synthesize.hpp

@@ -15,6 +15,4 @@ void SynthesizePaint(EvtContext* context);
 
 void SynthesizePoll(EvtContext* context);
 
-void SynthesizeTick(EvtContext* context, uint32_t currTime, float elapsedSec);
-
 #endif

src/event/Types.hpp

@@ -12,7 +12,7 @@ enum EVENTID {
     EVENT_ID_FOCUS              = 2,
     EVENT_ID_CLOSE              = 3,
     EVENT_ID_DESTROY            = 4,
-    EVENT_ID_TICK               = 5,
+    EVENT_ID_5                  = 5,
     EVENT_ID_IDLE               = 6,
     EVENT_ID_POLL               = 7,
     EVENT_ID_INITIALIZE         = 8,
@@ -259,9 +259,4 @@ struct EVENT_DATA_SIZE {
     int32_t h;
 };
 
-struct EVENT_DATA_TICK {
-    float tickTimeSec;
-    uint32_t curTimeMs;
-};
-
 #endif

src/object/Types.hpp

@@ -72,12 +72,6 @@ enum OBJECT_TYPE_ID {
     // TODO
 };
 
-enum OUT_OF_RANGE_TYPE {
-    OUT_OF_RANGE_0      = 0,
-    OUT_OF_RANGE_1      = 1,
-    OUT_OF_RANGE_2      = 2,
-};
-
 enum SHEATHE_TYPE {
     SHEATHE_0           = 0,
     SHEATHE_1           = 1,

src/object/client/CGObject_C.cpp

@@ -1,19 +1,9 @@
 #include "object/client/CGObject_C.hpp"
 #include "object/client/ObjMgr.hpp"
-#include "world/World.hpp"
 
 CGObject_C::CGObject_C(uint32_t time, CClientObjCreate& objCreate) {
     // TODO
 
-    this->m_lockCount = 0;
-    this->m_disabled = false;
-    this->m_inReenable = false;
-    this->m_postInited = false;
-    this->m_flag19 = false;
-    this->m_disablePending = false;
-
-    // TODO
-
     ClntObjMgrLinkInNewObject(this);
 
     // TODO
@@ -23,27 +13,7 @@ void CGObject_C::AddWorldObject() {
     // TODO
 }
 
-void CGObject_C::Disable() {
-    // TODO
-
-    this->m_disabled = true;
-    // TODO other flag manipulation
-
-    this->m_disableTimeMs = CWorld::GetCurTimeMs();
-}
-
-int32_t CGObject_C::IsInReenable() {
-    return this->m_inReenable;
-}
-
-int32_t CGObject_C::IsObjectLocked() {
-    return this->m_lockCount != 0;
-}
-
 void CGObject_C::Reenable() {
-    this->m_disabled = false;
-    this->m_inReenable = true;
-
     // TODO
 }
 
@@ -53,23 +23,7 @@ void CGObject_C::SetBlock(uint32_t block, uint32_t value) {
 }
 
 void CGObject_C::SetDisablePending(int32_t pending) {
-    if (pending) {
-        this->m_disablePending = true;
-    } else {
-        this->m_disablePending = false;
-    }
-}
-
-void CGObject_C::SetObjectLocked(int32_t locked) {
-    if (locked) {
-        if (this->m_lockCount != 0xFFFF) {
-            this->m_lockCount++;
-        }
-    } else {
-        if (this->m_lockCount != 0) {
-            this->m_lockCount--;
-        }
-    }
+    // TODO
 }
 
 void CGObject_C::SetStorage(uint32_t* storage, uint32_t* saved) {

src/object/client/CGObject_C.hpp

@@ -12,33 +12,14 @@ class CGObject_C : public CGObject, public TSHashObject<CGObject_C, CHashKeyGUID
     public:
         // Public member variables
         TSLink<CGObject_C> m_link;
-        uint32_t m_disableTimeMs;
-        // TODO
-        uint32_t m_lockCount        : 16;
-        uint32_t m_disabled         : 1;
-        uint32_t m_inReenable       : 1;
-        uint32_t m_postInited       : 1;
-        uint32_t m_flag19           : 1;
-        uint32_t m_disablePending   : 1;
-        // TODO
-
-        // Virtual public member functions
-        // TODO
-        virtual void Disable();
-        // TODO
-        virtual void HandleOutOfRange(OUT_OF_RANGE_TYPE type) {};
-        // TODO
 
         // Public member functions
         CGObject_C() = default;
         CGObject_C(uint32_t time, CClientObjCreate& objCreate);
         void AddWorldObject();
-        int32_t IsInReenable();
-        int32_t IsObjectLocked();
         void Reenable();
         void SetBlock(uint32_t block, uint32_t value);
         void SetDisablePending(int32_t pending);
-        void SetObjectLocked(int32_t locked);
         void SetStorage(uint32_t* storage, uint32_t* saved);
         void SetTypeID(OBJECT_TYPE_ID typeID);
 };

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;
-        STORM_EXPLICIT_LIST(CGObject_C, m_link) m_lazyCleanupFifo[NUM_CLIENT_OBJECT_TYPES - 1];
+        // TODO
         STORM_EXPLICIT_LIST(CGObject_C, m_link) m_visibleObjects;
         STORM_EXPLICIT_LIST(CGObject_C, m_link) m_reenabledObjects;
         // TODO

src/object/client/MessageHandlers.cpp

@@ -34,65 +34,22 @@ int32_t SkipPartialObjectUpdate(CDataStore* msg) {
 }
 
 void UpdateOutOfRangeObjects(CDataStore* msg) {
-    uint32_t count;
-    msg->Get(count);
-
-    // TODO CVehiclePassenger_C::StartAddingPendingRescueTransitions();
-
-    auto startPos = msg->Tell();
-
-    // Pass 1
-
-    for (int32_t i = 0; i < count; i++) {
-        SmartGUID guid;
-        *msg >> guid;
-
-        if (guid == ClntObjMgrGetActivePlayer()) {
-            continue;
-        }
-
-        auto object = FindActiveObject(guid);
-
-        if (object) {
-            HandleObjectOutOfRangePass1(object, OUT_OF_RANGE_0);
-        }
-    }
-
-    msg->Seek(startPos);
-
-    // Pass 2
-
-    for (int32_t i = 0; i < count; i++) {
-        SmartGUID guid;
-        *msg >> guid;
-
-        if (guid == ClntObjMgrGetActivePlayer()) {
-            continue;
-        }
-
-        auto object = FindActiveObject(guid);
-
-        if (object && !object->IsObjectLocked()) {
-            HandleObjectOutOfRangePass2(object);
-        }
-    }
-
-    // TODO CVehiclePassenger_C::ExecutePendingRescueTransitions();
+    WHOA_UNIMPLEMENTED();
 }
 
 int32_t UpdateObject(CDataStore* msg) {
     SmartGUID guid;
     *msg >> guid;
 
-    int32_t reenable;
-    auto object = GetUpdateObject(guid, &reenable);
+    int32_t reenabled;
+    auto object = GetUpdateObject(guid, &reenabled);
 
     if (object) {
         if (!FillInPartialObjectData(object, object->m_obj->m_guid, msg, false, false)) {
             return 0;
         }
 
-        if (reenable) {
+        if (reenabled) {
             object->Reenable();
         }
 
@@ -210,8 +167,8 @@ int32_t CreateObject(CDataStore* msg, uint32_t time) {
     msg->Get(_typeID);
     auto typeID = static_cast<OBJECT_TYPE_ID>(_typeID);
 
-    int32_t reenable;
-    auto existingObject = GetUpdateObject(guid, &reenable);
+    int32_t reenabled;
+    auto existingObject = GetUpdateObject(guid, &reenabled);
 
     if (existingObject) {
         CClientObjCreate::Skip(msg);
@@ -220,7 +177,7 @@ int32_t CreateObject(CDataStore* msg, uint32_t time) {
             return 0;
         }
 
-        if (reenable) {
+        if (reenabled) {
             existingObject->Reenable();
         }
 
@@ -236,7 +193,7 @@ int32_t CreateObject(CDataStore* msg, uint32_t time) {
         ClntObjMgrSetActivePlayer(guid);
     }
 
-    auto newObject = ClntObjMgrAllocObject(typeID, guid);
+    auto newObject = static_cast<CGObject_C*>(ClntObjMgrAllocObject(typeID, guid));
 
     SetupObjectStorage(typeID, newObject, guid);
 
@@ -262,10 +219,10 @@ void UpdateInRangeObjects(CDataStore* msg) {
         *msg >> guid;
 
         if (guid != ClntObjMgrGetActivePlayer()) {
-            int32_t reenable;
-            auto object = GetUpdateObject(guid, &reenable);
+            int32_t reenabled;
+            auto object = GetUpdateObject(guid, &reenabled);
 
-            if (object && reenable) {
+            if (object && reenabled) {
                 object->Reenable();
             }
         }
@@ -411,21 +368,5 @@ int32_t ObjectUpdateHandler(void* param, NETMESSAGE msgId, uint32_t time, CDataS
 }
 
 int32_t OnObjectDestroy(void* param, NETMESSAGE msgId, uint32_t time, CDataStore* msg) {
-    WOWGUID guid;
-    msg->Get(guid);
-
-    uint8_t dead;
-    msg->Get(dead);
-
-    auto object = FindActiveObject(guid);
-
-    if (object) {
-        // TODO handle unit death
-
-        if (HandleObjectOutOfRangePass1(object, OUT_OF_RANGE_1)) {
-            HandleObjectOutOfRangePass2(object);
-        }
-    }
-
-    return 1;
+    WHOA_UNIMPLEMENTED(0);
 }

src/object/client/ObjMgr.cpp

@@ -67,12 +67,12 @@ void MirrorInitialize() {
     // TODO
 }
 
-CGObject_C* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid) {
+void* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid) {
     auto playerGUID = ClntObjMgrGetActivePlayer();
 
     // Heap allocate player object for current player
     if (guid == playerGUID) {
-        return static_cast<CGObject_C*>(STORM_ALLOC(sizeof(CGPlayer_C) + CGPlayer::GetDataSize() + CGPlayer::GetDataSizeSaved()));
+        return STORM_ALLOC(sizeof(CGPlayer_C) + CGPlayer::GetDataSize() + CGPlayer::GetDataSizeSaved());
     }
 
     // TODO GarbageCollect(typeID, 10000);
@@ -85,10 +85,9 @@ CGObject_C* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid) {
     }
 
     // TODO pointer should be fetched via ObjectPtr
-    auto object = static_cast<CGObject_C*>(mem);
-    object->m_memHandle = memHandle;
+    static_cast<CGObject_C*>(mem)->m_memHandle = memHandle;
 
-    return object;
+    return mem;
 }
 
 WOWGUID ClntObjMgrGetActivePlayer() {

src/object/client/ObjMgr.hpp

@@ -6,7 +6,7 @@
 #include "object/Types.hpp"
 #include <cstdint>
 
-CGObject_C* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid);
+void* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid);
 
 WOWGUID ClntObjMgrGetActivePlayer();
 

src/object/client/Util.cpp

@@ -14,8 +14,8 @@ CGObject_C* FindActiveObject(WOWGUID guid) {
     return ClntObjMgrGetCurrent()->m_objects.Ptr(guid, CHashKeyGUID(guid));
 }
 
-CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenable) {
-    *reenable = false;
+CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenabled) {
+    *reenabled = false;
 
     // Active object
 
@@ -44,7 +44,7 @@ CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenable) {
             !ClntObjMgrGetCurrent()->m_visibleObjects.IsLinked(disabledObject)
             && !ClntObjMgrGetCurrent()->m_reenabledObjects.IsLinked(disabledObject)
         ) {
-            *reenable = true;
+            *reenabled = true;
             ClntObjMgrGetCurrent()->m_reenabledObjects.LinkToTail(disabledObject);
         }
 
@@ -56,36 +56,6 @@ CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenable) {
     return nullptr;
 }
 
-int32_t HandleObjectOutOfRangePass1(CGObject_C* object, OUT_OF_RANGE_TYPE type) {
-    // TODO arena unit out of range handling
-
-    object->HandleOutOfRange(type);
-
-    if (object->IsObjectLocked()) {
-        object->SetDisablePending(true);
-
-        return false;
-    }
-
-    object->SetDisablePending(false);
-    object->Disable();
-
-    return true;
-}
-
-void HandleObjectOutOfRangePass2(CGObject_C* object) {
-    // TODO ClearObjectMirrorHandlers(object);
-
-    ClntObjMgrGetCurrent()->m_objects.Unlink(object);
-
-    if (ClntObjMgrGetCurrent()->m_visibleObjects.IsLinked(object)) {
-        ClntObjMgrGetCurrent()->m_visibleObjects.UnlinkNode(object);
-    }
-
-    ClntObjMgrGetCurrent()->m_lazyCleanupObjects.Insert(object, object->m_hashval, CHashKeyGUID(object->m_key));
-    ClntObjMgrGetCurrent()->m_lazyCleanupFifo[object->m_typeID - 1].LinkToTail(object);
-}
-
 void InitObject(CGObject_C* object, uint32_t time, CClientObjCreate& objCreate) {
     switch (object->m_typeID) {
         case ID_ITEM: {

src/object/client/Util.hpp

@@ -1,7 +1,6 @@
 #ifndef OBJECT_CLIENT_UTIL_HPP
 #define OBJECT_CLIENT_UTIL_HPP
 
-#include "object/Types.hpp"
 #include "util/GUID.hpp"
 #include <cstdint>
 
@@ -10,11 +9,7 @@ class CGObject_C;
 
 CGObject_C* FindActiveObject(WOWGUID guid);
 
-CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenable);
-
-int32_t HandleObjectOutOfRangePass1(CGObject_C* object, OUT_OF_RANGE_TYPE type);
-
-void HandleObjectOutOfRangePass2(CGObject_C* object);
+CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenabled);
 
 void InitObject(CGObject_C* object, uint32_t time, CClientObjCreate& objCreate);
 

src/world/CWorld.cpp

@@ -6,49 +6,10 @@
 #include "world/Weather.hpp"
 #include <storm/Memory.hpp>
 
-uint32_t CWorld::s_curTimeMs;
-float CWorld::s_curTimeSec;
 uint32_t CWorld::s_enables;
 uint32_t CWorld::s_enables2;
-uint32_t CWorld::s_gameTimeFixed;
-float CWorld::s_gameTimeSec;
-uint32_t CWorld::s_tickTimeFixed;
-uint32_t CWorld::s_tickTimeMs;
-float CWorld::s_tickTimeSec;
 Weather* CWorld::s_weather;
 
-uint32_t CWorld::GetCurTimeMs() {
-    return CWorld::s_curTimeMs;
-}
-
-float CWorld::GetCurTimeSec() {
-    return CWorld::s_curTimeSec;
-}
-
-uint32_t CWorld::GetFixedPrecisionTime(float timeSec) {
-    return static_cast<uint32_t>(timeSec * 1024.0f);
-}
-
-uint32_t CWorld::GetGameTimeFixed() {
-    return CWorld::s_gameTimeFixed;
-}
-
-float CWorld::GetGameTimeSec() {
-    return CWorld::s_gameTimeSec;
-}
-
-uint32_t CWorld::GetTickTimeFixed() {
-    return CWorld::s_tickTimeFixed;
-}
-
-uint32_t CWorld::GetTickTimeMs() {
-    return CWorld::s_tickTimeMs;
-}
-
-float CWorld::GetTickTimeSec() {
-    return CWorld::s_tickTimeSec;
-}
-
 void CWorld::Initialize() {
     CWorld::s_enables |=
           Enables::Enable_1
@@ -65,9 +26,6 @@ void CWorld::Initialize() {
         | Enables::Enable_Particulates
         | Enables::Enable_LowDetail;
 
-    CWorld::s_gameTimeFixed = 0;
-    CWorld::s_gameTimeSec = 0.0f;
-
     // TODO
 
     if (GxCaps().m_shaderTargets[GxSh_Pixel] > GxShPS_none) {
@@ -100,23 +58,3 @@ void CWorld::LoadMap(const char* mapName, const C3Vector& position, int32_t zone
 
     // TODO
 }
-
-int32_t CWorld::OnTick(const EVENT_DATA_TICK* data, void* param) {
-    CWorld::SetUpdateTime(data->tickTimeSec, data->curTimeMs);
-
-    return 1;
-}
-
-void CWorld::SetUpdateTime(float tickTimeSec, uint32_t curTimeMs) {
-    auto tickTimeFixed = CWorld::GetFixedPrecisionTime(tickTimeSec);
-
-    CWorld::s_curTimeMs = curTimeMs;
-    CWorld::s_curTimeSec = static_cast<float>(curTimeMs) * 0.001f;
-
-    CWorld::s_gameTimeFixed += tickTimeFixed;
-    CWorld::s_gameTimeSec += tickTimeSec;
-
-    CWorld::s_tickTimeFixed = tickTimeFixed;
-    CWorld::s_tickTimeMs = static_cast<uint32_t>(tickTimeSec * 1000.0f);
-    CWorld::s_tickTimeSec = tickTimeSec;
-}

src/world/CWorld.hpp

@@ -1,7 +1,6 @@
 #ifndef WORLD_C_WORLD_HPP
 #define WORLD_C_WORLD_HPP
 
-#include "event/Event.hpp"
 #include <tempest/Vector.hpp>
 #include <cstdint>
 
@@ -45,36 +44,14 @@ class CWorld {
             Enable_HwPcf = 0x2
         };
 
-        // Public static variables
+        // Static variables
         static uint32_t s_enables;
         static uint32_t s_enables2;
         static Weather* s_weather;
 
-        // Public static functions
-        static uint32_t GetCurTimeMs();
-        static float GetCurTimeSec();
-        static uint32_t GetGameTimeFixed();
-        static float GetGameTimeSec();
-        static uint32_t GetTickTimeFixed();
-        static uint32_t GetTickTimeMs();
-        static float GetTickTimeSec();
-        static void Initialize();
+        // Static functions
+        static void Initialize(void);
         static void LoadMap(const char* mapName, const C3Vector& position, int32_t zoneID);
-        static int32_t OnTick(const EVENT_DATA_TICK* data, void* param);
-        static void SetUpdateTime(float tickTimeSec, uint32_t curTimeMs);
-
-    private:
-        // Private static variables
-        static uint32_t s_curTimeMs;
-        static float s_curTimeSec;
-        static uint32_t s_gameTimeFixed;
-        static float s_gameTimeSec;
-        static uint32_t s_tickTimeFixed;
-        static uint32_t s_tickTimeMs;
-        static float s_tickTimeSec;
-
-        // Private static functions
-        static uint32_t GetFixedPrecisionTime(float timeSec);
 };
 
 #endif