mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Match MxRegionTopBottom::FUN_100c5280 (#261)

Browse Source 
* Match MxRegionTopBottom::FUN_100c5280

* Resolve OtherAppend/Append

* Remove old code
This commit is contained in:
Christian Semmler
2023-11-06 08:04:51 -05:00
committed by GitHub
parent 8a528e4146
commit d5cf23bada
4 changed files with 36 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
LEGO1/mxregion.cpp
View File

@@ -87,7 +87,7 @@ void MxRegion::vtable18(MxRect32& p_rect)
if (rectCopy.m_left < rectCopy.m_right && rectCopy.m_top < rectCopy.m_bottom) {
MxRegionTopBottom* newTopBottom = new MxRegionTopBottom(rectCopy);
m_list->OtherAppend(newTopBottom);
m_list->Append(newTopBottom);
}
m_rect.m_left = m_rect.m_left <= p_rect.m_left ? m_rect.m_left : p_rect.m_left;
@@ -147,7 +147,7 @@ void MxRegionTopBottom::FUN_100c5280(MxS32 p_left, MxS32 p_right)
if (!a.HasMatch()) {
MxRegionLeftRight* copy = new MxRegionLeftRight(p_left, p_right);
m_leftRightList->OtherAppend(copy);
m_leftRightList->Append(copy);
}
else {
if (p_left > leftRight->m_left)
@@ -157,14 +157,9 @@ void MxRegionTopBottom::FUN_100c5280(MxS32 p_left, MxS32 p_right)
if (p_right < leftRight->m_right)
p_right = leftRight->m_right;
// TODO: Currently inlined, shouldn't be
b = a;
b.Advance();
if (a.HasMatch()) {
a.Destroy();
a.Detach();
}
a.Destroy();
if (!b.Current(leftRight))
break;
@@ -178,7 +173,7 @@ void MxRegionTopBottom::FUN_100c5280(MxS32 p_left, MxS32 p_right)
}
else {
MxRegionLeftRight* copy = new MxRegionLeftRight(p_left, p_right);
m_leftRightList->OtherAppend(copy);
m_leftRightList->Append(copy);
}
}
}