miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Variant cycle detection in FinaliseEngineArray (#14629)

Browse Source
This commit is contained in:
Jonathan G Rennison
2025-09-17 22:42:42 +01:00
committed by dP
parent 385547642a
commit bbd8ea4abe
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf.cpp
View File

@@ -904,12 +904,18 @@ static void FinaliseEngineArray()
} }
/* Check engine variants don't point back on themselves (either directly or via a loop) then set appropriate flags /* Check engine variants don't point back on themselves (either directly or via a loop) then set appropriate flags
* on variant engine. This is performed separately as all variant engines need to have been resolved. */ * on variant engine. This is performed separately as all variant engines need to have been resolved.
* Use Floyd's cycle-detection algorithm to handle the case where a cycle is present but does
* not include the starting engine ID. */
for (Engine *e : Engine::Iterate()) { for (Engine *e : Engine::Iterate()) {
EngineID parent = e->info.variant_id; EngineID parent = e->info.variant_id;
EngineID parent_slow = parent;
bool update_slow = false;
while (parent != EngineID::Invalid()) { while (parent != EngineID::Invalid()) {
parent = Engine::Get(parent)->info.variant_id; parent = Engine::Get(parent)->info.variant_id;
if (parent != e->index) continue; if (update_slow) parent_slow = Engine::Get(parent_slow)->info.variant_id;
update_slow = !update_slow;
if (parent != e->index && parent != parent_slow) continue;
/* Engine looped back on itself, so clear the variant. */ /* Engine looped back on itself, so clear the variant. */
e->info.variant_id = EngineID::Invalid(); e->info.variant_id = EngineID::Invalid();