(svn r21189) -Fix: Force a minimum speed for trains when using the realistic acceleration model.

This commit is contained in:
terkhen 2010-11-14 15:48:24 +00:00
parent 41c97d051f
commit eda95bb85c

View File

@ -2799,7 +2799,9 @@ int Train::UpdateSpeed()
if (this->cur_speed > max_speed) {
tempmax = this->cur_speed - (this->cur_speed / 10) - 1;
}
this->cur_speed = spd = Clamp(this->cur_speed + ((int)spd >> 8), 0, tempmax);
/* Force a minimum speed of 1 km/h when realistic acceleration is on. */
int min_speed = (_settings_game.vehicle.train_acceleration_model == AM_ORIGINAL) ? 0 : 2;
this->cur_speed = spd = Clamp(this->cur_speed + ((int)spd >> 8), min_speed, tempmax);
}
int scaled_spd = this->GetAdvanceSpeed(spd);