2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:07:42 +00:00

Various bug fixes and CAnimTree implementations

This commit is contained in:
Jack Andersen
2018-01-03 18:17:44 -10:00
parent 53bb9f1ba0
commit 99fc9e3598
38 changed files with 339 additions and 140 deletions

View File

@@ -14,12 +14,19 @@ namespace MP1
class CInventoryScreen : public CPauseScreenBase
{
enum class EState
{
Active,
Leaving,
Inactive
};
std::unique_ptr<CSamusDoll> x19c_samusDoll;
float x1a0_ = 0.f;
float x1a4_textBodyAlpha = 0.f;
u32 x1a8_ = 0;
bool x1ac_ = false;
bool x1ad_textBodyVisible;
EState x1a8_state = EState::Active;
bool x1ac_textLeaveRequested = false;
bool x1ad_textViewing;
void UpdateSamusDollPulses();
bool HasLeftInventoryItem(int idx) const;
@@ -39,7 +46,7 @@ public:
float GetCameraYBias() const;
bool VReady() const;
void VActivate();
void RightTableSelectionChanged(int selBegin, int selEnd);
void RightTableSelectionChanged(int oldSel, int newSel);
void ChangedMode(EMode oldMode);
void UpdateRightTable();
bool ShouldLeftTableAdvance() const;