summaryrefslogtreecommitdiffstats
path: root/src/render/Fluff.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-07-02 10:28:46 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-07-02 10:28:46 +0200
commit10cc444482b52d6e82b624bbbb7d87c48dcf48e2 (patch)
tree2c80031552d77909220ed7bd66a7e055aa3e5b45 /src/render/Fluff.cpp
parentMerge remote-tracking branch 'upstream/lcs' into lcs (diff)
parentMerge branch 'miami' into lcs (diff)
downloadre3-10cc444482b52d6e82b624bbbb7d87c48dcf48e2.tar
re3-10cc444482b52d6e82b624bbbb7d87c48dcf48e2.tar.gz
re3-10cc444482b52d6e82b624bbbb7d87c48dcf48e2.tar.bz2
re3-10cc444482b52d6e82b624bbbb7d87c48dcf48e2.tar.lz
re3-10cc444482b52d6e82b624bbbb7d87c48dcf48e2.tar.xz
re3-10cc444482b52d6e82b624bbbb7d87c48dcf48e2.tar.zst
re3-10cc444482b52d6e82b624bbbb7d87c48dcf48e2.zip
Diffstat (limited to 'src/render/Fluff.cpp')
-rw-r--r--src/render/Fluff.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index ef167708..b6a7e766 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -23,6 +23,7 @@
#include "World.h"
#include "Replay.h"
#include "Coronas.h"
+#include "SaveBuf.h"
CPlaneTrail CPlaneTrails::aArray[6];
RwImVertexIndex TrailIndices[32] = {
@@ -1155,7 +1156,7 @@ void CScriptPath::Update(void) {
return;
m_fPosition += m_fSpeed * CTimer::GetTimeStepInSeconds();
- m_fPosition = clamp(m_fPosition, 0.0f, m_fTotalLength);
+ m_fPosition = Clamp(m_fPosition, 0.0f, m_fTotalLength);
if (m_pObjects[0] || m_pObjects[1] || m_pObjects[2] || m_pObjects[3]
|| m_pObjects[4] || m_pObjects[5]) {
@@ -1268,7 +1269,7 @@ INITSAVEBUF
aArray[i].Clear();
for (int32 i = 0; i < 3; i++) {
- aArray[i] = ReadSaveBuf<CScriptPath>(buf);
+ ReadSaveBuf(&aArray[i], buf);
for (int32 j = 0; j < 6; j++) {
CScriptPath *pPath = &aArray[i];
@@ -1280,7 +1281,7 @@ INITSAVEBUF
aArray[i].m_pNode = new CPlaneNode[aArray[i].m_numNodes];
for (int32 j = 0; j < aArray[i].m_numNodes; j++) {
- aArray[i].m_pNode[j] = ReadSaveBuf<CPlaneNode>(buf);
+ ReadSaveBuf(&aArray[i].m_pNode[j], buf);
}
}
VALIDATESAVEBUF(size)