# HG changeset patch
# User peter1138 <peter1138@openttd.org>
# Date 2006-12-07 14:44:26
# Node ID 2a38f35676d583498b5a380883b05b1f854c4ae1
# Parent  34225933bc45ac675654a2c2b1de5f22e45a0ee9

(svn r7421) -Fix (r2475): Changed "kick off" acceleration resulted in only a small amount of power being applied whilst moving off and then double the power at 1 mph. This resulted in a perceived delay before trains moved. Fix this by applying the full power of the engine (or the kick off, whichever is greater). Essay over.

diff --git a/train_cmd.c b/train_cmd.c
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -400,7 +400,9 @@ static int GetTrainAcceleration(Vehicle 
 	resistance += incl;
 	resistance *= 4; //[N]
 
-	if (speed > 0) {
+	/* Due to the mph to m/s conversion below, at speeds below 3 mph the force is
+	 * actually double the train's power */
+	if (speed > 2) {
 		switch (v->u.rail.railtype) {
 			case RAILTYPE_RAIL:
 			case RAILTYPE_ELECTRIC:
@@ -416,7 +418,7 @@ static int GetTrainAcceleration(Vehicle 
 		}
 	} else {
 		//"kickoff" acceleration
-		force = (mass * 8) + resistance;
+		force = max(power, (mass * 8) + resistance);
 	}
 
 	if (force <= 0) force = 10000;