isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-02-02 13:11:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Other fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-02-27 14:52:55 -05:00
parent 4c6b8182c3
commit 49ace87e91
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
LEGO1/lego/sources/misc/legostorage.h
View File

@ -20,18 +20,18 @@ class LegoStorage {
LegoStorage() : m_mode(0) {} LegoStorage() : m_mode(0) {}
// FUNCTION: LEGO1 0x10045ad0 // FUNCTION: LEGO1 0x10045ad0
virtual ~LegoStorage() {} // 0x00 virtual ~LegoStorage() {}
virtual LegoResult Read(void* p_buffer, LegoU32 p_size) = 0; // 0x04 virtual LegoResult Read(void* p_buffer, LegoU32 p_size) = 0; // vtable+0x04
virtual LegoResult Write(const void* p_buffer, LegoU32 p_size) = 0; // 0x08 virtual LegoResult Write(const void* p_buffer, LegoU32 p_size) = 0; // vtable+0x08
virtual LegoResult GetPosition(LegoU32& p_position) = 0; // 0x0c virtual LegoResult GetPosition(LegoU32& p_position) = 0; // vtable+0x0c
virtual LegoResult SetPosition(LegoU32 p_position) = 0; // 0x10 virtual LegoResult SetPosition(LegoU32 p_position) = 0; // vtable+0x10
// FUNCTION: LEGO1 0x10045ae0 // FUNCTION: LEGO1 0x10045ae0
virtual LegoBool IsWriteMode() { return m_mode == c_write; } // 0x14 virtual LegoBool IsWriteMode() { return m_mode == c_write; } // vtable+0x14
// FUNCTION: LEGO1 0x10045af0 // FUNCTION: LEGO1 0x10045af0
virtual LegoBool IsReadMode() { return m_mode == c_read; } // 0x14 virtual LegoBool IsReadMode() { return m_mode == c_read; } // vtable+0x18
// SYNTHETIC: LEGO1 0x10045b00 // SYNTHETIC: LEGO1 0x10045b00
// LegoStorage::`scalar deleting destructor' // LegoStorage::`scalar deleting destructor'
@ -57,18 +57,18 @@ inline void WriteScalar(LegoStorage* p_storage, T p_variable)
class LegoMemory : public LegoStorage { class LegoMemory : public LegoStorage {
public: public:
LegoMemory(void* p_buffer); LegoMemory(void* p_buffer);
LegoResult Read(void* p_buffer, LegoU32 p_size) override; // 0x04 LegoResult Read(void* p_buffer, LegoU32 p_size) override; // vtable+0x04
LegoResult Write(const void* p_buffer, LegoU32 p_size) override; // 0x08 LegoResult Write(const void* p_buffer, LegoU32 p_size) override; // vtable+0x08
// FUNCTION: LEGO1 0x100994a0 // FUNCTION: LEGO1 0x100994a0
LegoResult GetPosition(LegoU32& p_position) override // 0x0c LegoResult GetPosition(LegoU32& p_position) override // vtable+0x0c
{ {
p_position = m_position; p_position = m_position;
return SUCCESS; return SUCCESS;
} }
// FUNCTION: LEGO1 0x100994b0 // FUNCTION: LEGO1 0x100994b0
LegoResult SetPosition(LegoU32 p_position) override // 0x10 LegoResult SetPosition(LegoU32 p_position) override // vtable+0x10
{ {
m_position = p_position; m_position = p_position;
return SUCCESS; return SUCCESS;
@ -90,11 +90,11 @@ class LegoMemory : public LegoStorage {
class LegoFile : public LegoStorage { class LegoFile : public LegoStorage {
public: public:
LegoFile(); LegoFile();
~LegoFile() override; // 0x00 ~LegoFile() override;
LegoResult Read(void* p_buffer, LegoU32 p_size) override; // 0x04 LegoResult Read(void* p_buffer, LegoU32 p_size) override; // vtable+0x04
LegoResult Write(const void* p_buffer, LegoU32 p_size) override; // 0x08 LegoResult Write(const void* p_buffer, LegoU32 p_size) override; // vtable+0x08
LegoResult GetPosition(LegoU32& p_position) override; // 0x0c LegoResult GetPosition(LegoU32& p_position) override; // vtable+0x0c
LegoResult SetPosition(LegoU32 p_position) override; // 0x10 LegoResult SetPosition(LegoU32 p_position) override; // vtable+0x10
LegoResult Open(const char* p_name, LegoU32 p_mode); LegoResult Open(const char* p_name, LegoU32 p_mode);
// FUNCTION: LEGO1 0x100343d0 // FUNCTION: LEGO1 0x100343d0

4
LEGO1/omni/include/mxutil.h
View File

@ -72,8 +72,8 @@ MxBool GetRectIntersection(
); );
void MakeSourceName(char*, const char*); void MakeSourceName(char*, const char*);
void OmniError(char* p_message, int p_status); void OmniError(const char* p_message, MxS32 p_status);
void SetOmniUserMessage(void (*)(const char*, int)); void SetOmniUserMessage(void (*p_omniUserMessage)(const char*, MxS32));
MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter); MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter);
void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags); void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags);
MxDSObject* CreateStreamObject(MxDSFile*, MxS16); MxDSObject* CreateStreamObject(MxDSFile*, MxS16);

6
LEGO1/omni/src/common/mxutil.cpp
View File

@ -128,7 +128,7 @@ MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter*
} }
// FUNCTION: LEGO1 0x100b71e0 // FUNCTION: LEGO1 0x100b71e0
void OmniError(char* p_message, int p_status) void OmniError(const char* p_message, MxS32 p_status)
{ {
if (g_omniUserMessage) { if (g_omniUserMessage) {
g_omniUserMessage(p_message, p_status); g_omniUserMessage(p_message, p_status);
@ -139,9 +139,9 @@ void OmniError(char* p_message, int p_status)
} }
// FUNCTION: LEGO1 0x100b7210 // FUNCTION: LEGO1 0x100b7210
void SetOmniUserMessage(void (*p_userMsg)(const char*, int)) void SetOmniUserMessage(void (*p_omniUserMessage)(const char*, MxS32))
{ {
g_omniUserMessage = p_userMsg; g_omniUserMessage = p_omniUserMessage;
} }
// FUNCTION: LEGO1 0x100b7220 // FUNCTION: LEGO1 0x100b7220