gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-03 21:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r19785) -Codechange: reorder/rework the checks for CheckNextTrainTile a bit, causing the whole function to be a few percent faster and hopefully better to understand

Browse Source
This commit is contained in:
rubidium 2010-05-11 14:16:16 +00:00
parent 38d60f4b47
commit e594042fb7
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/train_cmd.cpp
View File

@ -2118,14 +2118,32 @@ static void CheckNextTrainTile(Train *v)
/* Don't do any look-ahead if path_backoff_interval is 255. */
if (_settings_game.pf.path_backoff_interval == 255) return;
/* Exit if we reached our destination depot or are inside a depot. */
if ((v->tile == v->dest_tile && v->current_order.IsType(OT_GOTO_DEPOT)) || v->track == TRACK_BIT_DEPOT) return;
/* Exit if we are inside a depot. */
if (v->track == TRACK_BIT_DEPOT) return;
switch (v->current_order.GetType()) {
/* Exit if we reached our destination depot. */
case OT_GOTO_DEPOT:
if (v->tile == v->dest_tile) return;
break;
case OT_GOTO_WAYPOINT:
/* If we reached our waypoint, make sure we see that. */
if (IsRailWaypointTile(v->tile) && GetStationIndex(v->tile) == v->current_order.GetDestination()) ProcessOrders(v);
break;
case OT_NOTHING:
case OT_LEAVESTATION:
case OT_LOADING:
/* Exit if the current order doesn't have a destination, but the train has orders. */
if (v->GetNumOrders() > 0) return;
break;
default:
break;
}
/* Exit if we are on a station tile and are going to stop. */
if (IsRailStationTile(v->tile) && v->current_order.ShouldStopAtStation(v, GetStationIndex(v->tile))) return;
/* If we reached our waypoint, make sure we see that. */
if (v->current_order.IsType(OT_GOTO_WAYPOINT) && IsRailWaypointTile(v->tile) && GetStationIndex(v->tile) == v->current_order.GetDestination()) ProcessOrders(v);
/* Exit if the current order doesn't have a destination, but the train has orders. */
if ((v->current_order.IsType(OT_NOTHING) || v->current_order.IsType(OT_LEAVESTATION) || v->current_order.IsType(OT_LOADING)) && v->GetNumOrders() > 0) return;
Trackdir td = v->GetVehicleTrackdir();