summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2007-07-17 06:56:09 +0000
committerpeter1138 <peter1138@openttd.org>2007-07-17 06:56:09 +0000
commit306c21d6c94ab490cff2e51b8ecff2ab57c780ed (patch)
tree13a413e8bc2a7e93ab6c7c67d3be49ae4bd5178c
parent3dd6362bb8a07e36eaf621bdf5c256087fbbf8c8 (diff)
downloadopenttd-306c21d6c94ab490cff2e51b8ecff2ab57c780ed.tar.xz
(svn r10603) -Codechange: avoid direct access to _engine_info
-rw-r--r--src/build_vehicle_gui.cpp2
-rw-r--r--src/roadveh_gui.cpp2
-rw-r--r--src/vehicle.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 9fd64dca1..c3bcde0ed 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -503,7 +503,7 @@ static int DrawRailEnginePurchaseInfo(int x, int y, EngineID engine_number, cons
/* 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);
diff --git a/src/roadveh_gui.cpp b/src/roadveh_gui.cpp
index 79eb3fa14..6be119053 100644
--- a/src/roadveh_gui.cpp
+++ b/src/roadveh_gui.cpp
@@ -279,7 +279,7 @@ static void RoadVehViewWndProc(Window *w, WindowEvent *e)
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);
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index b2d1ccdac..bcbeca3c7 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -2723,7 +2723,7 @@ const Livery *GetEngineLivery(EngineID engine_type, PlayerID player, EngineID pa
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();