mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-25 17:34:05 +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

10
LEGO1/mxregion.cpp
View File

@@ -53,10 +53,7 @@ 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 < *bottom) {
if (rectCopy.m_top < topBottom->m_top) { if (rectCopy.m_top < topBottom->m_top) {
MxRect32 topBottomRect( MxRect32 topBottomRect(
MxPoint32(rectCopy.m_left, rectCopy.m_top), MxPoint32(rectCopy.m_left, rectCopy.m_top),
@@ -74,7 +71,7 @@ void MxRegion::vtable18(MxRect32 &p_rect)
cursor.Prepend(newTopBottom); cursor.Prepend(newTopBottom);
} }
if (rectCopy.m_bottom < *bottom) { if (rectCopy.m_bottom < topBottom->m_bottom) {
MxRegionTopBottom *newTopBottom = topBottom->Clone(); MxRegionTopBottom *newTopBottom = topBottom->Clone();
newTopBottom->m_bottom = rectCopy.m_bottom; newTopBottom->m_bottom = rectCopy.m_bottom;
topBottom->m_top = rectCopy.m_bottom; topBottom->m_top = rectCopy.m_bottom;
@@ -84,8 +81,7 @@ void MxRegion::vtable18(MxRect32 &p_rect)
} }
else { else {
topBottom->FUN_100c5280(rectCopy.m_left, rectCopy.m_right); topBottom->FUN_100c5280(rectCopy.m_left, rectCopy.m_right);
rectCopy.m_top = *bottom; rectCopy.m_top = topBottom->m_bottom;
}
} }
} }