cpp/openttd-patchpack/source Changeset - r18041:41456d481048

Changeset - r18041:41456d481048

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 13 years ago 2011-09-01 19:40:51
frosch@openttd.org

(svn r22866) -Fix (r16396): Generic callbacks shall chain to the next GRF when the callback fails.

1 file changed with 1 insertions and 1 deletions:

src/newgrf_generic.cpp

0 comments (0 inline, 0 general)

src/newgrf_generic.cpp

➞

Show inline comments

@@ @@ -148,7 +148,7 @@ static uint16 GetGenericCallbackResult(u @@
 		const SpriteGroup *group = it->group;
 		object->grffile = it->file;
 		group = SpriteGroup::Resolve(group, object);
 		if (group == NULL) continue;
+		if (group == NULL || group->GetCallbackResult() == CALLBACK_FAILED) continue;
 		/* Return NewGRF file if necessary */
 		if (file != NULL) *file = it->file;

0 comments (0 inline, 0 general)