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

(svn r19256) -Codechange: use a constructor/destructor for GRFConfig to make sure all members are properly initialized

Browse Source
This commit is contained in:
yexo
2010-02-25 20:06:11 +00:00
parent a9c8dbc0a0
commit 7ff55502f0
7 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/settings.cpp
View File

@@ -1190,8 +1190,7 @@ static GRFConfig *GRFLoadConfig(IniFile *ini, const char *grpname, bool is_stati
if (group == NULL) return NULL;
for (item = group->item; item != NULL; item = item->next) {
GRFConfig *c = CallocT<GRFConfig>(1);
c->filename = strdup(item->name);
GRFConfig *c = new GRFConfig(item->name);
/* Parse parameters */
if (!StrEmpty(item->value)) {
@@ -1217,7 +1216,7 @@ static GRFConfig *GRFLoadConfig(IniFile *ini, const char *grpname, bool is_stati
}
ShowInfoF("ini: ignoring invalid NewGRF '%s': %s", item->name, msg);
ClearGRFConfig(&c);
delete c;
continue;
}
@@ -1231,7 +1230,7 @@ static GRFConfig *GRFLoadConfig(IniFile *ini, const char *grpname, bool is_stati
}
}
if (duplicate) {
ClearGRFConfig(&c);
delete c;
continue;
}