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/ai/trolly | |
| 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/ai/trolly')
| -rw-r--r-- | src/ai/trolly/build.cpp | 9 | ||||
| -rw-r--r-- | src/ai/trolly/trolly.cpp | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ai/trolly/build.cpp b/src/ai/trolly/build.cpp index b46984d0a..eb7154092 100644 --- a/src/ai/trolly/build.cpp +++ b/src/ai/trolly/build.cpp @@ -7,6 +7,7 @@ #include "../../command_func.h" #include "trolly.h" #include "../../engine_func.h" +#include "../../engine_base.h" #include "../../variables.h" #include "../../bridge.h" #include "../../vehicle_func.h" @@ -235,12 +236,12 @@ EngineID AiNew_PickVehicle(Player *p) } else { EngineID best_veh_index = INVALID_ENGINE; int32 best_veh_rating = 0; - EngineID i; + const Engine *e; /* Loop through all road vehicles */ - FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_ROAD) { - const RoadVehicleInfo *rvi = RoadVehInfo(i); - const Engine* e = GetEngine(i); + FOR_ALL_ENGINES_OF_TYPE(e, VEH_ROAD) { + EngineID i = e->index; + const RoadVehicleInfo *rvi = &e->u.road; /* Skip vehicles which can't take our cargo type */ if (rvi->cargo_type != _players_ainew[p->index].cargo && !CanRefitTo(i, _players_ainew[p->index].cargo)) continue; diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp index 49133386d..2a369cd03 100644 --- a/src/ai/trolly/trolly.cpp +++ b/src/ai/trolly/trolly.cpp @@ -29,6 +29,7 @@ #include "../../industry.h" #include "../../station_base.h" #include "../../engine_func.h" +#include "../../engine_base.h" #include "../../gui.h" #include "../../depot_base.h" #include "../../vehicle_base.h" |