From 40edb5a9372be5a29deea2f1c563c0321b08b1a5 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 28 Mar 2010 11:13:24 +0100
Subject: [PATCH] Fix braking and stopping (again)

---
 src/Engine.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Engine.cpp b/src/Engine.cpp
index 3706c6f..b42d2ef 100644
--- a/src/Engine.cpp
+++ b/src/Engine.cpp
@@ -189,8 +189,11 @@ double Engine::brakeForce() const
       dir = -1.0;
    else
       dir = 1.0;
-   
-   return myMass * g * beta * dir;
+
+   if (abs(mySpeed) < STOP_SPEED)
+      return 0.0;
+   else 
+      return myMass * g * beta * dir;
 }
 
 // Compute the next state of the engine
@@ -222,16 +225,16 @@ void Engine::update(int delta, float gradient)
    const double deltaSeconds = delta / 1000.0f;
    const double a = ((netP - Q - B + G) / myMass) * deltaSeconds;
 
-   //   mySpeed = max(mySpeed + a, 0.0);
-   if (abs(mySpeed) < STOP_SPEED && myThrottle == 0 && isBrakeOn) {
-      mySpeed = 0.0;
+   if (abs(mySpeed) < STOP_SPEED && myThrottle == 0) {
+      if (isBrakeOn)
+         mySpeed = 0.0;
       haveStopped = true;
    }
-   else {
-      mySpeed += a;
+   else
       haveStopped = false;
-   }
-
+   
+   mySpeed += a;
+     
 #if 0
    debug() << "P=" << netP << ", Q=" << Q
            << ", B=" << B
-- 
2.39.2