Mercurial > hg > openttd

changeset 5677:2eb2392c2550 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8137) -Fix (FS#551, r4259, r4320): roadstop->num_vehicles was wrong for savegames with version 24 or lower and do not calculate roadstop->num_vehicles when reading the roadstops as the vehicles might not be loaded at that moment.
author rubidium <rubidium@openttd.org>
date Sun, 14 Jan 2007 23:09:25 +0000
parents c9994ba3a762
children 3d8596aefdc3
files src/openttd.cpp src/station_cmd.cpp
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -1553,6 +1553,11 @@
 				v->u.road.slot_age = 0;
 			}
 		}
+	} else {
+		Vehicle *v;
+		FOR_ALL_VEHICLES(v) {
+			if (v->type == VEH_Road && v->u.road.slot != NULL) v->u.road.slot->num_vehicles++;
+		}
 	}
 
 	if (CheckSavegameVersion(26)) {
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -3060,7 +3060,6 @@
 static void Load_ROADSTOP(void)
 {
 	int index;
-	Vehicle *v;
 
 	while ((index = SlIterateArray()) != -1) {
 		RoadStop *rs;
@@ -3071,10 +3070,6 @@
 		rs = GetRoadStop(index);
 		SlObject(rs, _roadstop_desc);
 	}
-
-	FOR_ALL_VEHICLES(v) {
-		if (v->type == VEH_Road && v->u.road.slot != NULL) v->u.road.slot->num_vehicles++;
-	}
 }
 
 extern const ChunkHandler _station_chunk_handlers[] = {