From 49ace87e91172ebee3d0e69109defcb1a6d55764 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 27 Feb 2024 14:52:55 -0500
Subject: [PATCH] Other fixes

---
 LEGO1/lego/sources/misc/legostorage.h | 32 +++++++++++++--------------
 LEGO1/omni/include/mxutil.h           |  4 ++--
 LEGO1/omni/src/common/mxutil.cpp      |  6 ++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/LEGO1/lego/sources/misc/legostorage.h b/LEGO1/lego/sources/misc/legostorage.h
index 9f348b29..2b542e44 100644
--- a/LEGO1/lego/sources/misc/legostorage.h
+++ b/LEGO1/lego/sources/misc/legostorage.h
@@ -20,18 +20,18 @@ class LegoStorage {
 	LegoStorage() : m_mode(0) {}
 
 	// FUNCTION: LEGO1 0x10045ad0
-	virtual ~LegoStorage() {} // 0x00
+	virtual ~LegoStorage() {}
 
-	virtual LegoResult Read(void* p_buffer, LegoU32 p_size) = 0;        // 0x04
-	virtual LegoResult Write(const void* p_buffer, LegoU32 p_size) = 0; // 0x08
-	virtual LegoResult GetPosition(LegoU32& p_position) = 0;            // 0x0c
-	virtual LegoResult SetPosition(LegoU32 p_position) = 0;             // 0x10
+	virtual LegoResult Read(void* p_buffer, LegoU32 p_size) = 0;        // vtable+0x04
+	virtual LegoResult Write(const void* p_buffer, LegoU32 p_size) = 0; // vtable+0x08
+	virtual LegoResult GetPosition(LegoU32& p_position) = 0;            // vtable+0x0c
+	virtual LegoResult SetPosition(LegoU32 p_position) = 0;             // vtable+0x10
 
 	// 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
-	virtual LegoBool IsReadMode() { return m_mode == c_read; } // 0x14
+	virtual LegoBool IsReadMode() { return m_mode == c_read; } // vtable+0x18
 
 	// SYNTHETIC: LEGO1 0x10045b00
 	// LegoStorage::`scalar deleting destructor'
@@ -57,18 +57,18 @@ inline void WriteScalar(LegoStorage* p_storage, T p_variable)
 class LegoMemory : public LegoStorage {
 public:
 	LegoMemory(void* p_buffer);
-	LegoResult Read(void* p_buffer, LegoU32 p_size) override;        // 0x04
-	LegoResult Write(const void* p_buffer, LegoU32 p_size) override; // 0x08
+	LegoResult Read(void* p_buffer, LegoU32 p_size) override;        // vtable+0x04
+	LegoResult Write(const void* p_buffer, LegoU32 p_size) override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x100994a0
-	LegoResult GetPosition(LegoU32& p_position) override // 0x0c
+	LegoResult GetPosition(LegoU32& p_position) override // vtable+0x0c
 	{
 		p_position = m_position;
 		return SUCCESS;
 	}
 
 	// FUNCTION: LEGO1 0x100994b0
-	LegoResult SetPosition(LegoU32 p_position) override // 0x10
+	LegoResult SetPosition(LegoU32 p_position) override // vtable+0x10
 	{
 		m_position = p_position;
 		return SUCCESS;
@@ -90,11 +90,11 @@ class LegoMemory : public LegoStorage {
 class LegoFile : public LegoStorage {
 public:
 	LegoFile();
-	~LegoFile() override;                                            // 0x00
-	LegoResult Read(void* p_buffer, LegoU32 p_size) override;        // 0x04
-	LegoResult Write(const void* p_buffer, LegoU32 p_size) override; // 0x08
-	LegoResult GetPosition(LegoU32& p_position) override;            // 0x0c
-	LegoResult SetPosition(LegoU32 p_position) override;             // 0x10
+	~LegoFile() override;
+	LegoResult Read(void* p_buffer, LegoU32 p_size) override;        // vtable+0x04
+	LegoResult Write(const void* p_buffer, LegoU32 p_size) override; // vtable+0x08
+	LegoResult GetPosition(LegoU32& p_position) override;            // vtable+0x0c
+	LegoResult SetPosition(LegoU32 p_position) override;             // vtable+0x10
 	LegoResult Open(const char* p_name, LegoU32 p_mode);
 
 	// FUNCTION: LEGO1 0x100343d0
diff --git a/LEGO1/omni/include/mxutil.h b/LEGO1/omni/include/mxutil.h
index 36cba66d..801ca3c1 100644
--- a/LEGO1/omni/include/mxutil.h
+++ b/LEGO1/omni/include/mxutil.h
@@ -72,8 +72,8 @@ MxBool GetRectIntersection(
 );
 
 void MakeSourceName(char*, const char*);
-void OmniError(char* p_message, int p_status);
-void SetOmniUserMessage(void (*)(const char*, int));
+void OmniError(const char* p_message, MxS32 p_status);
+void SetOmniUserMessage(void (*p_omniUserMessage)(const char*, MxS32));
 MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter);
 void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags);
 MxDSObject* CreateStreamObject(MxDSFile*, MxS16);
diff --git a/LEGO1/omni/src/common/mxutil.cpp b/LEGO1/omni/src/common/mxutil.cpp
index 25b63dbe..61af4f6e 100644
--- a/LEGO1/omni/src/common/mxutil.cpp
+++ b/LEGO1/omni/src/common/mxutil.cpp
@@ -128,7 +128,7 @@ MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter*
 }
 
 // FUNCTION: LEGO1 0x100b71e0
-void OmniError(char* p_message, int p_status)
+void OmniError(const char* p_message, MxS32 p_status)
 {
 	if (g_omniUserMessage) {
 		g_omniUserMessage(p_message, p_status);
@@ -139,9 +139,9 @@ void OmniError(char* p_message, int p_status)
 }
 
 // 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