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

(svn r4201) - Codechange: Do for _engine_info[] what we do for _*_vehicle_info[]; create and use a function to retrieve data, and ensure constness.

release/0.5
peter1138 2006-03-31 12:59:43 +00:00
parent 859fc1d7f0
commit cd0a67dc65
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine.h
View File

@ -219,6 +219,12 @@ extern ShipVehicleInfo _ship_vehicle_info[NUM_SHIP_ENGINES];
extern AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES]; extern AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES];
extern RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES]; extern RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES];
static inline const EngineInfo *EngInfo(EngineID e)
{
assert(e < lengthof(_engine_info));
return &_engine_info[e];
}
static inline const RailVehicleInfo* RailVehInfo(EngineID e) static inline const RailVehicleInfo* RailVehInfo(EngineID e)
{ {
assert(e < lengthof(_rail_vehicle_info)); assert(e < lengthof(_rail_vehicle_info));

2
players.c
View File

@ -625,7 +625,7 @@ byte GetPlayerRailtypes(PlayerID p)
for (i = 0; i != TOTAL_NUM_ENGINES; i++) { for (i = 0; i != TOTAL_NUM_ENGINES; i++) {
const Engine* e = GetEngine(i); const Engine* e = GetEngine(i);
const EngineInfo *ei = &_engine_info[i]; const EngineInfo *ei = EngInfo(i);
if (e->type == VEH_Train && HASBIT(ei->climates, _opt.landscape) && if (e->type == VEH_Train && HASBIT(ei->climates, _opt.landscape) &&
(HASBIT(e->player_avail, p) || _date >= (e->intro_date + 365)) && (HASBIT(e->player_avail, p) || _date >= (e->intro_date + 365)) &&

4
train_gui.c
View File

@ -92,7 +92,7 @@ void DrawTrainEnginePurchaseInfo(int x, int y, EngineID engine_number)
void DrawTrainWagonPurchaseInfo(int x, int y, EngineID engine_number) void DrawTrainWagonPurchaseInfo(int x, int y, EngineID engine_number)
{ {
const RailVehicleInfo *rvi = RailVehInfo(engine_number); const RailVehicleInfo *rvi = RailVehInfo(engine_number);
bool refittable = (_engine_info[engine_number].refit_mask != 0); bool refittable = (EngInfo(engine_number)->refit_mask != 0);
/* Purchase cost */ /* Purchase cost */
SetDParam(0, (rvi->base_cost * _price.build_railwagon) >> 8); SetDParam(0, (rvi->base_cost * _price.build_railwagon) >> 8);
@ -910,7 +910,7 @@ static void TrainViewWndProc(Window *w, WindowEvent *e)
/* See if any vehicle can be refitted */ /* See if any vehicle can be refitted */
for (u = v; u != NULL; u = u->next) { for (u = v; u != NULL; u = u->next) {
if (_engine_info[u->engine_type].refit_mask != 0 || if (EngInfo(u->engine_type)->refit_mask != 0 ||
(!(RailVehInfo(v->engine_type)->flags & RVI_WAGON) && v->cargo_cap != 0)) { (!(RailVehInfo(v->engine_type)->flags & RVI_WAGON) && v->cargo_cap != 0)) {
CLRBIT(w->disabled_state, 12); CLRBIT(w->disabled_state, 12);
/* We have a refittable carriage, bail out */ /* We have a refittable carriage, bail out */

4
vehicle.c
View File

@ -694,7 +694,7 @@ bool CanFillVehicle(Vehicle *v)
bool CanRefitTo(EngineID engine_type, CargoID cid_to) bool CanRefitTo(EngineID engine_type, CargoID cid_to)
{ {
CargoID cid = _global_cargo_id[_opt_ptr->landscape][cid_to]; CargoID cid = _global_cargo_id[_opt_ptr->landscape][cid_to];
return HASBIT(_engine_info[engine_type].refit_mask, cid); return HASBIT(EngInfo(engine_type)->refit_mask, cid);
} }
static void DoDrawVehicle(const Vehicle *v) static void DoDrawVehicle(const Vehicle *v)
@ -2061,7 +2061,7 @@ static PalSpriteID GetEngineColourMap(EngineID engine_type, PlayerID player)
byte colour = _player_colors[player]; byte colour = _player_colors[player];
/* XXX Magic 0x307 is the first company colour remap sprite */ /* XXX Magic 0x307 is the first company colour remap sprite */
map = HASBIT(_engine_info[engine_type].misc_flags, EF_USES_2CC) ? map = HASBIT(EngInfo(engine_type)->misc_flags, EF_USES_2CC) ?
(SPR_2CCMAP_BASE + colour + colour * 16) : (PALETTE_RECOLOR_START + colour); (SPR_2CCMAP_BASE + colour + colour * 16) : (PALETTE_RECOLOR_START + colour);
return SPRITE_PALETTE(map << PALETTE_SPRITE_START); return SPRITE_PALETTE(map << PALETTE_SPRITE_START);

6
vehicle_gui.c
View File

@ -233,7 +233,7 @@ CargoID DrawVehicleRefitWindow(const Vehicle *v, int sel)
* it with the bitmask of available cargo on the current landscape, and * it with the bitmask of available cargo on the current landscape, and
* where the bits are set: those are available */ * where the bits are set: those are available */
do { do {
cmask |= _engine_info[u->engine_type].refit_mask; cmask |= EngInfo(u->engine_type)->refit_mask;
u = u->next; u = u->next;
} while (v->type == VEH_Train && u != NULL); } while (v->type == VEH_Train && u != NULL);
@ -461,7 +461,7 @@ static void train_engine_drawing_loop(int *x, int *y, int *pos, int *sel, Engine
EngineID i = GetRailVehAtPosition(j); EngineID i = GetRailVehAtPosition(j);
const Engine *e = GetEngine(i); const Engine *e = GetEngine(i);
const RailVehicleInfo *rvi = RailVehInfo(i); const RailVehicleInfo *rvi = RailVehInfo(i);
const EngineInfo *info = &_engine_info[i]; const EngineInfo *info = EngInfo(i);
if (!EngineHasReplacementForPlayer(p, i) && _player_num_engines[i] == 0 && show_outdated) continue; if (!EngineHasReplacementForPlayer(p, i) && _player_num_engines[i] == 0 && show_outdated) continue;
@ -523,7 +523,7 @@ static void SetupScrollStuffForReplaceWindow(Window *w)
for (i = 0; i < NUM_TRAIN_ENGINES; i++) { for (i = 0; i < NUM_TRAIN_ENGINES; i++) {
EngineID eid = GetRailVehAtPosition(i); EngineID eid = GetRailVehAtPosition(i);
const Engine* e = GetEngine(eid); const Engine* e = GetEngine(eid);
const EngineInfo* info = &_engine_info[eid]; const EngineInfo* info = EngInfo(eid);
// left window contains compatible engines while right window only contains engines of the selected type // left window contains compatible engines while right window only contains engines of the selected type
if (ENGINE_AVAILABLE && ( if (ENGINE_AVAILABLE && (