From 4ad4f1f3f15a49954ced9ac2e53e8840811dadf8 Mon Sep 17 00:00:00 2001 From: celestar Date: Thu, 29 Mar 2007 13:52:34 +0000 Subject: (svn r9524) -Fix(FS#640,r8755): Implemented a "dummy" State Machine for stations who got their airport removed while there were still aircraft within the State Machine (and thus caused asserts) --- src/station_cmd.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/station_cmd.cpp') diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 6341fd7df..00f77d44f 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1600,6 +1600,13 @@ static int32 RemoveAirport(Station *st, uint32 flags) int32 cost = w * h * _price.remove_airport; + Vehicle *v; + FOR_ALL_VEHICLES(v) { + if (!(v->type == VEH_AIRCRAFT && IsNormalAircraft(v))) continue; + + if (v->u.air.targetairport == st->index && v->u.air.state != FLYING) return CMD_ERROR; + } + BEGIN_TILE_LOOP(tile_cur, w, h, tile) { if (!EnsureNoVehicle(tile_cur)) return CMD_ERROR; -- cgit v1.2.3-54-g00ecf