dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix excessive amounts of vehicle smoke when reversing at waypoints.

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-10-29 00:55:12 +00:00
parent 7bcd090a0f
commit 79da755c45
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/train_cmd.cpp
View File

@@ -3095,6 +3095,17 @@ static Vehicle *CheckTrainAtSignal(Vehicle *v, void *data)
return t;
}
uint16 ReversingDistanceTargetSpeed(const Train *v)
{
int target_speed;
if (_settings_game.vehicle.train_acceleration_model == AM_REALISTIC) {
target_speed = ((v->reverse_distance - 1) * 5) / 2;
} else {
target_speed = (v->reverse_distance - 1) * 10 - 5;
}
return max(0, target_speed);
}
/**
* Move a vehicle chain one movement stop forwards.
* @param v First vehicle to move.
@@ -3113,14 +3124,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
}
if (v->reverse_distance > 1) {
v->vehstatus |= VS_TRAIN_SLOWING;
int target_speed;
if (_settings_game.vehicle.train_acceleration_model == AM_REALISTIC) {
target_speed = ((v->reverse_distance - 1) * 5) / 2;
} else {
target_speed = (v->reverse_distance - 1) * 10 - 5;
}
uint16 spd = max(0, target_speed);
uint16 spd = ReversingDistanceTargetSpeed(v);
if (spd < v->cur_speed) v->cur_speed = spd;
}