mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r4227) - Fix: Wagon replace nows checks if the cargo types are the same before seeing if it can refit.

This commit is contained in:
peter1138 2006-04-01 14:53:38 +00:00
parent 8b1f971c1a
commit 96288ee39a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vehicle.c
View File

@ -1760,9 +1760,13 @@ static void MaybeReplaceVehicle(Vehicle *v)
continue;
}
if (w->type == VEH_Train && IsTrainWagon(w) && !CanRefitTo(EngineReplacementForPlayer(p, w->engine_type), w->cargo_type)) {
// we can't replace this wagon since we can't refit the new one to the right cargo type
continue;
if (w->type == VEH_Train && IsTrainWagon(w)) {
EngineID e = EngineReplacementForPlayer(p, w->engine_type);
if (w->cargo_type != RailVehInfo(e)->cargo_type && !CanRefitTo(e, w->cargo_type)) {
// we can't replace this wagon since the cargo type is incorrent, and we can't refit it
continue;
}
}
/* Now replace the vehicle */