mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r11794) -Fix [FS#1632]: reversing a train when loading at a station with an adjacent station in the same axis crashed.

This commit is contained in:
glx 2008-01-09 17:09:53 +00:00
parent 46650c54b6
commit d133edd026
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/economy.cpp
View File

@ -1548,7 +1548,10 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
return;
}
if (v->type == VEH_TRAIN && !IsTileType(v->tile, MP_STATION)) {
StationID last_visited = v->last_station_visited;
Station *st = GetStation(last_visited);
if (v->type == VEH_TRAIN && (!IsTileType(v->tile, MP_STATION) || GetStationIndex(v->tile) != st->index)) {
/* The train reversed in the station. Take the "easy" way
* out and let the train just leave as it always did. */
SetBit(v->vehicle_flags, VF_LOADING_FINISHED);
@ -1568,9 +1571,6 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
v->cur_speed = 0;
StationID last_visited = v->last_station_visited;
Station *st = GetStation(last_visited);
for (; v != NULL; v = v->Next()) {
if (v->cargo_cap == 0) continue;