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

(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.

Browse Source
This commit is contained in:
michi_cc
2012-02-14 17:04:06 +00:00
parent 8161459cfe
commit 64c5299b4d
15 changed files with 96 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/train_cmd.cpp
View File

@@ -404,6 +404,7 @@ int Train::GetCurrentMaxSpeed() const
}
}
max_speed = min(max_speed, this->current_order.max_speed);
return min(max_speed, this->gcache.cached_max_track_speed);
}
@@ -2748,7 +2749,7 @@ int Train::UpdateSpeed()
switch (_settings_game.vehicle.train_acceleration_model) {
default: NOT_REACHED();
case AM_ORIGINAL:
return this->DoUpdateSpeed(this->acceleration * (this->GetAccelerationStatus() == AS_BRAKE ? -4 : 2), 0, this->gcache.cached_max_track_speed);
return this->DoUpdateSpeed(this->acceleration * (this->GetAccelerationStatus() == AS_BRAKE ? -4 : 2), 0, min(this->gcache.cached_max_track_speed, this->current_order.max_speed));
case AM_REALISTIC:
return this->DoUpdateSpeed(this->GetAcceleration(), this->GetAccelerationStatus() == AS_BRAKE ? 0 : 2, this->GetCurrentMaxSpeed());