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

Rename OT_RELEASE_SLOT to OT_SLOT, use a subtype field

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-11 19:01:25 +00:00
parent 6140431427
commit 2fc631b15b
7 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/timetable_cmd.cpp
View File

@@ -713,8 +713,8 @@ std::vector<TimetableProgress> PopulateSeparationState(const Vehicle *v_start)
// Do not try to separate vehicles on depot service or halt orders
separation_valid = false;
}
if (order->IsType(OT_RELEASE_SLOT) || order->IsType(OT_COUNTER) || order->IsType(OT_DUMMY) || order->IsType(OT_LABEL)) {
// Do not try to separate vehicles on release slot, change counter, or invalid orders
if (order->IsType(OT_SLOT) || order->IsType(OT_COUNTER) || order->IsType(OT_DUMMY) || order->IsType(OT_LABEL)) {
// Do not try to separate vehicles on slot, change counter, or invalid orders
separation_valid = false;
}
int order_ticks;