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 b21278659c
commit daf89297fe
7 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gfxinit.cpp
View File

@@ -178,8 +178,7 @@ static void LoadSpriteTables()
* so we have to manually add it, and then remove it later.
*/
GRFConfig *top = _grfconfig;
GRFConfig *master = CallocT<GRFConfig>(1);
master->filename = strdup(used_set->files[GFT_EXTRA].filename);
GRFConfig *master = new GRFConfig(used_set->files[GFT_EXTRA].filename);
FillGRFDetails(master, false);
master->windows_paletted = (used_set->palette == PAL_WINDOWS);
ClrBit(master->flags, GCF_INIT_ONLY);
@@ -189,7 +188,7 @@ static void LoadSpriteTables()
LoadNewGRF(SPR_NEWGRFS_BASE, i);
/* Free and remove the top element. */
ClearGRFConfig(&master);
delete master;
_grfconfig = top;
}