PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build

This commit is contained in:
Luke Street 2024-09-22 17:00:06 -06:00
parent 1b6a756648
commit 3d73c595c0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/MetroidPrime/CFluidPlane.hpp
View File

@ -7,8 +7,11 @@
#include "Kyoto/Math/CVector3f.hpp" #include "Kyoto/Math/CVector3f.hpp"
#include "Kyoto/TToken.hpp" #include "Kyoto/TToken.hpp"
#include "rstl/optional_object.hpp"
class CScriptWater; class CScriptWater;
class CStateManager; class CStateManager;
class CTexture;
extern "C" uint sub_8012f098(); extern "C" uint sub_8012f098();
@ -44,7 +47,7 @@ public:
// GetTexturePattern1__11CFluidPlaneCFv // GetTexturePattern1__11CFluidPlaneCFv
// HasTexturePattern1__11CFluidPlaneCFv // HasTexturePattern1__11CFluidPlaneCFv
// protected: protected:
virtual void RenderStripWithRipples(const CFluidPlaneCPURender::SHFieldSample& heights, virtual void RenderStripWithRipples(const CFluidPlaneCPURender::SHFieldSample& heights,
const unsigned char& flags, float curY, int startYDiv, const unsigned char& flags, float curY, int startYDiv,
const CFluidPlaneCPURender::SPatchInfo& info); const CFluidPlaneCPURender::SPatchInfo& info);

4
src/MetroidPrime/CCredits.cpp
View File

@ -189,7 +189,7 @@ CIOWin::EMessageReturn CCredits::Update(float dt, CArchitectureQueue& queue) {
CIOWin::EMessageReturn CCredits::ProcessUserInput(const CFinalInput& input) { CIOWin::EMessageReturn CCredits::ProcessUserInput(const CFinalInput& input) {
if (input.DA()) { if (input.DA()) {
x48_ = CMath::Clamp(0.f, x48_ - ((x50_ * input.DeltaTime())), x4c_); x48_ = CMath::Clamp(0.f, x48_ - ((x50_ * input.Time())), x4c_);
} else { } else {
float leftY = input.ALAUp(); float leftY = input.ALAUp();
float offset = 0.f; float offset = 0.f;
@ -197,7 +197,7 @@ CIOWin::EMessageReturn CCredits::ProcessUserInput(const CFinalInput& input) {
offset = -leftY; offset = -leftY;
leftY = 0.f; 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; return kMR_Exit;
} }