diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 37751da55f..871ae23322 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -4391,44 +4391,6 @@ void DeleteOilRig(TileIndex tile) assert(st->facilities == (FACIL_AIRPORT | FACIL_DOCK) && st->airport.type == AT_OILRIG); delete st; - return; - - MakeShipStationAreaSmaller(st); - if (st->ship_station.tile == INVALID_TILE) { - st->ship_station.Clear(); - st->docking_station.Clear(); - st->docking_tiles.clear(); - st->facilities &= ~FACIL_DOCK; - } - st->airport.Clear(); - st->facilities &= ~FACIL_AIRPORT; - st->airport.flags = 0; - - st->rect.AfterRemoveTile(st, tile); - - st->UpdateVirtCoord(); - st->RecomputeCatchment(); - if (!st->IsInUse()) { - delete st; - } else { - st->industry = nullptr; - /* All ships that were going to our station, can't go to it anymore. - * Just clear the order, then automatically the next appropriate order - * will be selected and in case of no appropriate order it will just - * wander around the world. */ - if (!(st->facilities & FACIL_DOCK)) { - Ship *s; - FOR_ALL_SHIPS(s) { - if (s->current_order.IsType(OT_LOADING) && s->current_order.GetDestination() == st->index) { - s->LeaveStation(); - } - - if (s->current_order.IsType(OT_GOTO_STATION) && s->current_order.GetDestination() == st->index) { - s->SetDestTile(s->GetOrderStationLocation(st->index)); - } - } - } - } } static void ChangeTileOwner_Station(TileIndex tile, Owner old_owner, Owner new_owner)