Mercurial > hg > openttd

changeset 10981:9a2ce9f2bee3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r15320) -Codechange: Increase 'realistic' acceleration 'resolution' by one bit by reducing a division and removing a multiplication: 3/4*2 = 0; 3/2 = 1. And a smidgeon less CPU usage, hah.
author peter1138 <peter1138@openttd.org>
date Mon, 02 Feb 2009 21:38:36 +0000
parents d3d8d9b67892
children bb9f7c744e3b
files src/train_cmd.cpp
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -504,9 +504,9 @@
 	}
 
 	if (mode == AM_ACCEL) {
-		return (force - resistance) / (mass * 4);
+		return (force - resistance) / (mass * 2);
 	} else {
-		return min((-force - resistance) / (mass * 4), -10000 / (mass * 4));
+		return min((-force - resistance) / mass, -10000 / mass);
 	}
 }
 
@@ -3255,18 +3255,18 @@
 	if (v->vehstatus & VS_STOPPED || HasBit(v->u.rail.flags, VRF_REVERSING) || HasBit(v->u.rail.flags, VRF_TRAIN_STUCK)) {
 		switch (_settings_game.vehicle.train_acceleration_model) {
 			default: NOT_REACHED();
-			case TAM_ORIGINAL:  accel = v->acceleration * -2; break;
-			case TAM_REALISTIC: accel = GetTrainAcceleration(v, AM_BRAKE) * 2; break;
+			case TAM_ORIGINAL:  accel = v->acceleration * -4; break;
+			case TAM_REALISTIC: accel = GetTrainAcceleration(v, AM_BRAKE); break;
 		}
 	} else {
 		switch (_settings_game.vehicle.train_acceleration_model) {
 			default: NOT_REACHED();
-			case TAM_ORIGINAL:  accel = v->acceleration; break;
+			case TAM_ORIGINAL:  accel = v->acceleration * 2; break;
 			case TAM_REALISTIC: accel = GetTrainAcceleration(v, AM_ACCEL); break;
 		}
 	}
 
-	uint spd = v->subspeed + accel * 2;
+	uint spd = v->subspeed + accel;
 	v->subspeed = (byte)spd;
 	{
 		int tempmax = v->max_speed;