(svn r22866) -Fix (r16396): Generic callbacks shall chain to the next GRF when the callback fails.
This commit is contained in:
@@ -148,7 +148,7 @@ static uint16 GetGenericCallbackResult(uint8 feature, ResolverObject *object, co
|
|||||||
const SpriteGroup *group = it->group;
|
const SpriteGroup *group = it->group;
|
||||||
object->grffile = it->file;
|
object->grffile = it->file;
|
||||||
group = SpriteGroup::Resolve(group, object);
|
group = SpriteGroup::Resolve(group, object);
|
||||||
if (group == NULL) continue;
|
if (group == NULL || group->GetCallbackResult() == CALLBACK_FAILED) continue;
|
||||||
|
|
||||||
/* Return NewGRF file if necessary */
|
/* Return NewGRF file if necessary */
|
||||||
if (file != NULL) *file = it->file;
|
if (file != NULL) *file = it->file;
|
||||||
|
Reference in New Issue
Block a user