--- a/aircraft_gui.c	Sat Nov 12 11:10:12 2005 +0000
+++ b/aircraft_gui.c	Sun Nov 13 13:43:55 2005 +0000
@@ -77,10 +77,9 @@
 
 void CcBuildAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2)
 {
-	Vehicle *v;
+	if (success) {
+		const Vehicle* v = GetVehicle(_new_aircraft_id);
 
-	if (success) {
-		v = GetVehicle(_new_aircraft_id);
 		if (v->tile == _backup_orders_tile) {
 			_backup_orders_tile = 0;
 			RestoreVehicleOrders(v, _backup_orders_data);
@@ -508,7 +507,7 @@
 {
 	switch(e->event) {
 	case WE_PAINT: {
-		Vehicle *v = GetVehicle(w->window_number);
+		const Vehicle* v = GetVehicle(w->window_number);
 		uint32 disabled = 1<<8;
 		StringID str;