From 48c2669185f467dcfccafa704890431278efb052 Mon Sep 17 00:00:00 2001 From: bjarni Date: Wed, 16 Jan 2008 01:27:24 +0000 Subject: (svn r11872) -Fix (r9874): EngineHasReplacementForPlayer() didn't look in ALL_GROUP --- src/engine.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/engine.cpp b/src/engine.cpp index 94574b492..90fd63f77 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -507,6 +507,10 @@ void RemoveAllEngineReplacement(EngineRenewList *erl) EngineID EngineReplacement(EngineRenewList erl, EngineID engine, GroupID group) { const EngineRenew *er = GetEngineReplacement(erl, engine, group); + if (er == NULL && (group == DEFAULT_GROUP || (IsValidGroupID(group) && !GetGroup(group)->replace_protection))) { + /* We didn't find anything useful in the vehicle's own group so we will try ALL_GROUP */ + er = GetEngineReplacement(erl, engine, ALL_GROUP); + } return er == NULL ? INVALID_ENGINE : er->to; } -- cgit v1.2.3-70-g09d2