# HG changeset patch
# User celestar
# Date 1106128837 0
# Node ID 2242cd7419bb77653f894659786eb4f73296947e
# Parent  67d38cf7ed265e094e20b0fe306c30d4c175c665
(svn r1565) -Fix: [ 1104969 ] Aircraft in hangar messages are now revalidated before
display
-CodeChange: replaced one if (foo) return true else return false by
return (foo)

diff -r 67d38cf7ed26 -r 2242cd7419bb aircraft_cmd.c
--- a/aircraft_cmd.c	Wed Jan 19 05:55:30 2005 +0000
+++ b/aircraft_cmd.c	Wed Jan 19 10:00:37 2005 +0000
@@ -1199,6 +1199,13 @@
 	InvalidateWindowClasses(WC_AIRCRAFT_LIST);
 }
 
+static bool ValidateAircraftInHangar( uint data_a, uint data_b )
+{
+	Vehicle *v = GetVehicle(data_a);
+
+	return (IsAircraftHangarTile(v->tile) && (v->vehstatus & VS_STOPPED));
+}
+
 static void AircraftEnterHangar(Vehicle *v)
 {
 	Order old_order;
@@ -1225,11 +1232,12 @@
 
 			if (v->owner == _local_player) {
 				SetDParam(0, v->unitnumber);
-				AddNewsItem(
+				AddValidatedNewsItem(
 					STR_A014_AIRCRAFT_IS_WAITING_IN,
 					NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0),
 					v->index,
-					0);
+					0,
+					ValidateAircraftInHangar);
 			}
 		}
 	}
diff -r 67d38cf7ed26 -r 2242cd7419bb train_cmd.c
--- a/train_cmd.c	Wed Jan 19 05:55:30 2005 +0000
+++ b/train_cmd.c	Wed Jan 19 10:00:37 2005 +0000
@@ -2622,10 +2622,7 @@
 bool ValidateTrainInDepot( uint data_a, uint data_b )
 {
 	Vehicle *v = GetVehicle(data_a);
-	if (v->u.rail.track == 0x80 && (v->vehstatus | VS_STOPPED))
-		return true;
-	else
-		return false;
+	return  (v->u.rail.track == 0x80 && (v->vehstatus | VS_STOPPED));
 }
 
 void TrainEnterDepot(Vehicle *v, uint tile)