summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-19 13:09:20 +0200
committeraap <aap@papnet.eu>2020-05-19 13:09:20 +0200
commit0d0f4da27ad982c5281f5949c22cb62593e2aab9 (patch)
tree805c36ec1f0023c34d95af13897c8cc8e44de69d
parentscript fix (diff)
downloadre3-0d0f4da27ad982c5281f5949c22cb62593e2aab9.tar
re3-0d0f4da27ad982c5281f5949c22cb62593e2aab9.tar.gz
re3-0d0f4da27ad982c5281f5949c22cb62593e2aab9.tar.bz2
re3-0d0f4da27ad982c5281f5949c22cb62593e2aab9.tar.lz
re3-0d0f4da27ad982c5281f5949c22cb62593e2aab9.tar.xz
re3-0d0f4da27ad982c5281f5949c22cb62593e2aab9.tar.zst
re3-0d0f4da27ad982c5281f5949c22cb62593e2aab9.zip
-rw-r--r--src/core/config.h2
-rw-r--r--src/vehicles/HandlingMgr.cpp2
-rw-r--r--src/vehicles/HandlingMgr.h6
-rw-r--r--src/vehicles/Vehicle.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/config.h b/src/core/config.h
index d9f892a6..40882128 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -65,8 +65,6 @@ enum Config {
NUMATTRIBZONES = 288,
NUMZONEINDICES = 55000,
- NUMHANDLINGS = 57,
-
PATHNODESIZE = 4500,
NUMWEATHERS = 4,
diff --git a/src/vehicles/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp
index 3ac0da38..5beed29e 100644
--- a/src/vehicles/HandlingMgr.cpp
+++ b/src/vehicles/HandlingMgr.cpp
@@ -78,7 +78,7 @@ cHandlingDataMgr::Initialise(void)
{
LoadHandlingData();
field_0 = 0.1f;
- field_4 = 0.9f;
+ fWheelFriction = 0.9f;
field_8 = 1.0f;
field_C = 0.8f;
field_10 = 0.98f;
diff --git a/src/vehicles/HandlingMgr.h b/src/vehicles/HandlingMgr.h
index 398a415f..10e25573 100644
--- a/src/vehicles/HandlingMgr.h
+++ b/src/vehicles/HandlingMgr.h
@@ -60,7 +60,9 @@ enum eHandlingId
HANDLING_PANLANT,
HANDLING_FLATBED,
HANDLING_YANKEE,
- HANDLING_BORGNINE
+ HANDLING_BORGNINE,
+
+ NUMHANDLINGS
};
enum
@@ -120,7 +122,7 @@ class cHandlingDataMgr
{
float field_0; // unused it seems
public:
- float field_4; // wheel related
+ float fWheelFriction; // wheel related
private:
float field_8; //
float field_C; // unused it seems
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 6646f7f3..0dd95faf 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -521,9 +521,9 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon
if(!bBraking){
if(m_fGasPedal < 0.01f){
if(GetModelIndex() == MI_RCBANDIT)
- brake = 0.2f * mod_HandlingManager.field_4 / m_fMass;
+ brake = 0.2f * mod_HandlingManager.fWheelFriction / m_fMass;
else
- brake = mod_HandlingManager.field_4 / m_fMass;
+ brake = mod_HandlingManager.fWheelFriction / m_fMass;
#ifdef FIX_BUGS
brake *= CTimer::GetTimeStepFix();
#endif