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

Add tracerestrict reserved tiles ahead conditional

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-02-13 03:13:36 +00:00
parent 35d720b0ad
commit aff89b61f5
5 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tracerestrict.cpp
View File

@@ -524,6 +524,15 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp
break;
}
case TRIT_COND_RESERVED_TILES: {
uint tiles_ahead = 0;
if (v->lookahead != nullptr) {
tiles_ahead = std::max<int>(0, v->lookahead->reservation_end_position - v->lookahead->current_position) / TILE_SIZE;
}
result = TestCondition(tiles_ahead, condop, condvalue);
break;
}
default:
NOT_REACHED();
}
@@ -807,6 +816,7 @@ CommandCost TraceRestrictProgram::Validate(const std::vector<TraceRestrictItem>
case TRIT_COND_LOAD_PERCENT:
case TRIT_COND_COUNTER_VALUE:
case TRIT_COND_TIME_DATE_VALUE:
case TRIT_COND_RESERVED_TILES:
break;
default: