diff options
author | peter1138 <peter1138@openttd.org> | 2005-09-26 18:43:58 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2005-09-26 18:43:58 +0000 |
commit | 2314431a596c25b7e48cfbc7dda452c66cd5ca32 (patch) | |
tree | 97e69b85dba3e191ef56496b77c23e2cececc839 /engine.h | |
parent | c76f01b6ff9221dd2ebdfc09031c9707d5404ce5 (diff) | |
download | openttd-2314431a596c25b7e48cfbc7dda452c66cd5ca32.tar.xz |
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
Diffstat (limited to 'engine.h')
-rw-r--r-- | engine.h | 26 |
1 files changed, 16 insertions, 10 deletions
@@ -241,31 +241,37 @@ static inline bool IsEngineIndex(uint index) /* Access Vehicle Data */ //#include "table/engines.h" -extern EngineInfo _engine_info[TOTAL_NUM_ENGINES]; -extern RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES]; -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 *RailVehInfo(uint e) +extern const EngineInfo orig_engine_info[TOTAL_NUM_ENGINES]; +extern const RailVehicleInfo orig_rail_vehicle_info[NUM_TRAIN_ENGINES]; +extern const ShipVehicleInfo orig_ship_vehicle_info[NUM_SHIP_ENGINES]; +extern const AircraftVehicleInfo orig_aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES]; +extern const RoadVehicleInfo orig_road_vehicle_info[NUM_ROAD_ENGINES]; + +EngineInfo _engine_info[TOTAL_NUM_ENGINES]; +RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES]; +ShipVehicleInfo _ship_vehicle_info[NUM_SHIP_ENGINES]; +AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES]; +RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES]; + +static inline const RailVehicleInfo *RailVehInfo(uint e) { assert(e < lengthof(_rail_vehicle_info)); return &_rail_vehicle_info[e]; } -static inline ShipVehicleInfo *ShipVehInfo(uint e) +static inline const ShipVehicleInfo *ShipVehInfo(uint e) { assert(e - SHIP_ENGINES_INDEX < lengthof(_ship_vehicle_info)); return &_ship_vehicle_info[e - SHIP_ENGINES_INDEX]; } -static inline AircraftVehicleInfo *AircraftVehInfo(uint e) +static inline const AircraftVehicleInfo *AircraftVehInfo(uint e) { assert(e - AIRCRAFT_ENGINES_INDEX < lengthof(_aircraft_vehicle_info)); return &_aircraft_vehicle_info[e - AIRCRAFT_ENGINES_INDEX]; } -static inline RoadVehicleInfo *RoadVehInfo(uint e) +static inline const RoadVehicleInfo *RoadVehInfo(uint e) { assert(e - ROAD_ENGINES_INDEX < lengthof(_road_vehicle_info)); return &_road_vehicle_info[e - ROAD_ENGINES_INDEX]; |