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

4
Runtime/World/CScriptWater.cpp
View File

@@ -424,7 +424,7 @@ void CScriptWater::Render(const CStateManager& mgr) const {
zeus::CTransform xf = x34_transform;
xf.origin.z() += zOffset;
zeus::CVector3f areaCenter = mgr.GetWorld()->GetAreaAlways(mgr.GetNextAreaId())->GetAABB().center();
rstl::optional<CRippleManager> rippleMan(mgr.GetFluidPlaneManager()->GetRippleManager());
std::optional<CRippleManager> rippleMan(mgr.GetFluidPlaneManager()->GetRippleManager());
x1b4_fluidPlane->Render(mgr, x2bc_alpha, aabb, xf, mgr.GetWorld()->GetAreaAlways(x4_areaId)->GetTransform(), false,
x150_frustum, rippleMan, x8_uid, x2d8_tileIntersects.get(), x2c4_gridDimX, x2c8_gridDimY,
areaCenter);
@@ -499,7 +499,7 @@ EWeaponCollisionResponseTypes CScriptWater::GetCollisionResponseType(const zeus:
u16 CScriptWater::GetSplashSound(float mag) const { return x298_splashSounds[GetSplashIndex(mag)]; }
const rstl::optional<TLockedToken<CGenDescription>>& CScriptWater::GetSplashEffect(float mag) const {
const std::optional<TLockedToken<CGenDescription>>& CScriptWater::GetSplashEffect(float mag) const {
return x264_splashEffects[GetSplashIndex(mag)];
}