PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-07-14 21:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Link CWeaponDescription

Browse Source
This commit is contained in:
Phillip Stephens 2024-12-25 15:40:47 -08:00
parent 68fe642582
commit c8a64745df
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -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"),
],
),

3
include/MetroidPrime/Cameras/CCameraShakeData.hpp
View File

@ -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);

2
src/Kyoto/Particles/CGenDescription.cpp
View File

@ -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) {