Match MxDiskStreamController::VTable0x20

This commit is contained in:
Christian Semmler 2023-12-13 16:38:37 -05:00
parent 5cdeb116be
commit 785b104f6d
2 changed files with 14 additions and 16 deletions

View File

@ -84,32 +84,30 @@ void MxDiskStreamController::FUN_100c7f40(MxDSStreamingAction* p_streamingaction
// FUNCTION: LEGO1 0x100c7ff0 // FUNCTION: LEGO1 0x100c7ff0
MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action) MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action)
{ {
MxResult result;
MxAutoLocker lock(&this->m_criticalSection); MxAutoLocker lock(&this->m_criticalSection);
MxDSStreamingAction* action;
MxDSStreamingAction* entry = MxDSStreamingAction* entry =
(MxDSStreamingAction*) m_list0x80.Find(p_action, FALSE); // TODO: is this a seperate class? (MxDSStreamingAction*) m_list0x80.Find(p_action, FALSE); // TODO: is this a seperate class?
if (!entry) {
result = MxStreamController::VTable0x20((MxDSAction*) p_action); if (entry) {
} action = new MxDSStreamingAction(*p_action, 0);
else {
MxDSStreamingAction* action = new MxDSStreamingAction(*p_action, 0);
action->SetUnknown28(entry->GetUnknown28()); action->SetUnknown28(entry->GetUnknown28());
action->SetUnknown84(entry->GetUnknown84()); action->SetUnknown84(entry->GetUnknown84());
action->SetOrigin(entry->GetOrigin()); action->SetOrigin(entry->GetOrigin());
action->SetUnknowna0(entry->GetUnknowna4()); action->SetUnknowna0(entry->GetUnknowna4());
FUN_100c7f40(action); FUN_100c7f40(action);
result = VTable0x2c(p_action, action->GetBufferOffset());
}
if (result == SUCCESS) { if (VTable0x2c(p_action, entry->GetUnknown94()) != SUCCESS)
return FAILURE;
}
else if (MxStreamController::VTable0x20((MxDSAction*) p_action) != SUCCESS)
return FAILURE; return FAILURE;
}
else { m_unk0x70 = 1;
m_unk0x70 = 1; m_unk0xc4 = 1;
m_unk0xc4 = 1; return SUCCESS;
return SUCCESS;
}
} }
// STUB: LEGO1 0x100c8160 // STUB: LEGO1 0x100c8160

View File

@ -31,7 +31,7 @@ class MxDSStreamingAction : public MxDSAction {
void SetInternalAction(MxDSAction* p_dsAction); void SetInternalAction(MxDSAction* p_dsAction);
void FUN_100cd2d0(); void FUN_100cd2d0();
inline MxU32 GetBufferOffset() { return m_bufferOffset; } inline MxU32 GetUnknown94() { return m_unk0x94; }
inline MxDSBuffer* GetUnknowna0() { return m_unk0xa0; } inline MxDSBuffer* GetUnknowna0() { return m_unk0xa0; }
inline MxDSBuffer* GetUnknowna4() { return m_unk0xa4; } inline MxDSBuffer* GetUnknowna4() { return m_unk0xa4; }
inline void SetUnknowna0(MxDSBuffer* p_unk0xa0) { m_unk0xa0 = p_unk0xa0; } inline void SetUnknowna0(MxDSBuffer* p_unk0xa0) { m_unk0xa0 = p_unk0xa0; }