# HG changeset patch # User bjarni # Date 1104254326 0 # Node ID 02e9296ccdca563e9aed057a3f5ed0cb0bcffecb # Parent 906f21e653b224bf1222c455639b7171d7040c51 (svn r1290) Added type to typedef struct Engine and filled in the same data as in type in vehicle it was kind of lame that you should use AircraftVehInfo(), ShipVehInfo() etc. if you wanted to know what type the engine is diff -r 906f21e653b2 -r 02e9296ccdca engine.c --- a/engine.c Tue Dec 28 12:11:34 2004 +0000 +++ b/engine.c Tue Dec 28 17:18:46 2004 +0000 @@ -119,12 +119,12 @@ { Engine *e; const EngineInfo *ei; - uint32 r; + uint32 r, counter = 0; SetupEngineNames(); - for(e=_engines, ei=_engine_info; e != endof(_engines); e++,ei++) { + for(e=_engines, ei=_engine_info; e != endof(_engines); e++, ei++, counter++) { e->age = 0; e->railtype = ei->railtype_climates >> 4; e->flags = 0; @@ -164,6 +164,25 @@ e->flags |= ENGINE_AVAILABLE; e->player_avail = 0; } + + /* This sets up type for the engine + It is needed if you want to ask the engine what type it is + It should hopefully be the same as when you ask a vehicle what it is + but using this, you can ask what type an engine number is + even if it is not a vehicle (yet)*/ + e->type = VEH_Train; + if (counter >= ROAD_ENGINES_INDEX) { + e->type = VEH_Road; + if (counter >= SHIP_ENGINES_INDEX) { + e->type = VEH_Ship; + if (counter >= AIRCRAFT_ENGINES_INDEX) { + e->type = VEH_Aircraft; + if (counter >= TOTAL_NUM_ENGINES) { + e->type = VEH_Special; + } + } + } + } } AdjustAvailAircraft(); diff -r 906f21e653b2 -r 02e9296ccdca engine.h --- a/engine.h Tue Dec 28 12:11:34 2004 +0000 +++ b/engine.h Tue Dec 28 17:18:46 2004 +0000 @@ -70,6 +70,7 @@ byte preview_wait; byte railtype; byte player_avail; + byte type; // type, ie VEH_Road, VEH_Train, etc. Same as in vehicle.h } Engine;