aircraft_cmd.c
changeset 3140 5555cc95043a
parent 3139 b17abef09e15
child 3157 3f35e2d9c8e3
--- a/aircraft_cmd.c	Sat Mar 04 11:01:35 2006 +0000
+++ b/aircraft_cmd.c	Sat Mar 04 11:15:44 2006 +0000
@@ -562,7 +562,7 @@
 
 	if ((++v->day_counter & 7) == 0) DecreaseVehicleValue(v);
 
-	CheckOrders(v->index, OC_INIT);
+	CheckOrders(v);
 
 	CheckVehicleBreakdown(v);
 	AgeVehicle(v);
@@ -1218,12 +1218,6 @@
 	InvalidateWindowClasses(WC_AIRCRAFT_LIST);
 }
 
-static bool ValidateAircraftInHangar(uint data_a, uint data_b)
-{
-	const Vehicle* v = GetVehicle(data_a);
-
-	return (IsAircraftHangarTile(v->tile) && (v->vehstatus & VS_STOPPED));
-}
 
 static void AircraftEnterHangar(Vehicle *v)
 {
@@ -1249,12 +1243,12 @@
 
 			if (v->owner == _local_player) {
 				SetDParam(0, v->unitnumber);
-				AddValidatedNewsItem(
+				AddNewsItem(
 					STR_A014_AIRCRAFT_IS_WAITING_IN,
 					NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0),
 					v->index,
-					0,
-					ValidateAircraftInHangar);
+					0
+				);
 			}
 		}
 	}