From d238f59a9ba65ee62173a4ec0f628d3fc57c5689 Mon Sep 17 00:00:00 2001 From: disinvite Date: Thu, 5 Sep 2024 17:17:23 -0400 Subject: [PATCH] Typo and comment. One more beta addr --- LEGO1/omni/include/mxstreamer.h | 3 +++ LEGO1/omni/src/stream/mxstreamer.cpp | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h index 14e8632f..f4ad6339 100644 --- a/LEGO1/omni/include/mxstreamer.h +++ b/LEGO1/omni/include/mxstreamer.h @@ -158,6 +158,9 @@ class MxStreamer : public MxCore { // TEMPLATE: BETA10 0x10147020 // list >::iterator::operator== +// TEMPLATE: BETA10 0x10147060 +// list >::push_back + // TEMPLATE: BETA10 0x10147200 // ??9@YAHABViterator@?$list@PAVMxStreamController@@V?$allocator@PAVMxStreamController@@@@@@0@Z diff --git a/LEGO1/omni/src/stream/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp index 14cbebf1..c20cdec7 100644 --- a/LEGO1/omni/src/stream/mxstreamer.cpp +++ b/LEGO1/omni/src/stream/mxstreamer.cpp @@ -156,6 +156,7 @@ MxResult MxStreamer::AddStreamControllerToOpenList(MxStreamController* p_stream) assert(it == m_openStreams.end()); + // DECOMP: Retail is missing the optimization that skips this check if find() reaches the end. if (it == m_openStreams.end()) { m_openStreams.push_back(p_stream); return SUCCESS; @@ -199,7 +200,7 @@ MxResult MxStreamer::DeleteObject(MxDSAction* p_dsAction) MxResult result = FAILURE; for (list::iterator it = m_openStreams.begin(); it != m_openStreams.end(); it++) { // TODO: MxAtomId operator== used here for NULL test. BETA10 0x1007dc20 - if (p_dsAction->GetAtomId().GetInternal() != NULL || p_dsAction->GetAtomId() == (*it)->GetAtom()) { + if (p_dsAction->GetAtomId().GetInternal() == NULL || p_dsAction->GetAtomId() == (*it)->GetAtom()) { tempAction.SetAtomId((*it)->GetAtom()); result = (*it)->VTable0x24(&tempAction); }