cpp/openttd-patchpack/source Changeset - r5677:24082b21a0a3

Changeset - r5677:24082b21a0a3

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 17 years ago 2007-01-14 23:09:25
rubidium@openttd.org

(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.

2 files changed with 5 insertions and 5 deletions:

src/openttd.cpp

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/openttd.cpp

➞

Show inline comments

@@ @@ -1532,48 +1532,53 @@ bool AfterLoadGame(void) @@
+				}
+			}
 			// Clear PBS reservation on crossing
 			if (IsTileType(tile, MP_STREET) && IsLevelCrossing(tile))
 				CLRBIT(_m[tile].m5, 0);
 			// Clear PBS reservation on station
 			if (IsTileType(tile, MP_STATION))
 				CLRBIT(_m[tile].m3, 6);
 		} END_TILE_LOOP(tile, MapSizeX(), MapSizeY(), 0);
+	}
 	if (CheckSavegameVersion(22))  UpdatePatches();
 	if (CheckSavegameVersion(25)) {
 		Vehicle *v;
 		FOR_ALL_VEHICLES(v) {
 			if (v->type == VEH_Road) {
 				v->vehstatus &= ~0x40;
 				v->u.road.slot = NULL;
 				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)) {
 		Station *st;
 		FOR_ALL_STATIONS(st) {
 			st->last_vehicle_type = VEH_Invalid;
+		}
+	}
 	YapfNotifyTrackLayoutChange(INVALID_TILE, INVALID_TRACK);
 	if (CheckSavegameVersion(34)) FOR_ALL_PLAYERS(p) ResetPlayerLivery(p);
 	FOR_ALL_PLAYERS(p) p->avail_railtypes = GetPlayerRailtypes(p->index);
 	if (!CheckSavegameVersion(27)) AfterLoadStations();
+	{
 		/* Set up the engine count for all players */
 		Player *players[MAX_PLAYERS];
 		const Vehicle *v;
 		for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) players[i] = GetPlayer(i);

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -3039,47 +3039,42 @@ static void Load_STNS(void) @@
 					error("Station: too many truckstations in savegame");
 				InitializeRoadStop(st->truck_stops, NULL, st->lorry_tile_obsolete, st->index);
+			}
+		}
+	}
 	/* This is to ensure all pointers are within the limits of _stations_size */
 	if (_station_tick_ctr > GetMaxStationIndex()) _station_tick_ctr = 0;
+}
 static void Save_ROADSTOP(void)
+{
 	RoadStop *rs;
 	FOR_ALL_ROADSTOPS(rs) {
 		SlSetArrayIndex(rs->index);
 		SlObject(rs, _roadstop_desc);
+	}
+}
 static void Load_ROADSTOP(void)
+{
 	int index;
 	Vehicle *v;
 	while ((index = SlIterateArray()) != -1) {
 		RoadStop *rs;
 		if (!AddBlockIfNeeded(&_RoadStop_pool, index))
 			error("RoadStops: failed loading savegame: too many RoadStops");
 		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[] = {
 	{ 'STNS', Save_STNS,      Load_STNS,      CH_ARRAY },
 	{ 'ROAD', Save_ROADSTOP,  Load_ROADSTOP,  CH_ARRAY | CH_LAST},
 };

0 comments (0 inline, 0 general)