From 0996de79df839647968838498d1953319705606d Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 24 Jan 2007 07:14:09 +0000 Subject: (svn r8385) -Fix -Regression (r8314): I only did half the necessary changes to move railtype from Engine to RailVehicleInfo. Now do the rest. --- src/ai/default/default.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ai') diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp index 63a3ff556..9fc07abd5 100644 --- a/src/ai/default/default.cpp +++ b/src/ai/default/default.cpp @@ -142,7 +142,7 @@ static EngineID AiChooseTrainToBuild(RailType railtype, int32 money, byte flag, const RailVehicleInfo *rvi = RailVehInfo(i); const Engine* e = GetEngine(i); - if (!IsCompatibleRail(e->railtype, railtype) || + if (!IsCompatibleRail(rvi->railtype, railtype) || rvi->flags & RVI_WAGON || (rvi->flags & RVI_MULTIHEAD && flag & 1) || !HASBIT(e->player_avail, _current_player) || @@ -2365,7 +2365,7 @@ static EngineID AiFindBestWagon(CargoID cargo, RailType railtype) const RailVehicleInfo *rvi = RailVehInfo(i); const Engine* e = GetEngine(i); - if (!IsCompatibleRail(e->railtype, railtype) || + if (!IsCompatibleRail(rvi->railtype, railtype) || !(rvi->flags & RVI_WAGON) || !HASBIT(e->player_avail, _current_player)) { continue; -- cgit v1.2.3-70-g09d2