equal
deleted
inserted
replaced
1197 LoadUnloadVehicle(v); |
1197 LoadUnloadVehicle(v); |
1198 InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
1198 InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
1199 InvalidateWindowClasses(WC_AIRCRAFT_LIST); |
1199 InvalidateWindowClasses(WC_AIRCRAFT_LIST); |
1200 } |
1200 } |
1201 |
1201 |
|
1202 static bool ValidateAircraftInHangar( uint data_a, uint data_b ) |
|
1203 { |
|
1204 Vehicle *v = GetVehicle(data_a); |
|
1205 |
|
1206 return (IsAircraftHangarTile(v->tile) && (v->vehstatus & VS_STOPPED)); |
|
1207 } |
|
1208 |
1202 static void AircraftEnterHangar(Vehicle *v) |
1209 static void AircraftEnterHangar(Vehicle *v) |
1203 { |
1210 { |
1204 Order old_order; |
1211 Order old_order; |
1205 |
1212 |
1206 ServiceAircraft(v); |
1213 ServiceAircraft(v); |
1223 v->vehstatus |= VS_STOPPED; |
1230 v->vehstatus |= VS_STOPPED; |
1224 InvalidateWindowClasses(WC_AIRCRAFT_LIST); |
1231 InvalidateWindowClasses(WC_AIRCRAFT_LIST); |
1225 |
1232 |
1226 if (v->owner == _local_player) { |
1233 if (v->owner == _local_player) { |
1227 SetDParam(0, v->unitnumber); |
1234 SetDParam(0, v->unitnumber); |
1228 AddNewsItem( |
1235 AddValidatedNewsItem( |
1229 STR_A014_AIRCRAFT_IS_WAITING_IN, |
1236 STR_A014_AIRCRAFT_IS_WAITING_IN, |
1230 NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0), |
1237 NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0), |
1231 v->index, |
1238 v->index, |
1232 0); |
1239 0, |
|
1240 ValidateAircraftInHangar); |
1233 } |
1241 } |
1234 } |
1242 } |
1235 } |
1243 } |
1236 } |
1244 } |
1237 |
1245 |