summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2012-11-12 18:09:33 +0000
committerfrosch <frosch@openttd.org>2012-11-12 18:09:33 +0000
commite6459a91dde92bbaa0ccdfa7a318a91c2164a844 (patch)
tree5dc5a82b565f6cac81af4ca611851df7177ee233 /src
parent941f51f0e59188a6ae5295031866eb730c56813c (diff)
downloadopenttd-e6459a91dde92bbaa0ccdfa7a318a91c2164a844.tar.xz
(svn r24703) -Fix: Disallow closing oilrig airports in SE.
Diffstat (limited to 'src')
-rw-r--r--src/station_cmd.cpp2
-rw-r--r--src/station_gui.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index f603c4e15..7cb577767 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2345,7 +2345,7 @@ CommandCost CmdOpenCloseAirport(TileIndex tile, DoCommandFlag flags, uint32 p1,
if (!Station::IsValidID(p1)) return CMD_ERROR;
Station *st = Station::Get(p1);
- if (!(st->facilities & FACIL_AIRPORT)) return CMD_ERROR;
+ if (!(st->facilities & FACIL_AIRPORT) || st->owner == OWNER_NONE) return CMD_ERROR;
CommandCost ret = CheckOwnership(st->owner);
if (ret.Failed()) return ret;
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index cb2207af3..b0709e2c2 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -877,7 +877,7 @@ struct StationViewWindow : public Window {
this->SetWidgetDisabledState(WID_SV_ROADVEHS, !(st->facilities & FACIL_TRUCK_STOP) && !(st->facilities & FACIL_BUS_STOP));
this->SetWidgetDisabledState(WID_SV_SHIPS, !(st->facilities & FACIL_DOCK));
this->SetWidgetDisabledState(WID_SV_PLANES, !(st->facilities & FACIL_AIRPORT));
- this->SetWidgetDisabledState(WID_SV_CLOSE_AIRPORT, !(st->facilities & FACIL_AIRPORT) || st->owner != _local_company);
+ this->SetWidgetDisabledState(WID_SV_CLOSE_AIRPORT, !(st->facilities & FACIL_AIRPORT) || st->owner != _local_company || st->owner == OWNER_NONE); // Also consider SE, where _local_company == OWNER_NONE
this->SetWidgetLoweredState(WID_SV_CLOSE_AIRPORT, (st->facilities & FACIL_AIRPORT) && (st->airport.flags & AIRPORT_CLOSED_block) != 0);
this->DrawWidgets();