From 0e346901e1ff8aea30a0a652f881f582009f5254 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 22 Dec 2024 13:46:39 -0700 Subject: [PATCH] Move function definitions to header --- LEGO1/omni/include/mxstreamcontroller.h | 20 ++++++++++++++------ LEGO1/omni/src/stream/mxstreamcontroller.cpp | 18 ------------------ 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/LEGO1/omni/include/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h index f348a4bd..d0328908 100644 --- a/LEGO1/omni/include/mxstreamcontroller.h +++ b/LEGO1/omni/include/mxstreamcontroller.h @@ -43,12 +43,20 @@ class MxStreamController : public MxCore { return !strcmp(p_name, MxStreamController::ClassName()) || MxCore::IsA(p_name); } - virtual MxResult Open(const char* p_filename); // vtable+0x14 - virtual MxResult VTable0x18(undefined4, undefined4); // vtable+0x18 - virtual MxResult VTable0x1c(undefined4, undefined4); // vtable+0x1c - virtual MxResult VTable0x20(MxDSAction* p_action); // vtable+0x20 - virtual MxResult VTable0x24(MxDSAction* p_action); // vtable+0x24 - virtual MxDSStreamingAction* VTable0x28(); // vtable+0x28 + virtual MxResult Open(const char* p_filename); // vtable+0x14 + + // FUNCTION: LEGO1 0x100b9400 + virtual MxResult VTable0x18(undefined4, undefined4) { return FAILURE; } // vtable+0x18 + + // FUNCTION: LEGO1 0x100b9410 + virtual MxResult VTable0x1c(undefined4, undefined4) { return FAILURE; } // vtable+0x1c + + virtual MxResult VTable0x20(MxDSAction* p_action); // vtable+0x20 + virtual MxResult VTable0x24(MxDSAction* p_action); // vtable+0x24 + + // FUNCTION: LEGO1 0x100b9420 + virtual MxDSStreamingAction* VTable0x28() { return NULL; } // vtable+0x28 + virtual MxResult VTable0x2c(MxDSAction* p_action, MxU32 p_bufferval); // vtable+0x2c virtual MxResult VTable0x30(MxDSAction* p_action); // vtable+0x30 diff --git a/LEGO1/omni/src/stream/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp index 4552d7ef..af0dd84b 100644 --- a/LEGO1/omni/src/stream/mxstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxstreamcontroller.cpp @@ -16,24 +16,6 @@ DECOMP_SIZE_ASSERT(MxStreamController, 0x64) DECOMP_SIZE_ASSERT(MxNextActionDataStart, 0x14) DECOMP_SIZE_ASSERT(MxNextActionDataStartList, 0x0c) -// FUNCTION: LEGO1 0x100b9400 -MxResult MxStreamController::VTable0x18(undefined4, undefined4) -{ - return FAILURE; -} - -// FUNCTION: LEGO1 0x100b9410 -MxResult MxStreamController::VTable0x1c(undefined4, undefined4) -{ - return FAILURE; -} - -// FUNCTION: LEGO1 0x100b9420 -MxDSStreamingAction* MxStreamController::VTable0x28() -{ - return NULL; -} - // FUNCTION: LEGO1 0x100c0b90 MxStreamController::MxStreamController() {