mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r10603) -Codechange: avoid direct access to _engine_info

release/0.6
peter1138 2007-07-17 06:56:09 +00:00
parent 3dd6362bb8
commit 306c21d6c9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/build_vehicle_gui.cpp
View File

@ -503,7 +503,7 @@ static int DrawRailEnginePurchaseInfo(int x, int y, EngineID engine_number, cons
/* Draw road vehicle specific details */ /* Draw road vehicle specific details */
static int DrawRoadVehPurchaseInfo(int x, int y, EngineID engine_number, const RoadVehicleInfo *rvi) 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 */ /* Purchase cost - Max speed */
SetDParam(0, GetEngineProperty(engine_number, 0x11, rvi->base_cost) * (_price.roadveh_base >> 3) >> 5); SetDParam(0, GetEngineProperty(engine_number, 0x11, rvi->base_cost) * (_price.roadveh_base >> 3) >> 5);

2
src/roadveh_gui.cpp
View File

@ -279,7 +279,7 @@ static void RoadVehViewWndProc(Window *w, WindowEvent *e)
SetWindowWidgetDisabledState(w, 11, !is_localplayer); SetWindowWidgetDisabledState(w, 11, !is_localplayer);
/* Disable refit button if vehicle not refittable */ /* Disable refit button if vehicle not refittable */
SetWindowWidgetDisabledState(w, 12, !is_localplayer || SetWindowWidgetDisabledState(w, 12, !is_localplayer ||
_engine_info[v->engine_type].refit_mask == 0); EngInfo(v->engine_type)->refit_mask == 0);
/* draw widgets & caption */ /* draw widgets & caption */
SetDParam(0, v->index); SetDParam(0, v->index);

2
src/vehicle.cpp
View File

@ -2723,7 +2723,7 @@ const Livery *GetEngineLivery(EngineID engine_type, PlayerID player, EngineID pa
scheme = LS_FREIGHT_WAGON; scheme = LS_FREIGHT_WAGON;
} }
} else { } 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) { switch (rvi->engclass) {
default: NOT_REACHED(); default: NOT_REACHED();