(svn r1412) -Feature/Fix: Aircraft refit options have been restricted to "sane"

values.
-Feature: aircraft can now be refitted "mail-only"
-Feature: Passengers aircraft now ignore the amount of mail for "full
load any" options

1 files changed, 8 insertions, 0 deletions

diff --git a/vehicle.c b/vehicle.c
index 6c892d788..f58d05cfa 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -597,6 +597,14 @@ static bool CanFillVehicle_FullLoadAny(Vehicle *v)
 {
 	uint32 full = 0, not_full = 0;
 
+	//special handling of aircraft
+	
+	//if the aircraft carries passengers and is NOT full, then
+	//continue loading, no matter how much mail is in
+	if ((v->type == VEH_Aircraft) && (v->cargo_type == CT_PASSENGERS) && (v->cargo_cap != v->cargo_count)) {
+		return true;
+	}
+
 	// patch should return "true" to continue loading, i.e. when there is no cargo type that is fully loaded.
 	do {
 		//Should never happen, but just in case future additions change this