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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/CSamusDoll.hpp
View File

@@ -37,10 +37,10 @@ class CSamusDoll {
zeus::CQuaternion xb0_userRot;
float xc0_userZoom = -3.6f;
float xc4_viewInterp = 0.f;
rstl::optional<CModelData> xc8_suitModel0;
std::optional<CModelData> xc8_suitModel0;
rstl::reserved_vector<TCachedToken<CSkinnedModel>, 2> x118_suitModel1and2;
rstl::optional<CModelData> x134_suitModelBoots;
rstl::optional<CModelData> x184_ballModelData;
std::optional<CModelData> x134_suitModelBoots;
std::optional<CModelData> x184_ballModelData;
TLockedToken<CModel> x1d4_spiderBallGlass;
u32 x1e0_ballMatIdx;
u32 x1e4_glassMatIdx;