Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17758) -Revert (r17208): Use assert_compile() if you cannot count.

Browse Source 
-Fix (r7326): Powernaut Helicopter got wrong 'load amount'.
-Fix (r2639): Call the Evil by its name.
This commit is contained in:
frosch 2009-10-10 18:48:13 +00:00
parent 140f1194b9
commit 76ff3aaf8f
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine.cpp
View File

@ -56,6 +56,8 @@ const uint8 _engine_offsets[4] = {
lengthof(_orig_rail_vehicle_info) + lengthof(_orig_road_vehicle_info) + lengthof(_orig_ship_vehicle_info), 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]; const uint EngineOverrideManager::NUM_DEFAULT_ENGINES = _engine_counts[VEH_TRAIN] + _engine_counts[VEH_ROAD] + _engine_counts[VEH_SHIP] + _engine_counts[VEH_AIRCRAFT];
Engine::Engine() : Engine::Engine() :

1
src/table/engines.h
View File

@ -335,6 +335,7 @@ static const EngineInfo _orig_engine_info[] = {
MA( 23832, 20, 20, 99, Y), // 252 Flashbang Wizzer MA( 23832, 20, 20, 99, Y), // 252 Flashbang Wizzer
MA( 13575, 20, 20, 40, T|A|S ), // 253 Tricario Helicopter MA( 13575, 20, 20, 40, T|A|S ), // 253 Tricario Helicopter
MA( 28215, 20, 20, 30, T|A|S ), // 254 Guru X2 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 Y
#undef S #undef S