cpp/openttd-patchpack/source Changeset - r8781:bd977c904a17

Changeset - r8781:bd977c904a17

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

bjarni - 16 years ago 2008-03-28 22:59:43
bjarni@openttd.org

(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

1 file changed with 7 insertions and 4 deletions:

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -548,6 +548,9 @@ static CommandCost CmdBuildRailWagon(Eng @@
 	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 @@ CommandCost CmdBuildRailVehicle(TileInde @@
 	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 @@ CommandCost CmdBuildRailVehicle(TileInde @@
 		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));

0 comments (0 inline, 0 general)