mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(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.

This commit is contained in:
peter1138 2009-02-02 21:38:36 +00:00
parent 5105cd2c6b
commit 48e6e7d586
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/train_cmd.cpp
View File

@ -504,9 +504,9 @@ static int GetTrainAcceleration(Vehicle *v, bool mode)
}
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 @@ static int UpdateTrainSpeed(Vehicle *v)
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;