From c8a64745df14b266240c1216ea5245215f8a86d4 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 25 Dec 2024 15:40:47 -0800 Subject: [PATCH] Link CWeaponDescription --- configure.py | 2 +- include/MetroidPrime/Cameras/CCameraShakeData.hpp | 3 +-- src/Kyoto/Particles/CGenDescription.cpp | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index 099b9dab..f0a47487 100755 --- a/configure.py +++ b/configure.py @@ -797,7 +797,7 @@ config.libs = [ Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Weapons/IWeaponRenderer.cpp"), Object(NonMatching, "Weapons/CDecalDataFactory.cpp"), Object(NonMatching, "Weapons/CDecal.cpp"), - Object(NonMatching, "Weapons/CWeaponDescription.cpp"), + Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Weapons/CWeaponDescription.cpp"), Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Weapons/CDecalDescription.cpp"), ], ), diff --git a/include/MetroidPrime/Cameras/CCameraShakeData.hpp b/include/MetroidPrime/Cameras/CCameraShakeData.hpp index c1473de0..da87ed08 100644 --- a/include/MetroidPrime/Cameras/CCameraShakeData.hpp +++ b/include/MetroidPrime/Cameras/CCameraShakeData.hpp @@ -59,8 +59,7 @@ public: , x8_shakerX() , x44_shakerY() , x80_shakerZ(true, SCameraShakePoint(false, 0.25f * duration, 0.f, 0.75f * duration, magnitude), - SCameraShakePoint(true, 0.f, 0.f, 0.5f * duration, 2.f)) {} - + SCameraShakePoint(true, 0.f, 0.f, 0.5f * duration, 2.f)) {} void SetId(int id) { xbc_shakerId = id; } int GetId() const { return xbc_shakerId; } void Update(float dt, CStateManager& mgr); diff --git a/src/Kyoto/Particles/CGenDescription.cpp b/src/Kyoto/Particles/CGenDescription.cpp index f9058a51..b71a1906 100644 --- a/src/Kyoto/Particles/CGenDescription.cpp +++ b/src/Kyoto/Particles/CGenDescription.cpp @@ -1,4 +1,6 @@ #include "Kyoto/Particles/CGenDescription.hpp" +#include "Kyoto/Particles/CSpawnSystemKeyframeData.hpp" +#include "rstl/single_ptr.hpp" static IElement** element_from_desc(CGenDescription* gen, int idx) {