2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 06:27:43 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -5,41 +5,38 @@
#include "CGameCubeDoll.hpp"
#include "CQuitGameScreen.hpp"
namespace urde::MP1
{
namespace urde::MP1 {
class COptionsScreen : public CPauseScreenBase
{
std::unique_ptr<CQuitGameScreen> x19c_quitGame;
std::unique_ptr<CGameCubeDoll> x1a0_gameCube;
CSfxHandle x1a4_sliderSfx;
CRumbleGenerator x1a8_rumble;
float x29c_optionAlpha = 0.f;
bool x2a0_24_inOptionBody : 1;
class COptionsScreen : public CPauseScreenBase {
std::unique_ptr<CQuitGameScreen> x19c_quitGame;
std::unique_ptr<CGameCubeDoll> x1a0_gameCube;
CSfxHandle x1a4_sliderSfx;
CRumbleGenerator x1a8_rumble;
float x29c_optionAlpha = 0.f;
bool x2a0_24_inOptionBody : 1;
void UpdateOptionView();
void ResetOptionWidgetVisibility();
void OnSliderChanged(CGuiSliderGroup* caller, float val);
void OnEnumChanged(CGuiTableGroup* caller, int oldSel);
void UpdateOptionView();
void ResetOptionWidgetVisibility();
void OnSliderChanged(CGuiSliderGroup* caller, float val);
void OnEnumChanged(CGuiTableGroup* caller, int oldSel);
public:
COptionsScreen(const CStateManager& mgr, CGuiFrame& frame, const CStringTable& pauseStrg);
~COptionsScreen();
COptionsScreen(const CStateManager& mgr, CGuiFrame& frame, const CStringTable& pauseStrg);
~COptionsScreen();
bool InputDisabled() const;
void Update(float dt, CRandom16& rand, CArchitectureQueue& archQueue);
void Touch();
void ProcessControllerInput(const CFinalInput& input);
void Draw(float transInterp, float totalAlpha, float yOff);
bool VReady() const;
void VActivate();
void RightTableSelectionChanged(int oldSel, int newSel);
void ChangedMode(EMode oldMode);
void UpdateRightTable();
bool ShouldLeftTableAdvance() const;
bool ShouldRightTableAdvance() const;
u32 GetRightTableCount() const;
bool InputDisabled() const;
void Update(float dt, CRandom16& rand, CArchitectureQueue& archQueue);
void Touch();
void ProcessControllerInput(const CFinalInput& input);
void Draw(float transInterp, float totalAlpha, float yOff);
bool VReady() const;
void VActivate();
void RightTableSelectionChanged(int oldSel, int newSel);
void ChangedMode(EMode oldMode);
void UpdateRightTable();
bool ShouldLeftTableAdvance() const;
bool ShouldRightTableAdvance() const;
u32 GetRightTableCount() const;
};
}
} // namespace urde::MP1