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

Merge remote-tracking branch 'origin/master' into hsh

This commit is contained in:
2020-09-28 20:14:09 -04:00
647 changed files with 22984 additions and 10477 deletions

View File

@@ -271,8 +271,8 @@ public:
float x38_rowPitch = 0.f;
CSfxHandle x3c_sliderSfx;
CRumbleGenerator x40_rumbleGen;
bool x134_24_visible : 1;
bool x134_25_exitOptions : 1;
bool x134_24_visible : 1 = true;
bool x134_25_exitOptions : 1 = false;
bool m_touchBarInValue = false;
bool m_touchBarValueDirty = false;
@@ -360,6 +360,7 @@ private:
public:
CFrontEndUI();
~CFrontEndUI();
void StartSlideShow(CArchitectureQueue& queue);
std::string GetAttractMovieFileName(int idx);
std::string GetNextAttractMovieFileName();