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

Fix #7481: Just remove oil rig stations right away, don't clean them first

pull/7564/head
Niels Martin Hansen 2019-04-26 21:34:55 +02:00
parent 585c45d6c2
commit d1ef13fc04
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/station_cmd.cpp
View File

@ -4029,16 +4029,9 @@ void DeleteOilRig(TileIndex tile)
MakeWaterKeepingClass(tile, OWNER_NONE); MakeWaterKeepingClass(tile, OWNER_NONE);
st->dock_tile = INVALID_TILE; /* The oil rig station is not supposed to be shared with anything else */
st->airport.Clear(); assert(st->facilities == (FACIL_AIRPORT | FACIL_DOCK) && st->airport.type == AT_OILRIG);
st->facilities &= ~(FACIL_AIRPORT | FACIL_DOCK); delete st;
st->airport.flags = 0;
st->rect.AfterRemoveTile(st, tile);
st->UpdateVirtCoord();
st->RecomputeCatchment();
if (!st->IsInUse()) delete st;
} }
static void ChangeTileOwner_Station(TileIndex tile, Owner old_owner, Owner new_owner) static void ChangeTileOwner_Station(TileIndex tile, Owner old_owner, Owner new_owner)