summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-07-17 14:49:28 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-07-17 14:49:28 +0200
commitcb7f18f268e9ea42bb20f12a0b311546145583cb (patch)
treeb7ade9744453be15038816a72ff8145f7447572a
parentMerge remote-tracking branch 'upstream/lcs' into lcs (diff)
downloadre3-cb7f18f268e9ea42bb20f12a0b311546145583cb.tar
re3-cb7f18f268e9ea42bb20f12a0b311546145583cb.tar.gz
re3-cb7f18f268e9ea42bb20f12a0b311546145583cb.tar.bz2
re3-cb7f18f268e9ea42bb20f12a0b311546145583cb.tar.lz
re3-cb7f18f268e9ea42bb20f12a0b311546145583cb.tar.xz
re3-cb7f18f268e9ea42bb20f12a0b311546145583cb.tar.zst
re3-cb7f18f268e9ea42bb20f12a0b311546145583cb.zip
-rw-r--r--src/vehicles/Ferry.cpp4
-rw-r--r--src/vehicles/Ferry.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicles/Ferry.cpp b/src/vehicles/Ferry.cpp
index 1ae1fb6c..89a0de9f 100644
--- a/src/vehicles/Ferry.cpp
+++ b/src/vehicles/Ferry.cpp
@@ -103,8 +103,8 @@ void CFerry::Init(void* pInstancePtr)
float t = 0.0f;
for (i = 0; i < pPath->NumTrackNodes; i++) {
pPath->aTrackNodes[i].t = t;
- t += Sqrt(SQR(pPath->aTrackNodes[(i + 1) % pPath->NumTrackNodes].x - pPath->aTrackNodes[i].x)) +
- (SQR(pPath->aTrackNodes[(i + 1) % pPath->NumTrackNodes].y - pPath->aTrackNodes[i].y));
+ t += Sqrt(SQR(pPath->aTrackNodes[(i + 1) % pPath->NumTrackNodes].x - pPath->aTrackNodes[i].x) +
+ (SQR(pPath->aTrackNodes[(i + 1) % pPath->NumTrackNodes].y - pPath->aTrackNodes[i].y)));
}
pPath->TotalLengthOfTrack = t;
diff --git a/src/vehicles/Ferry.h b/src/vehicles/Ferry.h
index 2615a629..f7936da9 100644
--- a/src/vehicles/Ferry.h
+++ b/src/vehicles/Ferry.h
@@ -78,7 +78,7 @@ public:
class CFerry : public CVehicle
{
public:
- uint16 m_nFerryId;
+ int16 m_nFerryId;
uint16 m_isFarAway;
uint16 m_nCurTrackNode;
float m_fSpeed;