diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/mxdsbuffer.cpp index 76df228d..b01be21a 100644 --- a/LEGO1/mxdsbuffer.cpp +++ b/LEGO1/mxdsbuffer.cpp @@ -25,12 +25,13 @@ MxDSBuffer::~MxDSBuffer() } // OFFSET: LEGO1 0x100c6780 -void MxDSBuffer::FUN_100c678(void* p_buffer, MxU32 p_size) +MxResult MxDSBuffer::FUN_100c6780(void* p_buffer, MxU32 p_size) { m_pBuffer = p_buffer; m_pIntoBuffer = p_buffer; - m_mode = 2; m_pIntoBuffer2 = p_buffer; m_bytesRemaining = p_size; m_writeOffset = p_size; + m_mode = 2; + return SUCCESS; } diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/mxdsbuffer.h index ed33c57e..a48c4727 100644 --- a/LEGO1/mxdsbuffer.h +++ b/LEGO1/mxdsbuffer.h @@ -19,7 +19,7 @@ class MxDSBuffer : public MxCore return "MxDSBuffer"; } - void FUN_100c678(void* p_buffer, MxU32 p_size); + MxResult FUN_100c6780(void* p_buffer, MxU32 p_size); inline void* GetBuffer() { return m_pBuffer;} inline MxU32 GetWriteOffset() { return m_writeOffset;} @@ -32,7 +32,7 @@ class MxDSBuffer : public MxCore undefined4 m_unk18; undefined4 m_unk1c; undefined2 m_unk20; - int m_mode; + undefined4 m_mode; MxU32 m_writeOffset; MxU32 m_bytesRemaining; undefined4 m_unk30; diff --git a/LEGO1/mxdssource.cpp b/LEGO1/mxdssource.cpp index 556a0d2e..3c725a81 100644 --- a/LEGO1/mxdssource.cpp +++ b/LEGO1/mxdssource.cpp @@ -2,9 +2,9 @@ #include "mxdsbuffer.h" // OFFSET: LEGO1 0x100bffd0 -void MxDSSource::ReadToBuffer(MxDSBuffer* p_unk) +void MxDSSource::ReadToBuffer(MxDSBuffer* p_buffer) { - Read((unsigned char*)p_unk->GetBuffer(), p_unk->GetWriteOffset()); + Read((unsigned char*)p_buffer->GetBuffer(), p_buffer->GetWriteOffset()); } // OFFSET: LEGO1 0x100bfff0 diff --git a/LEGO1/mxdssource.h b/LEGO1/mxdssource.h index 4ccee64e..9c404ad0 100644 --- a/LEGO1/mxdssource.h +++ b/LEGO1/mxdssource.h @@ -2,6 +2,7 @@ #define MXDSSOURCE_H #include "mxcore.h" + class MxDSBuffer; // VTABLE 0x100dc8c8 @@ -10,7 +11,7 @@ class MxDSSource : public MxCore public: MxDSSource() : m_lengthInDWords(0) - , m_pBuffer(0) + , m_pBuffer(NULL) , m_position(-1) {} @@ -29,7 +30,7 @@ class MxDSSource : public MxCore virtual MxLong Open(MxULong) = 0; virtual MxLong Close() = 0; - virtual void ReadToBuffer(MxDSBuffer* p_unk); + virtual void ReadToBuffer(MxDSBuffer* p_buffer); virtual MxResult Read(unsigned char *, MxULong) = 0; virtual MxLong Seek(MxLong, int) = 0; virtual MxULong GetBufferSize() = 0;