diff --git a/CMakeLists.txt b/CMakeLists.txt index fcc86af8..6415d39d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,7 +258,6 @@ function(add_lego_libraries NAME) LEGO1/omni/src/stream/mxstreamchunk.cpp LEGO1/omni/src/stream/mxstreamcontroller.cpp LEGO1/omni/src/stream/mxstreamer.cpp - LEGO1/omni/src/stream/mxstreamprovider.cpp LEGO1/omni/src/system/mxautolock.cpp LEGO1/omni/src/system/mxcriticalsection.cpp LEGO1/omni/src/system/mxscheduler.cpp diff --git a/LEGO1/omni/include/mxstreamprovider.h b/LEGO1/omni/include/mxstreamprovider.h index 33cda8a1..8b5336b5 100644 --- a/LEGO1/omni/include/mxstreamprovider.h +++ b/LEGO1/omni/include/mxstreamprovider.h @@ -28,12 +28,21 @@ class MxStreamProvider : public MxCore { return !strcmp(p_name, MxStreamProvider::ClassName()) || MxCore::IsA(p_name); } - virtual MxResult SetResourceToGet(MxStreamController* p_resource); // vtable+0x14 - virtual MxU32 GetFileSize() = 0; // vtable+0x18 - virtual MxS32 GetStreamBuffersNum() = 0; // vtable+0x1c - virtual void VTable0x20(MxDSAction* p_action); // vtable+0x20 - virtual MxU32 GetLengthInDWords() = 0; // vtable+0x24 - virtual MxU32* GetBufferForDWords() = 0; // vtable+0x28 + // FUNCTION: LEGO1 0x100d07c0 + virtual MxResult SetResourceToGet(MxStreamController* p_resource) + { + m_pLookup = p_resource; + return SUCCESS; + } // vtable+0x14 + + virtual MxU32 GetFileSize() = 0; // vtable+0x18 + virtual MxS32 GetStreamBuffersNum() = 0; // vtable+0x1c + + // FUNCTION: LEGO1 0x100d07d0 + virtual void VTable0x20(MxDSAction* p_action) {} // vtable+0x20 + + virtual MxU32 GetLengthInDWords() = 0; // vtable+0x24 + virtual MxU32* GetBufferForDWords() = 0; // vtable+0x28 protected: MxStreamController* m_pLookup; // 0x08 diff --git a/LEGO1/omni/src/stream/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp index d655c16f..2b062504 100644 --- a/LEGO1/omni/src/stream/mxramstreamprovider.cpp +++ b/LEGO1/omni/src/stream/mxramstreamprovider.cpp @@ -6,7 +6,8 @@ #include "mxomni.h" #include "mxstreamcontroller.h" -DECOMP_SIZE_ASSERT(MxRAMStreamProvider, 0x24); +DECOMP_SIZE_ASSERT(MxStreamProvider, 0x10) +DECOMP_SIZE_ASSERT(MxRAMStreamProvider, 0x24) // FUNCTION: LEGO1 0x100d0730 MxRAMStreamProvider::MxRAMStreamProvider() diff --git a/LEGO1/omni/src/stream/mxstreamprovider.cpp b/LEGO1/omni/src/stream/mxstreamprovider.cpp deleted file mode 100644 index 740b2c65..00000000 --- a/LEGO1/omni/src/stream/mxstreamprovider.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "mxstreamprovider.h" - -#include "decomp.h" - -DECOMP_SIZE_ASSERT(MxStreamProvider, 0x10); - -// FUNCTION: LEGO1 0x100d07c0 -MxResult MxStreamProvider::SetResourceToGet(MxStreamController* p_resource) -{ - m_pLookup = p_resource; - return SUCCESS; -} - -// FUNCTION: LEGO1 0x100d07d0 -void MxStreamProvider::VTable0x20(MxDSAction* p_action) -{ -}