--- a/src/build_vehicle_gui.cpp	Mon Jul 16 23:55:22 2007 +0000
+++ b/src/build_vehicle_gui.cpp	Tue Jul 17 06:56:09 2007 +0000
@@ -503,7 +503,7 @@
 /* Draw road vehicle specific details */
 static int DrawRoadVehPurchaseInfo(int x, int y, EngineID engine_number, const RoadVehicleInfo *rvi)
 {
-	bool refittable = (_engine_info[engine_number].refit_mask != 0);
+	bool refittable = (EngInfo(engine_number)->refit_mask != 0);
 
 	/* Purchase cost - Max speed */
 	SetDParam(0, GetEngineProperty(engine_number, 0x11, rvi->base_cost) * (_price.roadveh_base >> 3) >> 5);

--- a/src/roadveh_gui.cpp	Mon Jul 16 23:55:22 2007 +0000
+++ b/src/roadveh_gui.cpp	Tue Jul 17 06:56:09 2007 +0000
@@ -279,7 +279,7 @@
 		SetWindowWidgetDisabledState(w, 11, !is_localplayer);
 		/* Disable refit button if vehicle not refittable */
 		SetWindowWidgetDisabledState(w, 12, !is_localplayer ||
-				_engine_info[v->engine_type].refit_mask == 0);
+				EngInfo(v->engine_type)->refit_mask == 0);
 
 		/* draw widgets & caption */
 		SetDParam(0, v->index);

--- a/src/vehicle.cpp	Mon Jul 16 23:55:22 2007 +0000
+++ b/src/vehicle.cpp	Tue Jul 17 06:56:09 2007 +0000
@@ -2723,7 +2723,7 @@
 								scheme = LS_FREIGHT_WAGON;
 							}
 						} else {
-							bool is_mu = HASBIT(_engine_info[engine_type].misc_flags, EF_RAIL_IS_MU);
+							bool is_mu = HASBIT(EngInfo(engine_type)->misc_flags, EF_RAIL_IS_MU);
 
 							switch (rvi->engclass) {
 								default: NOT_REACHED();