dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r19255) -Codechange: encapsulate GRFIdentifier in GRFConfig instead of subclassing it

Browse Source
This commit is contained in:
yexo
2010-02-25 20:05:31 +00:00
parent d60fb0640b
commit b21278659c
15 changed files with 75 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings.cpp
View File

@@ -1224,7 +1224,7 @@ static GRFConfig *GRFLoadConfig(IniFile *ini, const char *grpname, bool is_stati
/* Check for duplicate GRFID (will also check for duplicate filenames) */
bool duplicate = false;
for (const GRFConfig *gc = first; gc != NULL; gc = gc->next) {
if (gc->grfid == c->grfid) {
if (gc->ident.grfid == c->ident.grfid) {
ShowInfoF("ini: ignoring NewGRF '%s': duplicate GRF ID with '%s'", item->name, gc->filename);
duplicate = true;
break;