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

Fix CheckCurveLookAhead applying curves just beyond the train length

Browse Source 
Fix vehicle spacing logic
This commit is contained in:
Jonathan G Rennison
2021-02-05 21:45:44 +00:00
parent e75e2b5bdc
commit 03f95322ae
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/pbs.cpp
View File

@@ -263,11 +263,12 @@ DECLARE_ENUM_AS_BIT_SET(FollowReservationFlags)
static void CheckCurveLookAhead(const Train *v, TrainReservationLookAhead *lookahead, int end_position, int z, RailType rt) static void CheckCurveLookAhead(const Train *v, TrainReservationLookAhead *lookahead, int end_position, int z, RailType rt)
{ {
/* Coarse filter: remove curves beyond train length */
while (!lookahead->curves.empty() && lookahead->curves.front().position < end_position - v->gcache.cached_total_length) { while (!lookahead->curves.empty() && lookahead->curves.front().position < end_position - v->gcache.cached_total_length) {
lookahead->curves.pop_front(); lookahead->curves.pop_front();
} }
if (lookahead->curves.empty()) return; if (lookahead->curves.empty() || v->Next() == nullptr) return;
static const int absolute_max_speed = UINT16_MAX; static const int absolute_max_speed = UINT16_MAX;
int max_speed = absolute_max_speed; int max_speed = absolute_max_speed;
@@ -279,15 +280,22 @@ static void CheckCurveLookAhead(const Train *v, TrainReservationLookAhead *looka
int sum = 0; int sum = 0;
int pos = 0; int pos = 0;
int lastpos = -1; int lastpos = -1;
const Train *u = v->Last(); const Train *u = v->Next();
int veh_offset = v->gcache.cached_total_length - u->gcache.cached_veh_length; int veh_offset = v->CalcNextVehicleOffset();
for (const TrainReservationLookAheadCurve &curve : lookahead->curves) { for (auto iter = lookahead->curves.rbegin(); iter != lookahead->curves.rend(); ++iter) {
const TrainReservationLookAheadCurve &curve = *iter;
int delta = end_position - curve.position; int delta = end_position - curve.position;
while (veh_offset > delta && u->Previous() != nullptr) { while (delta >= veh_offset) {
veh_offset -= u->gcache.cached_veh_length; if (u->Next() != nullptr) {
pos++; veh_offset += u->CalcNextVehicleOffset();
u = u->Previous(); u = u->Next();
pos++;
} else {
u = nullptr;
break;
}
} }
if (u == nullptr) break;
if (curve.dir_diff == DIRDIFF_45LEFT) curvecount[0]++; if (curve.dir_diff == DIRDIFF_45LEFT) curvecount[0]++;
if (curve.dir_diff == DIRDIFF_45RIGHT) curvecount[1]++; if (curve.dir_diff == DIRDIFF_45RIGHT) curvecount[1]++;