AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 17:07:41 +00:00
Code Issues Projects Releases Wiki Activity

Runtime/MP1: Replace bitfield unions with constructor initializers

Browse Source
This commit is contained in:
Luke Street
2020-04-10 15:25:40 -04:00
parent d23e76db54
commit 402e45ecb5
22 changed files with 153 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Runtime/MP1/CLogBookScreen.hpp
View File

@@ -13,7 +13,7 @@ namespace urde {
class CPlayerState;
class CScannableObjectInfo;
class CStringTable;
}
} // namespace urde
namespace urde::MP1 {
class CArtifactDoll;
@@ -25,18 +25,14 @@ class CLogBookScreen : public CPauseScreenBase {
x200_viewScans;
float x254_viewInterp = 0.f;
std::unique_ptr<CArtifactDoll> x258_artifactDoll;
enum class ELeavePauseState { InPause = 0, LeavingPause = 1, LeftPause = 2 };
ELeavePauseState x25c_leavePauseState = ELeavePauseState::InPause;
union {
struct {
bool x260_24_loaded : 1;
bool x260_25_inTextScroll : 1;
bool x260_26_exitTextScroll : 1;
};
s32 _dummy = 0;
};
enum class ELeavePauseState {
InPause = 0,
LeavingPause = 1,
LeftPause = 2
} x25c_leavePauseState = ELeavePauseState::InPause;
bool x260_24_loaded : 1;
bool x260_25_inTextScroll : 1;
bool x260_26_exitTextScroll : 1;
void InitializeLogBook();
void UpdateRightTitles();