cpp/openttd-patchpack/source Changeset - r19748:9bb654bae77c

Changeset - r19748:9bb654bae77c

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

frosch - 12 years ago 2012-11-12 18:09:33
frosch@openttd.org

(svn r24703) -Fix: Disallow closing oilrig airports in SE.

2 files changed with 2 insertions and 2 deletions:

src/station_cmd.cpp

src/station_gui.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -2345,7 +2345,7 @@ CommandCost CmdOpenCloseAirport(TileInde @@
 	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;

src/station_gui.cpp

➞

Show inline comments

@@ @@ -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();

0 comments (0 inline, 0 general)