fix GetSpeedDir < 0

stuntrally · May 3, 2024 · ca36475 · ca36475
1 parent df28d71
commit ca36475
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/game/CarPosInfo.cpp b/src/game/CarPosInfo.cpp
@@ -103,7 +103,9 @@ void PosInfo::FromCar(CAR* pCar)
 	speed = pCar->GetSpeed();
 	fboost = cd->boostVal;	//posInfo.steer = cd->steer;
 	braking = cd->IsBraking();  //percent = outside
-	reverse = cd->GetTransmission().GetCurrentGearRatio() < 0.0;
+	reverse = cd->vtype != V_Car ?
+		pCar->GetSpeedometer() < 0.0 :
+		cd->GetTransmission().GetCurrentGearRatio() < 0.0;
 	hov_throttle = cd->hov_throttle;
 
 	fHitTime = cd->fHitTime;  fParIntens = cd->fParIntens;  fParVel = cd->fParVel;

diff --git a/src/vdrift/car.h b/src/vdrift/car.h
@@ -86,7 +86,7 @@ class CAR
 	float GetSpeedometer() const
 	{
 		return dynamics.vtype != V_Car ?
-			dynamics.GetVelocity().Magnitude() : dynamics.GetSpeedMPS();
+			dynamics.GetSpeedDir() : dynamics.GetSpeedMPS();
 	}
 
 	std::string GetCarType() const	{	return cartype;	}

diff --git a/src/vdrift/cardynamics.cpp b/src/vdrift/cardynamics.cpp
@@ -2,6 +2,7 @@
 #include "pch.h"
 #include "par.h"
 #include "cardefs.h"
+#include "mathvector.h"
 #include "cardynamics.h"
 #include "tobullet.h"
 #include "Def_Str.h"
@@ -44,7 +45,7 @@ float CARDYNAMICS::GetMass() const
 Dbl CARDYNAMICS::GetSpeed() const
 {
 	return body.GetVelocity().Magnitude();
-	//return chassis->getLinearVelocity().length();
+	// const auto& v = chassis->getLinearVelocity();
 }
 
 Dbl CARDYNAMICS::GetSpeedDir() const
@@ -53,7 +54,7 @@ Dbl CARDYNAMICS::GetSpeedDir() const
 	Orientation().RotateVector(v);
 
 	Dbl vel = body.GetVelocity().dot(v);  // car body vel in local car direction
-	return sqrt(vel*vel);
+	return vel < 0.0 ? -sqrt(vel*vel) : sqrt(vel*vel);
 }
 
 MATHVECTOR<Dbl,3> CARDYNAMICS::GetVelocity() const