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

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/Weapon/CGunWeapon.hpp
View File

@@ -50,9 +50,9 @@ public:
protected:
static const s32 skShootAnim[2];
zeus::CVector3f x4_scale;
rstl::optional<CModelData> x10_solidModelData;
rstl::optional<CModelData> x60_holoModelData;
rstl::optional<CModelData> xb0_suitArmModelData;
std::optional<CModelData> x10_solidModelData;
std::optional<CModelData> x60_holoModelData;
std::optional<CModelData> xb0_suitArmModelData;
std::unique_ptr<CGunController> x100_gunController;
TToken<CAnimCharacterSet> x104_gunCharacter;
std::vector<CToken> x10c_anims;