dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once

Browse Source
This commit is contained in:
rubidium
2010-11-20 09:09:57 +00:00
parent eb1bf15fc4
commit d24dbdac7b
5 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/saveload/afterload.cpp
View File

@@ -2377,6 +2377,19 @@ bool AfterLoadGame()
}
}
if (CheckSavegameVersion(153)) {
RoadVehicle *rv;
FOR_ALL_ROADVEHICLES(rv) {
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[];
SB(rv->state, RVS_ENTERED_STOP, 1, loading || rv->frame > _road_stop_stop_frame[rv->state - RVSB_IN_ROAD_STOP + (_settings_game.vehicle.road_side << RVS_DRIVE_SIDE)]);
} else if (HasBit(rv->state, RVS_IN_DT_ROAD_STOP)) {
SB(rv->state, RVS_ENTERED_STOP, 1, loading || rv->frame > RVC_DRIVE_THROUGH_STOP_FRAME);
}
}
}
/* Road stops is 'only' updating some caches */
AfterLoadRoadStops();
AfterLoadLabelMaps();