diff options
author | withmorten <morten.with@gmail.com> | 2021-01-25 14:06:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-25 14:06:53 +0100 |
commit | 9d4053419b213a37e34f39a903b1226c9a6909d1 (patch) | |
tree | e18ceeaef321e70bbd8d0f8d3aa7a9a7a4deb7ff /src/core/Ropes.cpp | |
parent | modelinfo and visibility plg fixes (diff) | |
parent | make building with Codewarrior 7 possible (diff) | |
download | re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.gz re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.bz2 re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.lz re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.xz re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.zst re3-9d4053419b213a37e34f39a903b1226c9a6909d1.zip |
Diffstat (limited to 'src/core/Ropes.cpp')
-rw-r--r-- | src/core/Ropes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/Ropes.cpp b/src/core/Ropes.cpp index dbae9ee3..ffce36f9 100644 --- a/src/core/Ropes.cpp +++ b/src/core/Ropes.cpp @@ -116,7 +116,7 @@ CRopes::RegisterRope(uintptr id, CVector pos, bool setUpdateTimer) aRopes[i].m_unk = false; aRopes[i].m_bWasRegistered = true; aRopes[i].m_updateTimer = setUpdateTimer ? CTimer::GetTimeInMilliseconds() + 20000 : 0; - for(j = 1; j < ARRAY_SIZE(CRope::m_pos); j++){ + for(j = 1; j < ARRAY_SIZE(aRopes[0].m_pos); j++){ if(j & 1) aRopes[i].m_pos[j] = aRopes[i].m_pos[j-1] + CVector(0.0f, 0.0f, 0.625f); else @@ -147,7 +147,7 @@ CRopes::FindCoorsAlongRope(uintptr id, float t, CVector *coors) float f; for(i = 0; i < ARRAY_SIZE(aRopes); i++) if(aRopes[i].m_bActive && aRopes[i].m_id == id){ - t = (ARRAY_SIZE(CRope::m_pos)-1)*clamp(t, 0.0f, 0.999f); + t = (ARRAY_SIZE(aRopes[0].m_pos)-1)*clamp(t, 0.0f, 0.999f); j = t; f = t - j; *coors = (1.0f-f)*aRopes[i].m_pos[j] + f*aRopes[i].m_pos[j+1]; |