AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CGuiWidget: Make GetIsFinishedLoading non-const

This commit is contained in:
Luke Street 2020-03-25 01:54:19 -04:00
parent 40fc3f9dd8
commit 3734a09ed3
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/GuiSys/CGuiFrame.cpp
View File

@ -107,7 +107,7 @@ bool CGuiFrame::GetIsFinishedLoading() const {
continue; continue;
return false; return false;
} }
const_cast<CGuiFrame*>(this)->x58_24_loaded = true; x58_24_loaded = true;
return true; return true;
} }

2
Runtime/GuiSys/CGuiFrame.hpp
View File

@ -41,7 +41,7 @@ private:
int x4c_a; int x4c_a;
int x50_b; int x50_b;
int x54_c; int x54_c;
bool x58_24_loaded : 1; mutable bool x58_24_loaded : 1;
zeus::CTransform m_aspectTransform; zeus::CTransform m_aspectTransform;
float m_aspectConstraint = -1.f; float m_aspectConstraint = -1.f;

2
Runtime/GuiSys/CGuiWidget.cpp
View File

@ -227,7 +227,7 @@ CGuiWidget* CGuiWidget::FindWidget(s16 id) {
return nullptr; return nullptr;
} }
bool CGuiWidget::GetIsFinishedLoading() const { return GetIsFinishedLoadingWidgetSpecific(); } bool CGuiWidget::GetIsFinishedLoading() { return GetIsFinishedLoadingWidgetSpecific(); }
void CGuiWidget::DispatchInitialize() { void CGuiWidget::DispatchInitialize() {
Initialize(); Initialize();

2
Runtime/GuiSys/CGuiWidget.hpp
View File

@ -135,7 +135,7 @@ public:
void SetColor(const zeus::CColor& color); void SetColor(const zeus::CColor& color);
void InitializeRGBAFactor(); void InitializeRGBAFactor();
CGuiWidget* FindWidget(s16 id); CGuiWidget* FindWidget(s16 id);
bool GetIsFinishedLoading() const; bool GetIsFinishedLoading();
void DispatchInitialize(); void DispatchInitialize();
void SetDepthGreater(bool v) { xb6_30_depthGreater = v; } void SetDepthGreater(bool v) { xb6_30_depthGreater = v; }
void SetDepthTest(bool v) { xb6_31_depthTest = v; } void SetDepthTest(bool v) { xb6_31_depthTest = v; }