Fixes, improvements

This commit is contained in:
Christian Semmler 2023-10-08 16:35:24 -04:00
parent 8aa9f14cf2
commit dbe444d04f
6 changed files with 12 additions and 13 deletions

View File

@ -11,7 +11,7 @@ MxResult MxRAMStreamController::Open(const char *p_filename)
} }
// OFFSET: LEGO1 0x100c6210 STUB // OFFSET: LEGO1 0x100c6210 STUB
MxResult MxRAMStreamController::vtable0x20(MxDSAction* action) MxResult MxRAMStreamController::vtable0x20(MxDSAction* p_action)
{ {
// TODO STUB // TODO STUB
return FAILURE; return FAILURE;

View File

@ -25,7 +25,7 @@ class MxRAMStreamController : public MxStreamController
} }
virtual MxResult Open(const char *p_filename) override; virtual MxResult Open(const char *p_filename) override;
virtual MxResult vtable0x20(MxDSAction* action) override; virtual MxResult vtable0x20(MxDSAction* p_action) override;
virtual MxResult vtable0x24(undefined4 p_unknown) override; virtual MxResult vtable0x24(undefined4 p_unknown) override;
private: private:

View File

@ -8,12 +8,14 @@ class MxRAMStreamProvider : public MxStreamProvider
{ {
public: public:
MxRAMStreamProvider(); MxRAMStreamProvider();
~MxRAMStreamProvider() override; virtual ~MxRAMStreamProvider() override;
virtual MxResult SetResourceToGet(void* p_resource) override; //vtable+0x14 virtual MxResult SetResourceToGet(void* p_resource) override; //vtable+0x14
virtual MxU32 GetFileSize() override; //vtable+0x18 virtual MxU32 GetFileSize() override; //vtable+0x18
virtual MxU32 vtable0x1C() override; //vtable+0x1c virtual MxU32 vtable0x1C() override; //vtable+0x1c
virtual MxU32 GetLengthInDWords() override; //vtable+0x24 virtual MxU32 GetLengthInDWords() override; //vtable+0x24
virtual void* GetBufferForDWords() override; //vtable+0x28 virtual void* GetBufferForDWords() override; //vtable+0x28
protected: protected:
MxU32 m_bufferSize; MxU32 m_bufferSize;
MxU32 m_fileSize; MxU32 m_fileSize;

View File

@ -46,7 +46,7 @@ MxResult MxStreamController::vtable0x1C(undefined4 p_unknown, undefined4 p_unkno
} }
// OFFSET: LEGO1 0x100c1690 STUB // OFFSET: LEGO1 0x100c1690 STUB
MxResult MxStreamController::vtable0x20(MxDSAction* action) MxResult MxStreamController::vtable0x20(MxDSAction* p_action)
{ {
// TODO STUB // TODO STUB
return FAILURE; return FAILURE;

View File

@ -7,7 +7,6 @@
#include "mxcore.h" #include "mxcore.h"
#include "mxdsobject.h" #include "mxdsobject.h"
#include "mxdsaction.h" #include "mxdsaction.h"
#include "mxstreamprovider.h"
// VTABLE 0x100dc968 // VTABLE 0x100dc968
// SIZE 0x64 // SIZE 0x64
@ -34,7 +33,7 @@ class MxStreamController : public MxCore
virtual MxResult Open(const char *p_filename); // vtable+0x14 virtual MxResult Open(const char *p_filename); // vtable+0x14
virtual MxResult vtable0x18(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x18 virtual MxResult vtable0x18(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x18
virtual MxResult vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x1c virtual MxResult vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2); //vtable+0x1c
virtual MxResult vtable0x20(MxDSAction* action); //vtable+0x20 virtual MxResult vtable0x20(MxDSAction* p_action); //vtable+0x20
virtual MxResult vtable0x24(undefined4 p_unknown); //vtable+0x24 virtual MxResult vtable0x24(undefined4 p_unknown); //vtable+0x24
virtual MxResult vtable0x28(); //vtable+0x28 virtual MxResult vtable0x28(); //vtable+0x28
virtual MxResult vtable0x2c(undefined4 p_unknown1, undefined4 p_unknow2); //vtable+0x2c virtual MxResult vtable0x2c(undefined4 p_unknown1, undefined4 p_unknow2); //vtable+0x2c
@ -42,12 +41,12 @@ class MxStreamController : public MxCore
MxBool FUN_100c20d0(MxDSObject &p_obj); MxBool FUN_100c20d0(MxDSObject &p_obj);
inline MxAtomId GetAtom() const { return atom; }; inline MxAtomId &GetAtom() { return atom; };
protected: protected:
MxCriticalSection m_criticalSection; MxCriticalSection m_criticalSection;
MxAtomId atom; MxAtomId atom;
MxStreamProvider* m_provider; undefined4 m_unk28; // MxStreamProvider*
int m_unk2c; undefined4 m_unk2c;
undefined m_unk30[0x34]; undefined m_unk30[0x34];
}; };

View File

@ -6,13 +6,11 @@
#include "mxdsfile.h" #include "mxdsfile.h"
// VTABLE 0x100dd100 // VTABLE 0x100dd100
// SIZE 0x10
class MxStreamProvider : public MxCore class MxStreamProvider : public MxCore
{ {
public: public:
inline MxStreamProvider() { inline MxStreamProvider() : m_pLookup(NULL), m_pFile(NULL) {}
this->m_pLookup = NULL;
this->m_pFile = NULL;
}
// OFFSET: LEGO1 0x100d07e0 // OFFSET: LEGO1 0x100d07e0
inline virtual const char *ClassName() const override // vtable+0x0c inline virtual const char *ClassName() const override // vtable+0x0c