2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-17 04:47:09 +00:00

CActorContraption fixes, better CMake dependency handling

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

View File

@@ -15,10 +15,10 @@ class CMetroidData {
float xdc_;
float xe0_;
float xe4_;
rstl::optional<CAnimationParameters> xe8_animParms1;
rstl::optional<CAnimationParameters> xf8_animParms2;
rstl::optional<CAnimationParameters> x108_animParms3;
rstl::optional<CAnimationParameters> x118_animParms4;
std::optional<CAnimationParameters> xe8_animParms1;
std::optional<CAnimationParameters> xf8_animParms2;
std::optional<CAnimationParameters> x108_animParms3;
std::optional<CAnimationParameters> x118_animParms4;
bool x128_24_ : 1;
public: