From 321c7534185747ff0e57a5b88191bcc913d07ca9 Mon Sep 17 00:00:00 2001
From: celestar <celestar@openttd.org>
Date: Wed, 19 Jan 2005 10:00:37 +0000
Subject: (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)

---
 aircraft_cmd.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'aircraft_cmd.c')

diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index 85384c6c0..58168db9b 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -1199,6 +1199,13 @@ static void AircraftEntersTerminal(Vehicle *v)
 	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 @@ static void AircraftEnterHangar(Vehicle *v)
 
 			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);
 			}
 		}
 	}
-- 
cgit v1.2.3-54-g00ecf