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

Windows build fixes and warning avoidance

Browse Source
This commit is contained in:
Jack Andersen
2018-05-24 20:39:38 -10:00
parent 3ceaa82035
commit 70b3404b7c
195 changed files with 428 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/MP1/CSlideShow.hpp
View File

@@ -56,6 +56,7 @@ public:
private:
Phase x14_phase = Phase::Zero;
std::vector<TLockedToken<CDependencyGroup>> x18_galleryTXTRDeps;
/*
u32 x2c_ = 0;
u32 x30_ = 0;
u32 x34_ = 0;
@@ -68,29 +69,36 @@ private:
float x50_ = 0.f;
float x54_ = 0.f;
float x58_ = 0.f;
*/
SSlideData x5c_slideA;
SSlideData x90_slideB;
std::unique_ptr<CGuiTextSupport> xc4_textA;
std::unique_ptr<CGuiTextSupport> xc8_textB;
/*
u32 xcc_ = 0;
u32 xd4_ = 0;
u32 xd8_ = 0;
u32 xdc_ = 0;
u32 xe0_ = 0;
*/
CSfxHandle xe4_;
/*
u32 xe8_ = 0;
u32 xec_ = 0;
u32 xf0_ = 0;
u32 xf4_ = 0;
*/
std::vector<TLockedToken<CTexture>> xf8_stickTextures; /* (9 LStick, 9 CStick) */
std::vector<CToken> x108_buttonTextures; /* (2L, 2R, 2B, 2Y) */
/*
u32 x11c_ = 0;
u32 x120_ = 0;
u32 x124_ = 0;
float x128_ = 32.f;
float x12c_ = 32.f;
*/
float x130_;
union