diff options
| -rw-r--r-- | src/collision/ColModel.cpp | 1 | ||||
| -rw-r--r-- | src/core/PlayerInfo.cpp | 2 | ||||
| -rw-r--r-- | src/modelinfo/BaseModelInfo.h | 2 | ||||
| -rw-r--r-- | src/render/Fluff.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/src/collision/ColModel.cpp b/src/collision/ColModel.cpp index d2e01f50..49847dbd 100644 --- a/src/collision/ColModel.cpp +++ b/src/collision/ColModel.cpp @@ -24,7 +24,6 @@ CColModel::CColModel(void) CColModel::~CColModel(void) { RemoveCollisionVolumes(); - RemoveTrianglePlanes(); } void* diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index 77ddfdb1..7289175d 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -132,7 +132,7 @@ CPlayerInfo::Process(void) CAutomobile *car = (CAutomobile*)m_pPed->m_pMyVehicle; if (car->m_nWheelsOnGround < 3) - m_nTimeNotFullyOnGround += CTimer::GetTimeInMilliseconds(); + m_nTimeNotFullyOnGround += CTimer::GetTimeStepInMilliseconds(); else m_nTimeNotFullyOnGround = 0; diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h index b76736c0..a93040b1 100644 --- a/src/modelinfo/BaseModelInfo.h +++ b/src/modelinfo/BaseModelInfo.h @@ -44,8 +44,8 @@ public: #endif virtual void Shutdown(void); virtual void DeleteRwObject(void) = 0; - virtual RwObject *CreateInstance(RwMatrix *) = 0; virtual RwObject *CreateInstance(void) = 0; + virtual RwObject *CreateInstance(RwMatrix *) = 0; virtual RwObject *GetRwObject(void) = 0; virtual void SetAnimFile(const char *file) {} virtual void ConvertAnimFileIndex(void) {} diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp index be5c0d6f..e28ebc8e 100644 --- a/src/render/Fluff.cpp +++ b/src/render/Fluff.cpp @@ -936,7 +936,7 @@ CEscalator::AddThisOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, b m_lowerEnd = magnitudes[0] / length; m_upperEnd = (magnitudes[0] + magnitudes[1]) / length; - m_stepsCount = Max(24.0f, length / 0.6f); + m_stepsCount = Min(24.0f, length / 0.6f); CVector direction(m_pos0.x - m_pos1.x, m_pos0.y - m_pos1.y, 0.0f); direction.Normalise(); diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index c2bca63e..e1e00667 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -913,7 +913,7 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon float turnImpulse = turnSpeed*GetMass(wheelContactPoint, turnDirection); ApplyMoveForce(impulse * direction); - ApplyTurnForce(turnImpulse * direction, wheelContactPoint); + ApplyTurnForce(turnImpulse * turnDirection, wheelContactPoint); } } |