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/rail.cpp | |
| 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/rail.cpp')
| -rw-r--r-- | src/rail.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rail.cpp b/src/rail.cpp index 6ab511a2b..bae773a91 100644 --- a/src/rail.cpp +++ b/src/rail.cpp @@ -14,6 +14,7 @@ #include "player_func.h" #include "player_base.h" #include "engine_func.h" +#include "engine_base.h" /* XXX: Below 3 tables store duplicate data. Maybe remove some? */ @@ -202,14 +203,13 @@ RailTypes GetPlayerRailtypes(PlayerID p) { RailTypes rt = RAILTYPES_NONE; - EngineID eid; - FOR_ALL_ENGINEIDS_OF_TYPE(eid, VEH_TRAIN) { - const Engine* e = GetEngine(eid); - const EngineInfo *ei = EngInfo(eid); + Engine *e; + FOR_ALL_ENGINES_OF_TYPE(e, VEH_TRAIN) { + const EngineInfo *ei = &e->info; if (HasBit(ei->climates, _opt.landscape) && (HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) { - const RailVehicleInfo *rvi = RailVehInfo(eid); + const RailVehicleInfo *rvi = &e->u.rail; if (rvi->railveh_type != RAILVEH_WAGON) { assert(rvi->railtype < RAILTYPE_END); |