From 33e3d7f6a22c938e4ed39183fa80bd13aa66b006 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Tue, 23 Nov 2010 18:26:02 +0000
Subject: (svn r21299) -Fix (r21263): a road vehicle in a depot or wormhole
 could get into an incorrect state upon savegame conversion causing it to
 break up later in the game

---
 src/saveload/afterload.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/saveload/afterload.cpp')

diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 982c3254a..8be8e2861 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -2380,6 +2380,8 @@ bool AfterLoadGame()
 	if (IsSavegameVersionBefore(153)) {
 		RoadVehicle *rv;
 		FOR_ALL_ROADVEHICLES(rv) {
+			if (rv->state == RVSB_IN_DEPOT || rv->state == RVSB_WORMHOLE) continue;
+
 			bool loading = rv->current_order.IsType(OT_LOADING) || rv->current_order.IsType(OT_LEAVESTATION);
 			if (HasBit(rv->state, RVS_IN_ROAD_STOP)) {
 				extern const byte _road_stop_stop_frame[];
-- 
cgit v1.2.3-70-g09d2