isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-03-14 00:39:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement LegoOmni::DeleteObject (#501)

Browse source 
* Push changes

* fixes

* Match

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Misha 2024-01-28 17:10:04 -05:00 committed by GitHub
parent 4314d3e297
commit 445084f4b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 69 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
LEGO1/lego/legoomni/include/legoomni.h
View file

@ -105,6 +105,7 @@ public:
LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid);
void AddWorld(LegoWorld* p_world);
void DeleteWorld(LegoWorld* p_world);
void FUN_1005b4f0(MxBool p_disable, MxU16 p_flags);
LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; }

3
LEGO1/lego/legoomni/include/legoworldlist.h
View file

@ -86,4 +86,7 @@ public:
// SYNTHETIC: LEGO1 0x10059be0
// MxPtrList<LegoWorld>::`scalar deleting destructor'
// TEMPLATE: LEGO1 0x1005b740
// MxList<LegoWorld *>::DeleteEntry
#endif // LEGOWORLDLIST_H

70
LEGO1/lego/legoomni/src/main/legoomni.cpp
View file

@ -19,6 +19,7 @@
#include "mxdsfile.h"
#include "mxomnicreateflags.h"
#include "mxomnicreateparam.h"
#include "mxstreamer.h"
#include "mxticklemanager.h"
#include "mxtransitionmanager.h"
@ -605,10 +606,46 @@ void LegoOmni::AddWorld(LegoWorld* p_world)
m_worldList->Append(p_world);
}
// STUB: LEGO1 0x1005af10
void LegoOmni::RemoveWorld(const MxAtomId&, MxLong)
// FUNCTION: LEGO1 0x1005adb0
void LegoOmni::DeleteWorld(LegoWorld* p_world)
{
// TODO
if (m_worldList) {
LegoWorldListCursor cursor(m_worldList);
if (cursor.Find(p_world)) {
cursor.Detach();
if (m_currentWorld == p_world) {
m_currentWorld = NULL;
}
delete p_world;
}
}
}
// FUNCTION: LEGO1 0x1005af10
void LegoOmni::RemoveWorld(const MxAtomId& p_atom, MxLong p_objectId)
{
if (m_worldList) {
LegoWorldListCursor a(m_worldList);
LegoWorldListCursor b(m_worldList);
LegoWorld* world;
a.Head();
while (a.Current(world)) {
b = a;
b.Next();
if ((p_objectId == -1 || world->GetEntityId() == p_objectId) &&
(!p_atom.GetInternal() || world->GetAtom() == p_atom)) {
a.Detach();
delete world;
}
a = b;
}
}
}
// FUNCTION: LEGO1 0x1005b0c0
@ -628,10 +665,33 @@ LegoWorld* LegoOmni::FindWorld(const MxAtomId& p_atom, MxS32 p_entityid)
return NULL;
}
// STUB: LEGO1 0x1005b1d0
// FUNCTION: LEGO1 0x1005b1d0
void LegoOmni::DeleteObject(MxDSAction& p_dsAction)
{
// TODO
if (p_dsAction.GetAtomId().GetInternal() != NULL) {
LegoWorld* world = FindWorld(p_dsAction.GetAtomId(), p_dsAction.GetObjectId());
if (world) {
DeleteWorld(world);
return;
}
if (m_currentWorld != NULL) {
MxCore* entity = m_currentWorld->Find(p_dsAction.GetAtomId(), p_dsAction.GetObjectId());
if (entity) {
m_currentWorld->Remove(entity);
if (entity->IsA("MxPresenter")) {
Streamer()->FUN_100b98f0(((MxPresenter*) entity)->GetAction());
((MxPresenter*) entity)->EndAction();
}
else {
delete entity;
}
return;
}
}
}
MxOmni::DeleteObject(p_dsAction);
}
// FUNCTION: LEGO1 0x1005b2f0