diff options
| author | rubidium <rubidium@openttd.org> | 2010-04-19 09:34:56 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-04-19 09:34:56 +0000 |
| commit | 83e40b8cedce5172142961df86abfb002f0cb272 (patch) | |
| tree | effccac42eb4fb323d1104f570628c15b910fabd /src/gfxinit.cpp | |
| parent | 3442b8c3456b2fdbf50b3b05a2f8840ebd53218c (diff) | |
| download | openttd-83e40b8cedce5172142961df86abfb002f0cb272.tar.xz | |
(svn r19674) -Fix [FS#3774]: crash when the music/graphics metadata files were unreadable
Diffstat (limited to 'src/gfxinit.cpp')
| -rw-r--r-- | src/gfxinit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index 6ba87eee1..42043299f 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -202,9 +202,9 @@ void GfxLoadSprites() GfxInitPalettes(); } -bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path) +bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path, const char *full_filename) { - bool ret = this->BaseSet<GraphicsSet, MAX_GFT, DATA_DIR>::FillSetDetails(ini, path, false); + bool ret = this->BaseSet<GraphicsSet, MAX_GFT, DATA_DIR>::FillSetDetails(ini, path, full_filename, false); if (ret) { IniGroup *metadata = ini->GetGroup("metadata"); IniItem *item; @@ -212,7 +212,7 @@ bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path) fetch_metadata("palette"); this->palette = (*item->value == 'D' || *item->value == 'd') ? PAL_DOS : PAL_WINDOWS; } - return true; + return ret; } |