PR suggestions

LynxDev2 · Oct 19, 2024 · b4d5c6b · b4d5c6b
1 parent bae967e
commit b4d5c6b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 22 deletions.
diff --git a/lib/al/Library/Nerve/NerveStateBase.h b/lib/al/Library/Nerve/NerveStateBase.h
@@ -6,8 +6,6 @@ namespace al {
 class NerveStateBase : public NerveExecutor {
 public:
     NerveStateBase(const char* stateName);
-    // Temporarily removed to avoid mismatch in the StageSceneStateEndSeparatePlay dtor
-    // virtual ~NerveStateBase();
 
     virtual void init();
     virtual void appear();

diff --git a/lib/al/Library/Wipe/WipeSimple.h b/lib/al/Library/Wipe/WipeSimple.h
@@ -20,7 +20,7 @@ class WipeSimple : public LayoutActor {
     void exeCloseEnd();
     void exeOpen();
 
-    virtual void appear();
+    void appear() override;
 
 private:
     s32 mTime = -1;

diff --git a/src/Scene/StageSceneStateEndSeparatePlay.cpp b/src/Scene/StageSceneStateEndSeparatePlay.cpp
@@ -29,12 +29,12 @@ StageSceneStateEndSeparatePlay::StageSceneStateEndSeparatePlay(const char* name,
 
 void StageSceneStateEndSeparatePlay::appear() {
     setDead(false);
-    field_30 = false;
+    mIsCancel = false;
     al::setNerve(this, &NrvStageSceneStateEndSeparatePlay.FadeOut);
 }
 
 bool StageSceneStateEndSeparatePlay::isNeedRequestGraphicsPreset() const {
-    return (field_30 && al::isNerve(this, &NrvStageSceneStateEndSeparatePlay.FadeIn)) ||
+    return (mIsCancel && al::isNerve(this, &NrvStageSceneStateEndSeparatePlay.FadeIn)) ||
            al::isNerve(this, &NrvStageSceneStateEndSeparatePlay.FadeOut);
 }
 
@@ -49,7 +49,7 @@ void StageSceneStateEndSeparatePlay::exeApplet() {
     if (ControllerAppletFunction::connectControllerSinglePlay(mGamePadSystem))
         rs::changeSeparatePlayMode(getScene(), false);
     else
-        field_30 = true;
+        mIsCancel = true;
     al::setNerve(this, &NrvStageSceneStateEndSeparatePlay.WaitDraw);
 }
 
@@ -65,14 +65,14 @@ void StageSceneStateEndSeparatePlay::exeFadeIn() {
 }
 
 void StageSceneStateEndSeparatePlay::exeWaitDraw() {
-    if (al::isFirstStep(this) && !field_30)
+    if (al::isFirstStep(this) && !mIsCancel)
         getHost()->killPauseMenu();
     if (al::isGreaterEqualStep(this, 2))
         al::setNerve(this, &NrvStageSceneStateEndSeparatePlay.FadeIn);
 }
 
 bool StageSceneStateEndSeparatePlay::isDrawViewRenderer() const {
-    if (isDead() || field_30)
+    if (isDead() || mIsCancel)
         return false;
     return al::isNerve(this, &NrvStageSceneStateEndSeparatePlay.WaitDraw) ||
            al::isNerve(this, &NrvStageSceneStateEndSeparatePlay.FadeIn);

diff --git a/src/Scene/StageSceneStateEndSeparatePlay.h b/src/Scene/StageSceneStateEndSeparatePlay.h
@@ -26,10 +26,10 @@ class StageSceneStateEndSeparatePlay : public al::HostStateBase<StageSceneStateP
     void exeWaitDraw();
     bool isDrawViewRenderer() const;
 
-    bool getField30() const { return field_30; }
+    bool isCancel() const { return mIsCancel; }
 
 private:
     al::GamePadSystem* mGamePadSystem = nullptr;
     al::WipeSimple* mWipeSimple = nullptr;
-    bool field_30 = false;
+    bool mIsCancel = false;
 };
diff --git a/src/Scene/StageSceneStatePauseMenu.h b/src/Scene/StageSceneStatePauseMenu.h
@@ -91,7 +91,7 @@ class StageSceneStatePauseMenu : public al::HostStateBase<al::Scene> {
     StageSceneStateStartSeparatePlay* mStateStartSeparatePlay = nullptr;
     StageSceneStateEndSeparatePlay* mStateEndSeparatePlay = nullptr;
     StageSceneStateOption* mStateOption = nullptr;
-    al::LiveActor* mMarioHigh = nullptr;
+    al::LiveActor* mMarioActor = nullptr;
     char field_0x80[40];
     GameDataHolderAccessor mGameDataHolderAccessor;
     al::PauseCameraCtrl* mPauseCameraCtrl = nullptr;

diff --git a/src/Scene/StageSceneStateStartSeparatePlay.cpp b/src/Scene/StageSceneStateStartSeparatePlay.cpp
@@ -42,7 +42,7 @@ StageSceneStateStartSeparatePlay::StageSceneStateStartSeparatePlay(
 
 void StageSceneStateStartSeparatePlay::appear() {
     field_40 = 0;
-    field_42 = false;
+    mIsCancel = false;
     setDead(false);
     if (rs::isModeE3LiveRom()) {
         startTreeHouse();
@@ -56,17 +56,16 @@ void StageSceneStateStartSeparatePlay::startTreeHouse() {
 }
 
 bool StageSceneStateStartSeparatePlay::isNeedRequestGraphicsPreset() const {
-    return (field_42 && al::isNerve(this, &NrvStageSceneStateStartSeparatePlay.FadeIn)) ||
+    return (mIsCancel && al::isNerve(this, &NrvStageSceneStateStartSeparatePlay.FadeIn)) ||
            (al::isNerve(this, &NrvStageSceneStateStartSeparatePlay.Appear) ||
             al::isNerve(this, &NrvStageSceneStateStartSeparatePlay.Back));
 }
 
 bool StageSceneStateStartSeparatePlay::isDrawViewRenderer() const {
-    if (isDead() || field_42)
+    if (isDead() || mIsCancel)
         return false;
-    if (al::isNerve(this, &NrvStageSceneStateStartSeparatePlay.WaitDraw))
-        return true;
-    return al::isNerve(this, &NrvStageSceneStateStartSeparatePlay.FadeIn);
+    return al::isNerve(this, &NrvStageSceneStateStartSeparatePlay.WaitDraw) ||
+           al::isNerve(this, &NrvStageSceneStateStartSeparatePlay.FadeIn);
 }
 
 void StageSceneStateStartSeparatePlay::exeAppear() {
@@ -80,7 +79,7 @@ void StageSceneStateStartSeparatePlay::exeAppear() {
 
 void StageSceneStateStartSeparatePlay::exeWait() {
     if (rs::isTriggerUiCancel(getScene())) {
-        field_42 = true;
+        mIsCancel = true;
         al::setNerve(this, &NrvStageSceneStateStartSeparatePlay.Back);
         return;
     }
@@ -120,7 +119,7 @@ void StageSceneStateStartSeparatePlay::exeApplet() {
     }
     mFooterParts->changeTextFade(
         al::getSystemMessageString(mFooterParts, "Footer", "MenuMessage_Footer"));
-    field_42 = true;
+    mIsCancel = true;
     al::setNerve(this, &NrvStageSceneStateStartSeparatePlay.FadeIn);
 }
 
@@ -134,7 +133,7 @@ void StageSceneStateStartSeparatePlay::exeFadeIn() {
 }
 
 void StageSceneStateStartSeparatePlay::exeWaitDraw() {
-    if (al::isFirstStep(this) && !field_42)
+    if (al::isFirstStep(this) && !mIsCancel)
         getHost()->killPauseMenu();
     if (al::isGreaterEqualStep(this, 2))
         al::setNerve(this, &NrvStageSceneStateStartSeparatePlay.FadeIn);

diff --git a/src/Scene/StageSceneStateStartSeparatePlay.h b/src/Scene/StageSceneStateStartSeparatePlay.h
@@ -32,13 +32,13 @@ class StageSceneStateStartSeparatePlay : public al::HostStateBase<StageSceneStat
     void exeFadeIn();
     void exeWaitDraw();
 
-    bool getField42() const { return field_42; }
+    bool isCancel() const { return mIsCancel; }
 
 private:
     al::GamePadSystem* mGamePadSystem = nullptr;
     al::SimpleLayoutAppearWaitEnd* mControllerGuideMulti = nullptr;
     al::WipeSimple* mWipeSimple = nullptr;
     FooterParts* mFooterParts = nullptr;
     u16 field_40 = 0;
-    bool field_42 = false;
+    bool mIsCancel = false;
 };