diff options
| author | frosch <frosch@openttd.org> | 2009-10-10 18:48:13 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2009-10-10 18:48:13 +0000 |
| commit | 59195a6f2021051d135afc03965cebcb3d1c82de (patch) | |
| tree | 004ede3a02dbb2cdb9ba676649cf94da23a56d8e | |
| parent | 54fe3cc4746c97faab8f7d4c46f0c4fd1a79990a (diff) | |
| download | openttd-59195a6f2021051d135afc03965cebcb3d1c82de.tar.xz | |
(svn r17758) -Revert (r17208): Use assert_compile() if you cannot count.
-Fix (r7326): Powernaut Helicopter got wrong 'load amount'.
-Fix (r2639): Call the Evil by its name.
| -rw-r--r-- | src/engine.cpp | 2 | ||||
| -rw-r--r-- | src/table/engines.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/engine.cpp b/src/engine.cpp index 94199a602..d58124824 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -56,6 +56,8 @@ const uint8 _engine_offsets[4] = { lengthof(_orig_rail_vehicle_info) + lengthof(_orig_road_vehicle_info) + lengthof(_orig_ship_vehicle_info), }; +assert_compile(lengthof(_orig_rail_vehicle_info) + lengthof(_orig_road_vehicle_info) + lengthof(_orig_ship_vehicle_info) + lengthof(_orig_aircraft_vehicle_info) == lengthof(_orig_engine_info)); + const uint EngineOverrideManager::NUM_DEFAULT_ENGINES = _engine_counts[VEH_TRAIN] + _engine_counts[VEH_ROAD] + _engine_counts[VEH_SHIP] + _engine_counts[VEH_AIRCRAFT]; Engine::Engine() : diff --git a/src/table/engines.h b/src/table/engines.h index 5cfd1cf32..321b9f41a 100644 --- a/src/table/engines.h +++ b/src/table/engines.h @@ -335,6 +335,7 @@ static const EngineInfo _orig_engine_info[] = { MA( 23832, 20, 20, 99, Y), // 252 Flashbang Wizzer MA( 13575, 20, 20, 40, T|A|S ), // 253 Tricario Helicopter MA( 28215, 20, 20, 30, T|A|S ), // 254 Guru X2 Helicopter + MA( 13575, 20, 20, 99, Y), // 255 Powernaut Helicopter }; #undef Y #undef S |