isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-26 17:36:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refine MxObjectFactory (#205)

Browse source 
* Refine MxObjectFactory

* Change interface of Destroy

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Andrew Gutekanst 2023-10-14 08:59:06 -04:00 committed by GitHub
parent a24a798c82
commit c66b6aa123
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LEGO1/legoobjectfactory.cpp
View file

@ -29,7 +29,7 @@ MxCore *LegoObjectFactory::Create(const char *p_name)
}
// OFFSET: LEGO1 0x1000fb30 STUB
void LegoObjectFactory::Destroy(void *p_object)
void LegoObjectFactory::Destroy(MxCore *p_object)
{
// TODO
}

2
LEGO1/legoobjectfactory.h
View file

@ -12,7 +12,7 @@ class LegoObjectFactory : public MxObjectFactory
public:
LegoObjectFactory();
virtual MxCore *Create(const char *p_name) override; // vtable 0x14
virtual void Destroy(void *p_object) override; // vtable 0x18
virtual void Destroy(MxCore *p_object) override; // vtable 0x18
private:
#define X(V) MxAtomId m_id##V;
FOR_LEGOOBJECTFACTORY_OBJECTS(X)

18
LEGO1/mxobjectfactory.cpp
View file

@ -29,17 +29,19 @@ MxObjectFactory::MxObjectFactory()
MxCore *MxObjectFactory::Create(const char *p_name)
{
MxAtomId atom(p_name, LookupMode_Exact);
MxCore* object = NULL;
if (0) {
#define X(V) } else if (this->m_id##V == atom) { return new V;
if (0) {}
#define X(V) else if (this->m_id##V == atom) { object = new V; }
FOR_MXOBJECTFACTORY_OBJECTS(X)
#undef X
} else {
return NULL;
}
else {}
return object;
}
// OFFSET: LEGO1 0x100b1a30 STUB
void MxObjectFactory::Destroy(void *p_object) {
// FIXME
// OFFSET: LEGO1 0x100b1a30
void MxObjectFactory::Destroy(MxCore *p_object)
{
delete p_object;
}

2
LEGO1/mxobjectfactory.h
View file

@ -38,7 +38,7 @@ class MxObjectFactory : public MxCore
}
virtual MxCore *Create(const char *p_name); // vtable 0x14
virtual void Destroy(void *p_object); // vtable 0x18
virtual void Destroy(MxCore *p_object); // vtable 0x18
private:
#define X(V) MxAtomId m_id##V;
FOR_MXOBJECTFACTORY_OBJECTS(X)