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

77.9 %

Browse Source
This commit is contained in:
jonschz 2025-07-12 23:20:04 +02:00
parent 8f9bf5bfb7
commit f9487c4380
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
LEGO1/lego/legoomni/src/worlds/act3.cpp
View File

@ -184,7 +184,11 @@ void Act3List::FUN_100720d0(MxU32 p_objectId)
MxU32 removed = FALSE; MxU32 removed = FALSE;
Act3List::iterator it; Act3List::iterator it;
// TODO: This extra iterator is still kind of dodgy
Act3List::iterator it3; Act3List::iterator it3;
// LINE: LEGO1 0x100720e6 // LINE: LEGO1 0x100720e6
if (!empty()) { if (!empty()) {
@ -196,8 +200,9 @@ void Act3List::FUN_100720d0(MxU32 p_objectId)
} else { } else {
// LINE: LEGO1 0x100720fa // LINE: LEGO1 0x100720fa
for (it = begin(); it != end(); it++) { for (it = begin(); it != end(); it++) {
Act3ListElement& current = *it;
if ((*it).m_hasStarted && (*it).m_objectId == p_objectId) { if (current.m_hasStarted && current.m_objectId == p_objectId) {
erase(it); erase(it);
@ -224,11 +229,11 @@ void Act3List::FUN_100720d0(MxU32 p_objectId)
Act3ListElement& firstItem = *it++; Act3ListElement& firstItem = *it++;
// // LINE: LEGO1 0x100721d4 Not pinnable, appears multiple times // // LINE: LEGO1 0x100721d4 Not pinnable, appears multiple times
for (; it != end(); it++) { for (; it != end(); ) {
// LINE: LEGO1 0x1007217c // LINE: LEGO1 0x1007217c
if ((*it).m_unk0x04 == 1) { if ((*it).m_unk0x04 == 1) {
// LINE: LEGO1 0x100721a0 // LINE: LEGO1 0x100721a0
for (Act3List::iterator it2 = begin(); it2 != it; erase(it2++)) { for (Act3List::iterator it2 = begin(); it2 != it; ) {
// LINE: LEGO1 0x10072191 // LINE: LEGO1 0x10072191
if ((*it2).m_hasStarted) { if ((*it2).m_hasStarted) {
// LINE: LEGO1 0x10072202 // LINE: LEGO1 0x10072202
@ -237,17 +242,18 @@ void Act3List::FUN_100720d0(MxU32 p_objectId)
return; return;
} }
erase(it2++);
it3++;
} }
it++;
it3++;
} }
} }
// LINE: LEGO1 0x100721d8 // LINE: LEGO1 0x100721d4
if (!firstItem.m_hasStarted) { if (!firstItem.m_hasStarted) {
// LINE: LEGO1 0x100721de // LINE: LEGO1 0x100721de
firstItem.m_hasStarted = TRUE; firstItem.m_hasStarted = TRUE;