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

(svn r12580) -Codechange: merge some logical related to non-stop orders.

Browse Source
This commit is contained in:
rubidium
2008-04-05 15:30:15 +00:00
parent f8b2e84537
commit ed2acd6f3d
4 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/train_cmd.cpp
View File

@@ -302,27 +302,6 @@ enum AccelType {
AM_BRAKE
};
static bool TrainShouldStop(const Vehicle* v, TileIndex tile)
{
const Order* o = &v->current_order;
StationID sid = GetStationIndex(tile);
assert(v->type == VEH_TRAIN);
/* When does a train drive through a station
* first we deal with the "new nonstop handling" */
if (_patches.new_nonstop && o->flags & OFB_NON_STOP && sid == o->dest) {
return false;
}
if (v->last_station_visited == sid) return false;
if (sid != o->dest && (o->flags & OFB_NON_STOP || _patches.new_nonstop)) {
return false;
}
return true;
}
/** new acceleration*/
static int GetTrainAcceleration(Vehicle *v, bool mode)
{
@@ -385,7 +364,7 @@ static int GetTrainAcceleration(Vehicle *v, bool mode)
}
if (IsTileType(v->tile, MP_STATION) && IsFrontEngine(v)) {
if (TrainShouldStop(v, v->tile)) {
if (v->current_order.ShouldStopAtStation(v, GetStationIndex(v->tile))) {
int station_length = GetStationByTile(v->tile)->GetPlatformLength(v->tile, DirToDiagDir(v->direction));
int st_max_speed = 120;