mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 00:44:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement MxOmni::DoesEntityExist and related (#225)

Browse Source 
* Implement MxOmni::DoesEntityExist and related

* Rename function for consistency
This commit is contained in:
Christian Semmler
2023-10-21 17:23:55 -04:00
committed by GitHub
parent 6931a817a6
commit 5dfb132025
5 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/mxnotificationmanager.h
View File

@@ -50,6 +50,8 @@ public:
void Unregister(MxCore *p_listener); void Unregister(MxCore *p_listener);
MxResult Send(MxCore *p_listener, MxNotificationParam *p_param); MxResult Send(MxCore *p_listener, MxNotificationParam *p_param);
inline MxNotificationPtrList *GetQueue() { return m_queue; }
private: private:
void FlushPending(MxCore *p_listener); void FlushPending(MxCore *p_listener);
}; };

15
LEGO1/mxomni.cpp
View File

@@ -61,22 +61,27 @@ MxResult MxOmni::Start(MxDSAction* p_dsAction)
MxResult result = FAILURE; MxResult result = FAILURE;
if(p_dsAction->GetAtomId().GetInternal() != NULL && p_dsAction->GetObjectId() != -1 && m_streamer != NULL) if(p_dsAction->GetAtomId().GetInternal() != NULL && p_dsAction->GetObjectId() != -1 && m_streamer != NULL)
{ {
result = m_streamer->Unknown100b99b0(p_dsAction); result = m_streamer->FUN_100b99b0(p_dsAction);
} }
return result; return result;
} }
// OFFSET: LEGO1 0x100b00c0 STUB // OFFSET: LEGO1 0x100b00c0 STUB
void MxOmni::DeleteObject(MxDSAction &ds) void MxOmni::DeleteObject(MxDSAction &p_dsAction)
{ {
// TODO // TODO
} }
// OFFSET: LEGO1 0x100b09a0 STUB // OFFSET: LEGO1 0x100b09a0
MxBool MxOmni::DoesEntityExist(MxDSAction &ds) MxBool MxOmni::DoesEntityExist(MxDSAction &p_dsAction)
{ {
// TODO if (m_streamer->FUN_100b9b30(p_dsAction)) {
MxNotificationPtrList *queue = m_notificationManager->GetQueue();
if (!queue || queue->size() == 0)
return TRUE;
}
return FALSE; return FALSE;
} }

4
LEGO1/mxomni.h
View File

@@ -42,8 +42,8 @@ public:
virtual MxResult Create(COMPAT_CONST MxOmniCreateParam &p); // vtable+18 virtual MxResult Create(COMPAT_CONST MxOmniCreateParam &p); // vtable+18
virtual void Destroy(); // vtable+1c virtual void Destroy(); // vtable+1c
virtual MxResult Start(MxDSAction* p_dsAction); // vtable+20 virtual MxResult Start(MxDSAction* p_dsAction); // vtable+20
virtual void DeleteObject(MxDSAction &ds); // vtable+24 virtual void DeleteObject(MxDSAction &p_dsAction); // vtable+24
virtual MxBool DoesEntityExist(MxDSAction &ds); // vtable+28 virtual MxBool DoesEntityExist(MxDSAction &p_dsAction); // vtable+28
virtual void vtable0x2c(); // vtable+2c virtual void vtable0x2c(); // vtable+2c
virtual int vtable0x30(char*, int, MxCore*); // vtable+30 virtual int vtable0x30(char*, int, MxCore*); // vtable+30
virtual void NotifyCurrentEntity(MxNotificationParam *p_param); // vtable+34 virtual void NotifyCurrentEntity(MxNotificationParam *p_param); // vtable+34

11
LEGO1/mxstreamer.cpp
View File

@@ -132,7 +132,7 @@ MxResult MxStreamer::AddStreamControllerToOpenList(MxStreamController *stream)
} }
// OFFSET: LEGO1 0x100b99b0 // OFFSET: LEGO1 0x100b99b0
MxResult MxStreamer::Unknown100b99b0(MxDSAction* p_action) MxResult MxStreamer::FUN_100b99b0(MxDSAction* p_action)
{ {
MxStreamController* controller; MxStreamController* controller;
if (p_action != NULL && p_action->GetAtomId().GetInternal() != NULL && p_action->GetObjectId() != -1) if (p_action != NULL && p_action->GetAtomId().GetInternal() != NULL && p_action->GetObjectId() != -1)
@@ -147,6 +147,15 @@ MxResult MxStreamer::Unknown100b99b0(MxDSAction* p_action)
return FAILURE; return FAILURE;
} }
// OFFSET: LEGO1 0x100b9b30
MxBool MxStreamer::FUN_100b9b30(MxDSObject &p_dsObject)
{
MxStreamController *controller = GetOpenStream(p_dsObject.GetAtomId().GetInternal());
if (controller)
return controller->FUN_100c20d0(p_dsObject);
return TRUE;
}
// OFFSET: LEGO1 0x100b9b60 // OFFSET: LEGO1 0x100b9b60
MxLong MxStreamer::Notify(MxParam &p) MxLong MxStreamer::Notify(MxParam &p)
{ {

6
LEGO1/mxstreamer.h
View File

@@ -7,6 +7,7 @@
#include "mxcore.h" #include "mxcore.h"
#include "mxnotificationparam.h" #include "mxnotificationparam.h"
#include "mxstreamcontroller.h" #include "mxstreamcontroller.h"
#include "mxdsobject.h"
#include "mxtypes.h" #include "mxtypes.h"
// NOTE: This feels like some kind of templated class, maybe something from the // NOTE: This feels like some kind of templated class, maybe something from the
@@ -92,11 +93,10 @@ public:
virtual MxResult Create(); // vtable+0x14 virtual MxResult Create(); // vtable+0x14
MxBool FUN_100b9b30(MxDSObject &p_dsObject);
MxStreamController *GetOpenStream(const char *p_name); MxStreamController *GetOpenStream(const char *p_name);
MxResult AddStreamControllerToOpenList(MxStreamController *p_stream); MxResult AddStreamControllerToOpenList(MxStreamController *p_stream);
MxResult FUN_100b99b0(MxDSAction* p_action);
MxResult MxStreamer::Unknown100b99b0(MxDSAction* p_action);
private: private:
list<MxStreamController *> m_openStreams; // 0x8 list<MxStreamController *> m_openStreams; // 0x8