Mercurial > hg > openttd
changeset 12124:7c543b32c4ce draft
(svn r16538) -Fix (r16503): when finding duplicate graphics sets favour the more complete one
author | rubidium <rubidium@openttd.org> |
---|---|
date | Mon, 08 Jun 2009 22:13:10 +0000 |
parents | abcf75b507ec |
children | dd5b77965bb5 |
files | src/gfxinit.cpp |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -467,7 +467,9 @@ } } if (duplicate != NULL) { - if (duplicate->version >= graphics->version) { + /* The more complete graphics set takes precedence over the version number. */ + if ((duplicate->files == graphics->files && duplicate->version >= graphics->version) || + duplicate->files > graphics->files) { DEBUG(grf, 1, "Not adding %s (%i) as base graphics set (duplicate)", graphics->name, graphics->version); delete graphics; } else {