AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 07:07:42 +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

12
Runtime/World/CScriptWater.hpp
View File

@@ -31,12 +31,12 @@ class CScriptWater : public CScriptTrigger {
CAssetId x230_splashParticle2Id;
CAssetId x234_splashParticle3Id;
CAssetId x238_visorRunoffParticleId;
rstl::optional<TLockedToken<CGenDescription>> x23c_visorRunoffEffect;
std::optional<TLockedToken<CGenDescription>> x23c_visorRunoffEffect;
CAssetId x24c_unmorphVisorRunoffParticleId;
rstl::optional<TLockedToken<CGenDescription>> x250_unmorphVisorRunoffEffect;
std::optional<TLockedToken<CGenDescription>> x250_unmorphVisorRunoffEffect;
u16 x260_visorRunoffSfx;
u16 x262_unmorphVisorRunoffSfx;
rstl::reserved_vector<rstl::optional<TLockedToken<CGenDescription>>, 3> x264_splashEffects;
rstl::reserved_vector<std::optional<TLockedToken<CGenDescription>>, 3> x264_splashEffects;
rstl::reserved_vector<u16, 3> x298_splashSounds;
zeus::CColor x2a4_splashColor;
zeus::CColor x2a8_insideFogColor;
@@ -102,7 +102,7 @@ public:
const CWeaponMode&, EProjectileAttrib) const;
u16 GetSplashSound(float) const;
const rstl::optional<TLockedToken<CGenDescription>>& GetSplashEffect(float) const;
const std::optional<TLockedToken<CGenDescription>>& GetSplashEffect(float) const;
float GetSplashEffectScale(float) const;
u32 GetSplashIndex(float) const;
CFluidPlaneCPU& FluidPlane() { return *x1b4_fluidPlane; }
@@ -115,11 +115,11 @@ public:
void SetFrustumPlanes(const zeus::CFrustum& frustum) { x150_frustum = frustum; }
const zeus::CFrustum& GetFrustumPlanes() const { return x150_frustum; }
CFluidPlaneCPU& GetFluidPlane() const { return *x1b4_fluidPlane; }
const rstl::optional<TLockedToken<CGenDescription>>& GetVisorRunoffEffect() const {
const std::optional<TLockedToken<CGenDescription>>& GetVisorRunoffEffect() const {
return x23c_visorRunoffEffect;
}
u16 GetVisorRunoffSfx() const { return x260_visorRunoffSfx; }
const rstl::optional<TLockedToken<CGenDescription>>& GetUnmorphVisorRunoffEffect() const {
const std::optional<TLockedToken<CGenDescription>>& GetUnmorphVisorRunoffEffect() const {
return x250_unmorphVisorRunoffEffect;
}
u16 GetUnmorphVisorRunoffSfx() const { return x262_unmorphVisorRunoffSfx; }