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

Fix tracerestrict train is loading status condition when predicting orders

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-03-26 00:08:25 +00:00
parent 67c256f437
commit 923b2eb0a9
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tracerestrict.cpp
View File

@@ -482,9 +482,12 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp
has_status = v->current_order.IsType(OT_GOTO_DEPOT);
break;
case TRTSVF_LOADING:
has_status = v->current_order.IsType(OT_LOADING) || v->current_order.IsType(OT_LOADING_ADVANCE);
case TRTSVF_LOADING: {
extern const Order *_choose_train_track_saved_current_order;
const Order *o = (_choose_train_track_saved_current_order != nullptr) ? _choose_train_track_saved_current_order : &(v->current_order);
has_status = o->IsType(OT_LOADING) || o->IsType(OT_LOADING_ADVANCE);
break;
}
case TRTSVF_WAITING:
has_status = v->current_order.IsType(OT_WAITING);