isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 00:31:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename member to m_controllers

Browse Source
This commit is contained in:
disinvite 2024-09-05 18:11:42 -04:00
parent d238f59a9b
commit c812793572
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/omni/include/mxstreamer.h
View File

@ -116,7 +116,7 @@ class MxStreamer : public MxCore {
} }
private: private:
list<MxStreamController*> m_openStreams; // 0x08 list<MxStreamController*> m_controllers; // 0x08
MxMemoryPool64 m_pool64; // 0x14 MxMemoryPool64 m_pool64; // 0x14
MxMemoryPool128 m_pool128; // 0x20 MxMemoryPool128 m_pool128; // 0x20
}; };

22
LEGO1/omni/src/stream/mxstreamer.cpp
View File

@ -37,8 +37,8 @@ MxResult MxStreamer::Create()
// FUNCTION: BETA10 0x10145268 // FUNCTION: BETA10 0x10145268
MxStreamer::~MxStreamer() MxStreamer::~MxStreamer()
{ {
while (!m_openStreams.empty()) { while (!m_controllers.empty()) {
MxStreamController* controller = m_openStreams.front(); MxStreamController* controller = m_controllers.front();
#ifdef COMPAT_MODE #ifdef COMPAT_MODE
{ {
@ -49,7 +49,7 @@ MxStreamer::~MxStreamer()
assert(controller->IsStoped(&MxDSAction())); assert(controller->IsStoped(&MxDSAction()));
#endif #endif
m_openStreams.pop_front(); m_controllers.pop_front();
delete controller; delete controller;
} }
@ -99,11 +99,11 @@ MxLong MxStreamer::Close(const char* p_name)
MxDSAction ds; MxDSAction ds;
ds.SetUnknown24(-2); ds.SetUnknown24(-2);
for (list<MxStreamController*>::iterator it = m_openStreams.begin(); it != m_openStreams.end(); it++) { for (list<MxStreamController*>::iterator it = m_controllers.begin(); it != m_controllers.end(); it++) {
MxStreamController* c = *it; MxStreamController* c = *it;
if (!p_name || c->GetAtom() == p_name) { if (!p_name || c->GetAtom() == p_name) {
m_openStreams.erase(it); m_controllers.erase(it);
if (c->IsStoped(&ds)) { if (c->IsStoped(&ds)) {
delete c; delete c;
@ -130,7 +130,7 @@ MxNotificationParam* MxStreamerNotification::Clone() const
// FUNCTION: BETA10 0x1014584b // FUNCTION: BETA10 0x1014584b
MxStreamController* MxStreamer::GetOpenStream(const char* p_name) MxStreamController* MxStreamer::GetOpenStream(const char* p_name)
{ {
for (list<MxStreamController*>::iterator it = m_openStreams.begin(); it != m_openStreams.end(); it++) { for (list<MxStreamController*>::iterator it = m_controllers.begin(); it != m_controllers.end(); it++) {
if ((*it)->GetAtom() == p_name) { if ((*it)->GetAtom() == p_name) {
return *it; return *it;
} }
@ -152,13 +152,13 @@ void MxStreamer::FUN_100b98f0(MxDSAction* p_action)
// FUNCTION: BETA10 0x101458e5 // FUNCTION: BETA10 0x101458e5
MxResult MxStreamer::AddStreamControllerToOpenList(MxStreamController* p_stream) MxResult MxStreamer::AddStreamControllerToOpenList(MxStreamController* p_stream)
{ {
list<MxStreamController*>::iterator it = find(m_openStreams.begin(), m_openStreams.end(), p_stream); list<MxStreamController*>::iterator i = find(m_controllers.begin(), m_controllers.end(), p_stream);
assert(it == m_openStreams.end()); assert(i == m_controllers.end());
// DECOMP: Retail is missing the optimization that skips this check if find() reaches the end. // DECOMP: Retail is missing the optimization that skips this check if find() reaches the end.
if (it == m_openStreams.end()) { if (i == m_controllers.end()) {
m_openStreams.push_back(p_stream); m_controllers.push_back(p_stream);
return SUCCESS; return SUCCESS;
} }
@ -198,7 +198,7 @@ MxResult MxStreamer::DeleteObject(MxDSAction* p_dsAction)
} }
MxResult result = FAILURE; MxResult result = FAILURE;
for (list<MxStreamController*>::iterator it = m_openStreams.begin(); it != m_openStreams.end(); it++) { for (list<MxStreamController*>::iterator it = m_controllers.begin(); it != m_controllers.end(); it++) {
// TODO: MxAtomId operator== used here for NULL test. BETA10 0x1007dc20 // 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()); tempAction.SetAtomId((*it)->GetAtom());