gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-07 06:46:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rubidium 2007-01-14 23:09:25 +00:00
parent cd74706c54
commit 48611e1e20
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openttd.cpp
View File

@ -1553,6 +1553,11 @@ bool AfterLoadGame(void)
v->u.road.slot_age = 0; 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)) { if (CheckSavegameVersion(26)) {

5
src/station_cmd.cpp
View File

@ -3060,7 +3060,6 @@ static void Save_ROADSTOP(void)
static void Load_ROADSTOP(void) static void Load_ROADSTOP(void)
{ {
int index; int index;
Vehicle *v;
while ((index = SlIterateArray()) != -1) { while ((index = SlIterateArray()) != -1) {
RoadStop *rs; RoadStop *rs;
@ -3071,10 +3070,6 @@ static void Load_ROADSTOP(void)
rs = GetRoadStop(index); rs = GetRoadStop(index);
SlObject(rs, _roadstop_desc); 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[] = { extern const ChunkHandler _station_chunk_handlers[] = {