mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Train curve detection did not take shortened parts into account. (#12910) 

Only the number of parts between curves was counted, which with shortened parts would be higher than full length parts and fail to limit as expected.
pull/12836/head
Peter Nelson 2024-09-12 06:47:54 +01:00 committed by GitHub
parent bed2a060ce
commit 6deee5e5e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/train_cmd.cpp
View File

@ -320,7 +320,7 @@ uint16_t Train::GetCurveSpeedLimit() const
int sum = 0; int sum = 0;
int pos = 0; int pos = 0;
int lastpos = -1; int lastpos = -1;
for (const Vehicle *u = this; u->Next() != nullptr; u = u->Next(), pos++) { for (const Train *u = this; u->Next() != nullptr; u = u->Next(), pos += u->gcache.cached_veh_length) {
Direction this_dir = u->direction; Direction this_dir = u->direction;
Direction next_dir = u->Next()->direction; Direction next_dir = u->Next()->direction;
@ -333,7 +333,7 @@ uint16_t Train::GetCurveSpeedLimit() const
if (lastpos != -1) { if (lastpos != -1) {
numcurve++; numcurve++;
sum += pos - lastpos; sum += pos - lastpos;
if (pos - lastpos == 1 && max_speed > 88) { if (pos - lastpos <= static_cast<int>(VEHICLE_LENGTH) && max_speed > 88) {
max_speed = 88; max_speed = 88;
} }
} }
@ -350,6 +350,7 @@ uint16_t Train::GetCurveSpeedLimit() const
if (curvecount[0] == 1 && curvecount[1] == 1) { if (curvecount[0] == 1 && curvecount[1] == 1) {
max_speed = absolute_max_speed; max_speed = absolute_max_speed;
} else { } else {
sum = CeilDiv(sum, VEHICLE_LENGTH);
sum /= numcurve; sum /= numcurve;
max_speed = 232 - (13 - Clamp(sum, 1, 12)) * (13 - Clamp(sum, 1, 12)); max_speed = 232 - (13 - Clamp(sum, 1, 12)) * (13 - Clamp(sum, 1, 12));
} }