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

(svn r23838) -Fix [FS#5000]: assertion got hit when destroing a dock when a ship was loading

release/1.2
rubidium 2012-01-22 18:16:47 +00:00
parent 60678d9757
commit f6487875da
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/station_cmd.cpp
View File

@ -2555,6 +2555,10 @@ static CommandCost RemoveDock(TileIndex tile, DoCommandFlag flags)
* wander around the world. */ * wander around the world. */
Ship *s; Ship *s;
FOR_ALL_SHIPS(s) { FOR_ALL_SHIPS(s) {
if (s->current_order.IsType(OT_LOADING) && s->tile == docking_location) {
s->LeaveStation();
}
if (s->dest_tile == docking_location) { if (s->dest_tile == docking_location) {
s->dest_tile = 0; s->dest_tile = 0;
s->current_order.Free(); s->current_order.Free();