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

1 files changed, 7 insertions, 3 deletions

diff --git a/vehicle.c b/vehicle.c
index 7f5aabc20..cb7ba6a98 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -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 */