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

Fix

Browse Source
This commit is contained in:
Christian Semmler 2023-12-20 22:39:23 -05:00
parent adc6b75135
commit f1ea99e440
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
LEGO1/mxrect32.h
View File

@ -40,6 +40,14 @@ class MxRect32 {
return *this; return *this;
} }
inline void CopyFrom(const MxRect32& p_rect)
{
this->m_left = p_rect.m_left;
this->m_top = p_rect.m_top;
this->m_right = p_rect.m_right;
this->m_bottom = p_rect.m_bottom;
}
inline void Intersect(const MxRect32& p_rect) inline void Intersect(const MxRect32& p_rect)
{ {
m_left = Max(p_rect.m_left, m_left); m_left = Max(p_rect.m_left, m_left);
@ -99,14 +107,6 @@ class MxRect32 {
inline void SetBottom(MxS32 p_bottom) { m_bottom = p_bottom; } inline void SetBottom(MxS32 p_bottom) { m_bottom = p_bottom; }
private: private:
inline void CopyFrom(const MxRect32& p_rect)
{
this->m_left = p_rect.m_left;
this->m_top = p_rect.m_top;
this->m_right = p_rect.m_right;
this->m_bottom = p_rect.m_bottom;
}
inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; }; inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; };
inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; }; inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; };

4
LEGO1/mxsmkpresenter.cpp
View File

@ -80,7 +80,9 @@ void MxSmkPresenter::LoadFrame(MxStreamChunk* p_chunk)
MxRect32* rect; MxRect32* rect;
while (cursor.Next(rect)) { while (cursor.Next(rect)) {
invalidateRect = *rect; // This should probably be using the assignment operator,
// but it's currently reducing the match significantly.
invalidateRect.CopyFrom(*rect);
invalidateRect.AddPoint(m_location); invalidateRect.AddPoint(m_location);
MVideoManager()->InvalidateRect(invalidateRect); MVideoManager()->InvalidateRect(invalidateRect);
} }