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

Refactor

Browse Source
This commit is contained in:
Christian Semmler
2023-10-19 08:03:11 -04:00
parent 20d08d3124
commit 26bde7a03d
1 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
LEGO1/mxregion.cpp
View File

@@ -53,39 +53,35 @@ void MxRegion::vtable18(MxRect32 &p_rect)
cursor.Prepend(newTopBottom); cursor.Prepend(newTopBottom);
rectCopy.m_top = rectCopy.m_bottom; rectCopy.m_top = rectCopy.m_bottom;
} }
else { else if (rectCopy.m_top < topBottom->m_bottom) {
MxS32 *bottom = &topBottom->m_bottom; if (rectCopy.m_top < topBottom->m_top) {
MxRect32 topBottomRect(
MxPoint32(rectCopy.m_left, rectCopy.m_top),
MxSize32(rectCopy.m_right, topBottom->m_top)
);
if (rectCopy.m_top < *bottom) { MxRegionTopBottom *newTopBottom = new MxRegionTopBottom(topBottomRect);
if (rectCopy.m_top < topBottom->m_top) { cursor.Prepend(newTopBottom);
MxRect32 topBottomRect( rectCopy.m_top = topBottom->m_top;
MxPoint32(rectCopy.m_left, rectCopy.m_top), }
MxSize32(rectCopy.m_right, topBottom->m_top) else if (topBottom->m_top < rectCopy.m_top) {
); MxRegionTopBottom *newTopBottom = topBottom->Clone();
newTopBottom->m_bottom = rectCopy.m_top;
topBottom->m_top = rectCopy.m_top;
cursor.Prepend(newTopBottom);
}
MxRegionTopBottom *newTopBottom = new MxRegionTopBottom(topBottomRect); if (rectCopy.m_bottom < topBottom->m_bottom) {
cursor.Prepend(newTopBottom); MxRegionTopBottom *newTopBottom = topBottom->Clone();
rectCopy.m_top = topBottom->m_top; newTopBottom->m_bottom = rectCopy.m_bottom;
} topBottom->m_top = rectCopy.m_bottom;
else if (topBottom->m_top < rectCopy.m_top) { newTopBottom->FUN_100c5280(rectCopy.m_left, rectCopy.m_right);
MxRegionTopBottom *newTopBottom = topBottom->Clone(); cursor.Prepend(newTopBottom);
newTopBottom->m_bottom = rectCopy.m_top; rectCopy.m_top = rectCopy.m_bottom;
topBottom->m_top = rectCopy.m_top; }
cursor.Prepend(newTopBottom); else {
} topBottom->FUN_100c5280(rectCopy.m_left, rectCopy.m_right);
rectCopy.m_top = topBottom->m_bottom;
if (rectCopy.m_bottom < *bottom) {
MxRegionTopBottom *newTopBottom = topBottom->Clone();
newTopBottom->m_bottom = rectCopy.m_bottom;
topBottom->m_top = rectCopy.m_bottom;
newTopBottom->FUN_100c5280(rectCopy.m_left, rectCopy.m_right);
cursor.Prepend(newTopBottom);
rectCopy.m_top = rectCopy.m_bottom;
}
else {
topBottom->FUN_100c5280(rectCopy.m_left, rectCopy.m_right);
rectCopy.m_top = *bottom;
}
} }
} }