diff options
author | peter1138 <peter1138@openttd.org> | 2008-04-29 21:31:29 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2008-04-29 21:31:29 +0000 |
commit | a00371c8db9d3b944d901ea0468eb58fe51418a7 (patch) | |
tree | 82b8c0d69acb1c38843e4fcf0b11f46a057ef270 /src/engine_type.h | |
parent | 1d01390fa6d6ca83cd0cb148137d2a81749b380d (diff) | |
download | openttd-a00371c8db9d3b944d901ea0468eb58fe51418a7.tar.xz |
(svn r12924) -Feature: Introducing the so called 'engine pool' which primarily removes the fixed engine type limits and also happens to allow (with the patch option 'dynamic_engines') multiple NewGRF vehicle sets to coexist.
Diffstat (limited to 'src/engine_type.h')
-rw-r--r-- | src/engine_type.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/engine_type.h b/src/engine_type.h index 6079cdc6a..03bee6fe4 100644 --- a/src/engine_type.h +++ b/src/engine_type.h @@ -18,6 +18,8 @@ typedef uint16 EngineID; typedef uint16 EngineRenewID; typedef EngineID *EngineList; ///< engine list type placeholder acceptable for C code (see helpers.cpp) +struct Engine; + enum RailVehicleTypes { RAILVEH_SINGLEHEAD, ///< indicates a "standalone" locomotive RAILVEH_MULTIHEAD, ///< indicates a combination of two locomotives @@ -119,22 +121,6 @@ struct EngineInfo { StringID string_id; ///< Default name of engine }; -struct Engine { - char *name; ///< Custom name of engine - Date intro_date; - Date age; - uint16 reliability; - uint16 reliability_spd_dec; - uint16 reliability_start, reliability_max, reliability_final; - uint16 duration_phase_1, duration_phase_2, duration_phase_3; - byte lifelength; - byte flags; - uint8 preview_player_rank; - byte preview_wait; - byte player_avail; - VehicleType type; ///< type, ie VEH_ROAD, VEH_TRAIN, etc. -}; - /** * EngineInfo.misc_flags is a bitmask, with the following values */ @@ -160,18 +146,4 @@ enum { static const EngineID INVALID_ENGINE = 0xFFFF; -enum { - NUM_NORMAL_RAIL_ENGINES = 54, - NUM_MONORAIL_ENGINES = 30, - NUM_MAGLEV_ENGINES = 32, - NUM_TRAIN_ENGINES = NUM_NORMAL_RAIL_ENGINES + NUM_MONORAIL_ENGINES + NUM_MAGLEV_ENGINES, - NUM_ROAD_ENGINES = 88, - NUM_SHIP_ENGINES = 11, - NUM_AIRCRAFT_ENGINES = 41, - TOTAL_NUM_ENGINES = NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES + NUM_SHIP_ENGINES + NUM_AIRCRAFT_ENGINES, - AIRCRAFT_ENGINES_INDEX = NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES + NUM_SHIP_ENGINES, - SHIP_ENGINES_INDEX = NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES, - ROAD_ENGINES_INDEX = NUM_TRAIN_ENGINES, -}; - #endif /* ENGINE_TYPE_H */ |