From e69598d089541f87969e80853b40ea616edd884b Mon Sep 17 00:00:00 2001 From: Mark Langen Date: Tue, 4 Jul 2023 14:41:59 -0700 Subject: [PATCH] Change name to LegoStream --- CMakeLists.txt | 2 +- LEGO1/{mxfile.cpp => legostream.cpp} | 44 ++++++++++++++-------------- LEGO1/{mxfile.h => legostream.h} | 28 +++++++++--------- 3 files changed, 37 insertions(+), 37 deletions(-) rename LEGO1/{mxfile.cpp => legostream.cpp} (65%) rename LEGO1/{mxfile.h => legostream.h} (70%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86734c9b..5c4e11d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,6 +80,7 @@ add_library(lego1 SHARED LEGO1/legoroi.cpp LEGO1/legosoundmanager.cpp LEGO1/legostate.cpp + LEGO1/legostream.cpp LEGO1/legotexturepresenter.cpp LEGO1/legoutil.cpp LEGO1/legovideomanager.cpp @@ -118,7 +119,6 @@ add_library(lego1 SHARED LEGO1/mxentity.cpp LEGO1/mxeventmanager.cpp LEGO1/mxeventpresenter.cpp - LEGO1/mxfile.cpp LEGO1/mxflcpresenter.cpp LEGO1/mxioinfo.cpp LEGO1/mxloopingflcpresenter.cpp diff --git a/LEGO1/mxfile.cpp b/LEGO1/legostream.cpp similarity index 65% rename from LEGO1/mxfile.cpp rename to LEGO1/legostream.cpp index 9c99f01e..273951dc 100644 --- a/LEGO1/mxfile.cpp +++ b/LEGO1/legostream.cpp @@ -1,37 +1,37 @@ -#include "mxfile.h" +#include "legostream.h" #include #include // OFFSET: LEGO1 0x10045ae0 -MxBool MxFile::IsWriteMode() +MxBool LegoStream::IsWriteMode() { - return m_mode == MXFILE_MODE_WRITE; + return m_mode == LEGOSTREAM_MODE_WRITE; } // OFFSET: LEGO1 0x10045af0 -MxBool MxFile::IsReadMode() +MxBool LegoStream::IsReadMode() { - return m_mode == MXFILE_MODE_READ; + return m_mode == LEGOSTREAM_MODE_READ; } // OFFSET: LEGO1 0x100991c0 -MxSystemFile::MxSystemFile() - : MxFile() +LegoFileStream::LegoFileStream() + : LegoStream() { m_hFile = NULL; } // OFFSET: LEGO1 0x10099250 -MxSystemFile::~MxSystemFile() +LegoFileStream::~LegoFileStream() { if (m_hFile != NULL) fclose(m_hFile); } // OFFSET: LEGO1 0x100992c0 -MxResult MxSystemFile::Read(char* buffer, MxU32 size) +MxResult LegoFileStream::Read(char* buffer, MxU32 size) { if (m_hFile == NULL) return FAILURE; @@ -40,7 +40,7 @@ MxResult MxSystemFile::Read(char* buffer, MxU32 size) } // OFFSET: LEGO1 0x10099300 -MxResult MxSystemFile::Write(char* buffer, MxU32 size) +MxResult LegoFileStream::Write(char* buffer, MxU32 size) { if (m_hFile == NULL) return FAILURE; @@ -49,7 +49,7 @@ MxResult MxSystemFile::Write(char* buffer, MxU32 size) } // OFFSET: LEGO1 0x10099340 -MxResult MxSystemFile::Tell(MxU32* offset) +MxResult LegoFileStream::Tell(MxU32* offset) { if (m_hFile == NULL) return FAILURE; @@ -63,7 +63,7 @@ MxResult MxSystemFile::Tell(MxU32* offset) } // OFFSET: LEGO1 0x10099370 -MxResult MxSystemFile::Seek(MxU32 offset) +MxResult LegoFileStream::Seek(MxU32 offset) { if (m_hFile == NULL) return FAILURE; @@ -72,7 +72,7 @@ MxResult MxSystemFile::Seek(MxU32 offset) } // OFFSET: LEGO1 0x100993a0 -MxResult MxSystemFile::Open(const char* filename, OpenFlags mode) +MxResult LegoFileStream::Open(const char* filename, OpenFlags mode) { char modeString[4]; @@ -82,14 +82,14 @@ MxResult MxSystemFile::Open(const char* filename, OpenFlags mode) modeString[0] = '\0'; if (mode & ReadBit) { - m_mode = MXFILE_MODE_READ; + m_mode = LEGOSTREAM_MODE_READ; strcat(modeString, "r"); } if (mode & WriteBit) { - if (m_mode != MXFILE_MODE_READ) - m_mode = MXFILE_MODE_WRITE; + if (m_mode != LEGOSTREAM_MODE_READ) + m_mode = LEGOSTREAM_MODE_WRITE; strcat(modeString, "w"); } @@ -102,15 +102,15 @@ MxResult MxSystemFile::Open(const char* filename, OpenFlags mode) } // OFFSET: LEGO1 0x10099080 -MxMemoryFile::MxMemoryFile(char* buffer) - : MxFile() +LegoMemoryStream::LegoMemoryStream(char* buffer) + : LegoStream() { m_buffer = buffer; m_offset = 0; } // OFFSET: LEGO1 0x10099160 -MxResult MxMemoryFile::Read(char* buffer, MxU32 size) +MxResult LegoMemoryStream::Read(char* buffer, MxU32 size) { memcpy(buffer, m_buffer + m_offset, size); m_offset += size; @@ -118,7 +118,7 @@ MxResult MxMemoryFile::Read(char* buffer, MxU32 size) } // OFFSET: LEGO1 0x10099190 -MxResult MxMemoryFile::Write(char* buffer, MxU32 size) +MxResult LegoMemoryStream::Write(char* buffer, MxU32 size) { memcpy(m_buffer + m_offset, buffer, size); m_offset += size; @@ -126,14 +126,14 @@ MxResult MxMemoryFile::Write(char* buffer, MxU32 size) } // OFFSET: LEGO1 0x100994a0 -MxResult MxMemoryFile::Tell(MxU32* offset) +MxResult LegoMemoryStream::Tell(MxU32* offset) { *offset = m_offset; return SUCCESS; } // OFFSET: LEGO1 0x100994b0 -MxResult MxMemoryFile::Seek(MxU32 offset) +MxResult LegoMemoryStream::Seek(MxU32 offset) { m_offset = offset; return SUCCESS; diff --git a/LEGO1/mxfile.h b/LEGO1/legostream.h similarity index 70% rename from LEGO1/mxfile.h rename to LEGO1/legostream.h index 0820ab84..ede2673f 100644 --- a/LEGO1/mxfile.h +++ b/LEGO1/legostream.h @@ -1,19 +1,19 @@ -#ifndef MXFILE_H -#define MXFILE_H +#ifndef LEGOSTREAM_H +#define LEGOSTREAM_H #include "decomp.h" #include "mxtypes.h" #include -#define MXFILE_MODE_READ 1 -#define MXFILE_MODE_WRITE 2 +#define LEGOSTREAM_MODE_READ 1 +#define LEGOSTREAM_MODE_WRITE 2 -class MxFile +class LegoStream { public: - MxFile() : m_mode(0) {} - inline virtual ~MxFile() {}; + LegoStream() : m_mode(0) {} + inline virtual ~LegoStream() {}; virtual MxResult Read(char* buffer, MxU32 size) = 0; virtual MxResult Write(char* buffer, MxU32 size) = 0; @@ -34,11 +34,11 @@ class MxFile MxU8 m_mode; }; -class MxSystemFile : public MxFile +class LegoFileStream : public LegoStream { public: - MxSystemFile(); - virtual ~MxSystemFile(); + LegoFileStream(); + virtual ~LegoFileStream(); MxResult Read(char* buffer, MxU32 size) override; MxResult Write(char* buffer, MxU32 size) override; @@ -51,11 +51,11 @@ class MxSystemFile : public MxFile FILE *m_hFile; }; -class MxMemoryFile : public MxFile +class LegoMemoryStream : public LegoStream { public: - MxMemoryFile(char* buffer); - ~MxMemoryFile() {} + LegoMemoryStream(char* buffer); + ~LegoMemoryStream() {} MxResult Read(char* buffer, MxU32 size) override; MxResult Write(char* buffer, MxU32 size) override; @@ -67,4 +67,4 @@ class MxMemoryFile : public MxFile MxU32 m_offset; }; -#endif // MXFILE_H \ No newline at end of file +#endif // LEGOSTREAM_H \ No newline at end of file