diff options
-rw-r--r-- | ai.c | 2 | ||||
-rw-r--r-- | engine.h | 2 | ||||
-rw-r--r-- | train_gui.c | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -121,7 +121,7 @@ static int AiChooseTrainToBuild(byte railtype, int32 money, byte flag) int i; for (i = 0; i < NUM_TRAIN_ENGINES; i++) { - const RailVehicleInfo *rvi = rail_vehinfo(i); + const RailVehicleInfo *rvi = RailVehInfo(i); Engine *e = DEREF_ENGINE(i); if (e->railtype != railtype || rvi->flags & RVI_WAGON @@ -157,7 +157,7 @@ extern ShipVehicleInfo _ship_vehicle_info[NUM_SHIP_ENGINES]; extern AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES]; extern RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES]; -static inline RailVehicleInfo *rail_vehinfo(uint e) +static inline RailVehicleInfo *RailVehInfo(uint e) { assert(e < lengthof(_rail_vehicle_info)); return &_rail_vehicle_info[e]; diff --git a/train_gui.c b/train_gui.c index 04f44cc35..8c80c7fe2 100644 --- a/train_gui.c +++ b/train_gui.c @@ -65,7 +65,7 @@ static void engine_drawing_loop(int *x, int *y, int *pos, int *sel, for (i = 0; i < NUM_TRAIN_ENGINES; i++) { const Engine *e = DEREF_ENGINE(i); - const RailVehicleInfo *rvi = rail_vehinfo(i); + const RailVehicleInfo *rvi = RailVehInfo(i); if (e->railtype != railtype || !(rvi->flags & RVI_WAGON) != is_engine || !HASBIT(e->player_avail, _local_player)) @@ -128,7 +128,7 @@ static void NewRailVehicleWndProc(Window *w, WindowEvent *e) WP(w,buildtrain_d).sel_engine = selected_id; if (selected_id != -1) { - const RailVehicleInfo *rvi = rail_vehinfo(selected_id); + const RailVehicleInfo *rvi = RailVehInfo(selected_id); Engine *e; YearMonthDay ymd; |