From 3d73c595c0e856e96cccb1ef3796de67c9b1fc17 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 22 Sep 2024 17:00:06 -0600 Subject: [PATCH] Fix build --- include/MetroidPrime/CFluidPlane.hpp | 5 ++++- src/MetroidPrime/CCredits.cpp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/MetroidPrime/CFluidPlane.hpp b/include/MetroidPrime/CFluidPlane.hpp index 88315b3e..4fd4ce01 100644 --- a/include/MetroidPrime/CFluidPlane.hpp +++ b/include/MetroidPrime/CFluidPlane.hpp @@ -7,8 +7,11 @@ #include "Kyoto/Math/CVector3f.hpp" #include "Kyoto/TToken.hpp" +#include "rstl/optional_object.hpp" + class CScriptWater; class CStateManager; +class CTexture; extern "C" uint sub_8012f098(); @@ -44,7 +47,7 @@ public: // GetTexturePattern1__11CFluidPlaneCFv // HasTexturePattern1__11CFluidPlaneCFv -// protected: +protected: virtual void RenderStripWithRipples(const CFluidPlaneCPURender::SHFieldSample& heights, const unsigned char& flags, float curY, int startYDiv, const CFluidPlaneCPURender::SPatchInfo& info); diff --git a/src/MetroidPrime/CCredits.cpp b/src/MetroidPrime/CCredits.cpp index 4b3ce09a..0040a6b7 100644 --- a/src/MetroidPrime/CCredits.cpp +++ b/src/MetroidPrime/CCredits.cpp @@ -189,7 +189,7 @@ CIOWin::EMessageReturn CCredits::Update(float dt, CArchitectureQueue& queue) { CIOWin::EMessageReturn CCredits::ProcessUserInput(const CFinalInput& input) { if (input.DA()) { - x48_ = CMath::Clamp(0.f, x48_ - ((x50_ * input.DeltaTime())), x4c_); + x48_ = CMath::Clamp(0.f, x48_ - ((x50_ * input.Time())), x4c_); } else { float leftY = input.ALAUp(); float offset = 0.f; @@ -197,7 +197,7 @@ CIOWin::EMessageReturn CCredits::ProcessUserInput(const CFinalInput& input) { offset = -leftY; leftY = 0.f; } - x48_ = CMath::Clamp(0.f, x48_ - (leftY - offset) * 10.f * x50_ * input.DeltaTime(), x4c_); + x48_ = CMath::Clamp(0.f, x48_ - (leftY - offset) * 10.f * x50_ * input.Time(), x4c_); } return kMR_Exit; }