From a00371c8db9d3b944d901ea0468eb58fe51418a7 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Tue, 29 Apr 2008 21:31:29 +0000 Subject: (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. --- src/rail.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/rail.cpp') 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); -- cgit v1.2.3-54-g00ecf