summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-28 10:23:28 +0200
committerGitHub <noreply@github.com>2020-05-28 10:23:28 +0200
commitab7a21e017b8df907c381bb63709c121e3fcb297 (patch)
treeb800e4de4813630b7fbb64c6bb6a97e858894896 /src/vehicles
parentcockbuilding ejaculation fix (diff)
parentrem unnecessary asserts (diff)
downloadre3-ab7a21e017b8df907c381bb63709c121e3fcb297.tar
re3-ab7a21e017b8df907c381bb63709c121e3fcb297.tar.gz
re3-ab7a21e017b8df907c381bb63709c121e3fcb297.tar.bz2
re3-ab7a21e017b8df907c381bb63709c121e3fcb297.tar.lz
re3-ab7a21e017b8df907c381bb63709c121e3fcb297.tar.xz
re3-ab7a21e017b8df907c381bb63709c121e3fcb297.tar.zst
re3-ab7a21e017b8df907c381bb63709c121e3fcb297.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Boat.cpp8
-rw-r--r--src/vehicles/Boat.h10
2 files changed, 9 insertions, 9 deletions
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp
index 66e83c8f..99b6cbb8 100644
--- a/src/vehicles/Boat.cpp
+++ b/src/vehicles/Boat.cpp
@@ -27,12 +27,12 @@
float fShapeLength = 0.4f;
float fShapeTime = 0.05f;
-float fRangeMult = 0.75f; //0.6f; // 0.75f gta 3
+float fRangeMult = 0.6f;
float fTimeMult;
-float MAX_WAKE_LENGTH = 50.0f;
-float MIN_WAKE_INTERVAL = 1.0f;
-float WAKE_LIFETIME = 400.0f;
+float CBoat::MAX_WAKE_LENGTH = 50.0f;
+float CBoat::MIN_WAKE_INTERVAL = 2.0f;
+float CBoat::WAKE_LIFETIME = 150.0f;
CBoat *CBoat::apFrameWakeGeneratingBoats[4];
diff --git a/src/vehicles/Boat.h b/src/vehicles/Boat.h
index c8168db0..c6f4b7ad 100644
--- a/src/vehicles/Boat.h
+++ b/src/vehicles/Boat.h
@@ -45,6 +45,10 @@ public:
CVector2D m_avec2dWakePoints[32];
float m_afWakePointLifeTime[32];
+ static float MAX_WAKE_LENGTH;
+ static float MIN_WAKE_INTERVAL;
+ static float WAKE_LIFETIME;
+
CBoat(int, uint8);
virtual void SetModelIndex(uint32 id);
@@ -75,8 +79,4 @@ public:
#endif
static const uint32 nSaveStructSize;
-};
-
-extern float MAX_WAKE_LENGTH;
-extern float MIN_WAKE_INTERVAL;
-extern float WAKE_LIFETIME; \ No newline at end of file
+}; \ No newline at end of file