mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25319) -Fix [FS#5570]: crash when train with reserved cargo vanishes

release/1.4
rubidium 2013-06-04 15:04:59 +00:00
parent 0d28dc92fc
commit 254c3834d0
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/roadveh_cmd.cpp
View File

@ -460,9 +460,11 @@ inline int RoadVehicle::GetCurrentMaxSpeed() const
*/ */
static void DeleteLastRoadVeh(RoadVehicle *v) static void DeleteLastRoadVeh(RoadVehicle *v)
{ {
RoadVehicle *first = v->First();
Vehicle *u = v; Vehicle *u = v;
for (; v->Next() != NULL; v = v->Next()) u = v; for (; v->Next() != NULL; v = v->Next()) u = v;
u->SetNext(NULL); u->SetNext(NULL);
v->last_station_visited = first->last_station_visited; // for PreDestructor
/* Only leave the road stop when we're really gone. */ /* Only leave the road stop when we're really gone. */
if (IsInsideMM(v->state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END)) RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile))->Leave(v); if (IsInsideMM(v->state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END)) RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile))->Leave(v);

1
src/train_cmd.cpp
View File

@ -3432,6 +3432,7 @@ static void DeleteLastWagon(Train *v)
if (first->track == TRACK_BIT_DEPOT) { if (first->track == TRACK_BIT_DEPOT) {
SetWindowDirty(WC_VEHICLE_DEPOT, first->tile); SetWindowDirty(WC_VEHICLE_DEPOT, first->tile);
} }
v->last_station_visited = first->last_station_visited; // for PreDestructor
} }
/* 'v' shouldn't be accessed after it has been deleted */ /* 'v' shouldn't be accessed after it has been deleted */

2
src/vehicle.cpp
View File

@ -270,6 +270,8 @@ Vehicle::Vehicle(VehicleType type)
this->first = this; this->first = this;
this->colourmap = PAL_NONE; this->colourmap = PAL_NONE;
this->cargo_age_counter = 1; this->cargo_age_counter = 1;
this->last_station_visited = INVALID_STATION;
this->last_loading_station = INVALID_STATION;
} }
/** /**