diff --git a/Source/Utility/Async/NAsyncWorkThread.cpp b/Source/Utility/Async/NAsyncWorkThread.cpp index 1d5c0f20..65679cf5 100644 --- a/Source/Utility/Async/NAsyncWorkThread.cpp +++ b/Source/Utility/Async/NAsyncWorkThread.cpp @@ -17,14 +17,14 @@ NAsyncWorkThread::~NAsyncWorkThread() { // OFFSET: 0x00732C40 // FUNCTION: fn_07584 -void NAsyncWorkThread::Receive(std::uint64_t argument, std::uint32_t id) { - this->m_messages.Push(argument, id); +void NAsyncWorkThread::Receive(std::uint32_t argumentLow, std::uint32_t argumentHigh, std::uint32_t id) { + this->m_messages.Push(argumentLow, argumentHigh, id); } // OFFSET: 0x00732C20 // FUNCTION: fn_07583 void NAsyncWorkThread::RequestStop() { - this->m_messages.Push(0x50000, 0); + this->m_messages.Push(0x50000, 0, 0); } // OFFSET: 0x00732C50 diff --git a/Source/Utility/Async/NAsyncWorkThread.h b/Source/Utility/Async/NAsyncWorkThread.h index d32be306..7fb70387 100644 --- a/Source/Utility/Async/NAsyncWorkThread.h +++ b/Source/Utility/Async/NAsyncWorkThread.h @@ -13,7 +13,7 @@ class NAsyncWorkThread : public NObject, public NInter, public NThread { public: NAsyncWorkThread(NAsyncWorkRequestQueue* requests, NAsyncWorkResponseQueue* responses); ~NAsyncWorkThread() override; - void Receive(std::uint64_t argument, std::uint32_t id) override; + void Receive(std::uint32_t argumentLow, std::uint32_t argumentHigh, std::uint32_t id) override; unsigned Run() override; void RequestStop() override; bool Start(); diff --git a/Source/Utility/Async/NMessageMgr.cpp b/Source/Utility/Async/NMessageMgr.cpp index f7f04110..101c4f0c 100644 --- a/Source/Utility/Async/NMessageMgr.cpp +++ b/Source/Utility/Async/NMessageMgr.cpp @@ -55,14 +55,14 @@ bool NMessageMgr::Register(std::uint32_t objectId, NInter* object) { // OFFSET: 0x00735BC0 // FUNCTION: fn_07613 -bool NMessageMgr::Send(std::uint32_t objectId, std::uint64_t argument, std::uint32_t id) { +bool NMessageMgr::Send(std::uint32_t objectId, std::uint32_t argumentLow, std::uint32_t argumentHigh, std::uint32_t id) { NSyncObject held(&this->m_criticalSection); auto object = this->m_objects.find(objectId); if (object == this->m_objects.end()) { return false; } - object->second->Receive(argument, id); + object->second->Receive(argumentLow, argumentHigh, id); return true; } diff --git a/Source/Utility/Async/NMessageMgr.h b/Source/Utility/Async/NMessageMgr.h index 8a86a48a..9874b1fc 100644 --- a/Source/Utility/Async/NMessageMgr.h +++ b/Source/Utility/Async/NMessageMgr.h @@ -7,7 +7,7 @@ class NInter { public: - virtual void Receive(std::uint64_t argument, std::uint32_t id) = 0; + virtual void Receive(std::uint32_t argumentLow, std::uint32_t argumentHigh, std::uint32_t id) = 0; virtual ~NInter(); }; @@ -19,7 +19,7 @@ public: static bool Initialize(); static void Shutdown(); bool Register(std::uint32_t objectId, NInter* object); - bool Send(std::uint32_t objectId, std::uint64_t argument, std::uint32_t id); + bool Send(std::uint32_t objectId, std::uint32_t argumentLow, std::uint32_t argumentHigh, std::uint32_t id); void Unregister(std::uint32_t objectId, NInter* object); protected: diff --git a/Source/Utility/Async/NMessageQueue.cpp b/Source/Utility/Async/NMessageQueue.cpp index 496523e3..a2343a3e 100644 --- a/Source/Utility/Async/NMessageQueue.cpp +++ b/Source/Utility/Async/NMessageQueue.cpp @@ -38,9 +38,9 @@ NMessage NMessageQueue::Pop() { // OFFSET: 0x00736660 // FUNCTION: fn_07624 -void NMessageQueue::Push(std::uint64_t argument, std::uint32_t id) { +void NMessageQueue::Push(std::uint32_t argumentLow, std::uint32_t argumentHigh, std::uint32_t id) { NSyncObject held(&this->m_criticalSection); - this->m_messages.push_back({static_cast(argument), static_cast(argument >> 32), id}); + this->m_messages.push_back({argumentLow, argumentHigh, id}); ReleaseSemaphore(this->m_semaphore, 1, nullptr); } diff --git a/Source/Utility/Async/NMessageQueue.h b/Source/Utility/Async/NMessageQueue.h index 9575a64f..6c3b107f 100644 --- a/Source/Utility/Async/NMessageQueue.h +++ b/Source/Utility/Async/NMessageQueue.h @@ -28,7 +28,7 @@ public: virtual ~NMessageQueue(); NMessage Pop(); - void Push(std::uint64_t argument, std::uint32_t id); + void Push(std::uint32_t argumentLow, std::uint32_t argumentHigh, std::uint32_t id); void Clear(); protected: