mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16538) -Fix (r16503): when finding duplicate graphics sets favour the more complete one

release/1.0
rubidium 2009-06-08 22:13:10 +00:00
parent 050bbb4dac
commit afdeab52ab
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gfxinit.cpp
View File

@ -467,7 +467,9 @@ bool OBGFileScanner::AddFile(const char *filename, size_t basepath_length)
} }
} }
if (duplicate != NULL) { 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); DEBUG(grf, 1, "Not adding %s (%i) as base graphics set (duplicate)", graphics->name, graphics->version);
delete graphics; delete graphics;
} else { } else {