(svn r9040) -Codechange: the build window and CmdBuildAircraft() now shares the code to figure out if an aircraft is buildable in the hangar in question

   This should help ensuring that the build command and the list are consistent in what aircraft are buildable

1 files changed, 4 insertions, 19 deletions

diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 5227b8944..03e09707b 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -694,26 +694,11 @@ static void GenerateBuildAircraftList(Window *w)
 	 * when planes become obsolete and are removed */
 	sel_id = INVALID_ENGINE;
 	for (eid = AIRCRAFT_ENGINES_INDEX; eid < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES; eid++) {
-		if (IsEngineBuildable(eid, VEH_Aircraft, _local_player)) {
-			const AircraftVehicleInfo *avi = AircraftVehInfo(eid);
-			switch (bv->filter.flags & ~AirportFTAClass::SHORT_STRIP) { // we don't care about the length of the runway here
-				case AirportFTAClass::HELICOPTERS:
-					if (avi->subtype != AIR_HELI) continue;
-					break;
-
-				case AirportFTAClass::AIRPLANES:
-					if (!(avi->subtype & AIR_CTOL)) continue;
-					break;
-
-				case AirportFTAClass::ALL: break;
-				default:
-					NOT_REACHED();
-			}
-
-			EngList_Add(&bv->eng_list, eid);
+		if (!IsEngineBuildable(eid, VEH_Aircraft, _local_player)) continue;
+		if (w->window_number != 0 && !IsAircraftBuildableAtStation(eid, w->window_number)) continue;
 
-			if (eid == bv->sel_engine) sel_id = eid;
-		}
+		EngList_Add(&bv->eng_list, eid);
+		if (eid == bv->sel_engine) sel_id = eid;
 	}
 
 	bv->sel_engine = sel_id;