From ce2104ed4783138596dfc56a0829222fccdf5b34 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Tue, 8 Jan 2008 18:25:51 +0000 Subject: (svn r11784) -Codechange: set up initial engine data in one place --- src/engine.cpp | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'src/engine.cpp') diff --git a/src/engine.cpp b/src/engine.cpp index 856c2c25c..102b64316 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -38,6 +38,24 @@ enum { }; +void SetupEngines() +{ + /* Copy original static engine data */ + memcpy(&_engine_info, &orig_engine_info, sizeof(orig_engine_info)); + memcpy(&_rail_vehicle_info, &orig_rail_vehicle_info, sizeof(orig_rail_vehicle_info)); + memcpy(&_ship_vehicle_info, &orig_ship_vehicle_info, sizeof(orig_ship_vehicle_info)); + memcpy(&_aircraft_vehicle_info, &orig_aircraft_vehicle_info, sizeof(orig_aircraft_vehicle_info)); + memcpy(&_road_vehicle_info, &orig_road_vehicle_info, sizeof(orig_road_vehicle_info)); + + /* Add type to engines */ + Engine* e = _engines; + do e->type = VEH_TRAIN; while (++e < &_engines[ROAD_ENGINES_INDEX]); + do e->type = VEH_ROAD; while (++e < &_engines[SHIP_ENGINES_INDEX]); + do e->type = VEH_SHIP; while (++e < &_engines[AIRCRAFT_ENGINES_INDEX]); + do e->type = VEH_AIRCRAFT; while (++e < &_engines[TOTAL_NUM_ENGINES]); +} + + void ShowEnginePreviewWindow(EngineID engine); void DeleteCustomEngineNames() @@ -108,16 +126,6 @@ static void CalcEngineReliability(Engine *e) InvalidateWindowClasses(WC_REPLACE_VEHICLE); } -void AddTypeToEngines() -{ - Engine* e = _engines; - - do e->type = VEH_TRAIN; while (++e < &_engines[ROAD_ENGINES_INDEX]); - do e->type = VEH_ROAD; while (++e < &_engines[SHIP_ENGINES_INDEX]); - do e->type = VEH_SHIP; while (++e < &_engines[AIRCRAFT_ENGINES_INDEX]); - do e->type = VEH_AIRCRAFT; while (++e < &_engines[TOTAL_NUM_ENGINES]); -} - void StartupEngines() { Engine *e; -- cgit v1.2.3-54-g00ecf