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

Restore gv_flags when aborting train entering/exiting wormhole

Browse Source 
This fixes train disconnecting when reversing at the end of a
sloped bridge ramp due to heading the wrong way onto a signalled bridge.
This commit is contained in:
Jonathan G Rennison
2019-01-31 01:43:08 +00:00
parent c82c1aa271
commit a47c4c781c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/train_cmd.cpp
View File

@@ -3850,6 +3850,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
bool update_signal_tunbridge_exit = false; bool update_signal_tunbridge_exit = false;
Direction old_direction = INVALID_DIR; Direction old_direction = INVALID_DIR;
TrackBits old_trackbits = INVALID_TRACK_BIT; TrackBits old_trackbits = INVALID_TRACK_BIT;
uint16 old_gv_flags = 0;
auto notify_direction_changed = [&](Direction old_direction, Direction new_direction) { auto notify_direction_changed = [&](Direction old_direction, Direction new_direction) {
if (prev == NULL && _settings_game.vehicle.train_acceleration_model == AM_ORIGINAL) { if (prev == NULL && _settings_game.vehicle.train_acceleration_model == AM_ORIGINAL) {
@@ -3873,6 +3874,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
for (prev = v->Previous(); v != nomove; prev = v, v = v->Next()) { for (prev = v->Previous(); v != nomove; prev = v, v = v->Next()) {
old_direction = v->direction; old_direction = v->direction;
old_trackbits = v->track; old_trackbits = v->track;
old_gv_flags = v->gv_flags;
DiagDirection enterdir = DIAGDIR_BEGIN; DiagDirection enterdir = DIAGDIR_BEGIN;
bool update_signals_crossing = false; // will we update signals or crossing state? bool update_signals_crossing = false; // will we update signals or crossing state?
@@ -4383,6 +4385,7 @@ reverse_train_direction:
/* Entering/exiting wormhole failed/aborted, back out changes to vehicle direction and track */ /* Entering/exiting wormhole failed/aborted, back out changes to vehicle direction and track */
v->track = old_trackbits; v->track = old_trackbits;
v->direction = old_direction; v->direction = old_direction;
v->gv_flags = old_gv_flags;
} }
if (reverse) { if (reverse) {
v->wait_counter = 0; v->wait_counter = 0;