Mercurial > hg > openttd
changeset 8781:632cce4076f7 draft
(svn r12482) -Fix: [build train] we don't need to have a depot in order to just check the price of a rail vehicle so don't check for compatible rails on the tile either
also wagons will only need tracks they can drive on in order to be build so there is no reason to check for power in the depot
| author | bjarni <bjarni@openttd.org> |
|---|---|
| date | Fri, 28 Mar 2008 22:59:43 +0000 |
| parents | 295fe498f77e |
| children | 484dd442e2e1 |
| files | src/train_cmd.cpp |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -548,6 +548,9 @@ uint num_vehicles = 1 + CountArticulatedParts(engine, false); if (!(flags & DC_QUERY_COST)) { + /* Check that the wagon can drive on the track in question */ + if (!IsCompatibleRail(rvi->railtype, GetRailType(tile))) return CMD_ERROR; + /* Allow for the wagon and the articulated parts, plus one to "terminate" the list. */ Vehicle **vl = (Vehicle**)alloca(sizeof(*vl) * (num_vehicles + 1)); memset(vl, 0, sizeof(*vl) * (num_vehicles + 1)); @@ -702,10 +705,6 @@ const RailVehicleInfo *rvi = RailVehInfo(p1); - /* Check if depot and new engine uses the same kind of tracks */ - /* We need to see if the engine got power on the tile to avoid eletric engines in non-electric depots */ - if (!HasPowerOnRail(rvi->railtype, GetRailType(tile))) return CMD_ERROR; - if (rvi->railveh_type == RAILVEH_WAGON) return CmdBuildRailWagon(p1, tile, flags); CommandCost value = EstimateTrainCost(p1, rvi); @@ -715,6 +714,10 @@ CountArticulatedParts(p1, false); if (!(flags & DC_QUERY_COST)) { + /* Check if depot and new engine uses the same kind of tracks * + * We need to see if the engine got power on the tile to avoid eletric engines in non-electric depots */ + if (!HasPowerOnRail(rvi->railtype, GetRailType(tile))) return CMD_ERROR; + /* Allow for the dual-heads and the articulated parts, plus one to "terminate" the list. */ Vehicle **vl = (Vehicle**)alloca(sizeof(*vl) * (num_vehicles + 1)); memset(vl, 0, sizeof(*vl) * (num_vehicles + 1));