AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 22:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Runtime/World: Replace bitfield unions with constructor initializers

Browse Source
This commit is contained in:
Luke Street
2020-04-11 01:50:10 -04:00
parent 22880abb7e
commit bb7e94f304
69 changed files with 583 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Runtime/World/CWorldTransManager.hpp
View File

@@ -69,16 +69,11 @@ private:
float x38_textStartTime = 0.f;
float x3c_sfxInterval;
bool x40_strIdx;
union {
struct {
bool x44_24_transFinished : 1;
bool x44_25_stopSoon : 1;
bool x44_26_goingUp : 1;
bool x44_27_fadeWhite : 1;
bool x44_28_textDirty : 1;
};
u8 dummy = 0;
};
bool x44_24_transFinished : 1;
bool x44_25_stopSoon : 1;
bool x44_26_goingUp : 1;
bool x44_27_fadeWhite : 1;
bool x44_28_textDirty : 1;
CColoredQuadFilter m_fadeToBlack{EFilterType::Blend};
CTexturedQuadFilter m_dissolve{EFilterType::Blend, CGraphics::g_SpareTexture.get()};
@@ -101,7 +96,12 @@ private:
void DrawText();
public:
CWorldTransManager() { x44_24_transFinished = true; }
CWorldTransManager()
: x44_24_transFinished(true)
, x44_25_stopSoon(false)
, x44_26_goingUp(false)
, x44_27_fadeWhite(false)
, x44_28_textDirty(false) {}
void Update(float);
void Draw();