diff options
| author | rubidium <rubidium@openttd.org> | 2011-08-24 13:33:49 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-08-24 13:33:49 +0000 |
| commit | 0061b5f1842776ff4d69bf9f3bcdfb348b2f5a76 (patch) | |
| tree | 3f45b215933b577fb159c9df743926ebdca1d126 /src/gfxinit.cpp | |
| parent | bbdc8fdba7d30099d80227659919930f3dedf84b (diff) | |
| download | openttd-0061b5f1842776ff4d69bf9f3bcdfb348b2f5a76.tar.xz | |
(svn r22822) -Codechange: make a distinction between base sets and newgrfs for their directory
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 0a2d82973..98d0ad390 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -108,7 +108,7 @@ void CheckExternalFiles() /* Not all files were loaded successfully, see which ones */ add_pos += seprintf(add_pos, last, "Trying to load graphics set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of readme.txt.\n\nThe following files are corrupted or missing:\n", used_set->name); for (uint i = 0; i < GraphicsSet::NUM_FILES; i++) { - MD5File::ChecksumResult res = used_set->files[i].CheckMD5(DATA_DIR); + MD5File::ChecksumResult res = used_set->files[i].CheckMD5(BASESET_DIR); if (res != MD5File::CR_MATCH) add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", used_set->files[i].filename, res == MD5File::CR_MISMATCH ? "corrupt" : "missing", used_set->files[i].missing_warning); } add_pos += seprintf(add_pos, last, "\n"); @@ -121,7 +121,7 @@ void CheckExternalFiles() assert_compile(SoundsSet::NUM_FILES == 1); /* No need to loop each file, as long as there is only a single * sound file. */ - add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", sounds_set->files->filename, sounds_set->files->CheckMD5(DATA_DIR) == MD5File::CR_MISMATCH ? "corrupt" : "missing", sounds_set->files->missing_warning); + add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", sounds_set->files->filename, sounds_set->files->CheckMD5(BASESET_DIR) == MD5File::CR_MISMATCH ? "corrupt" : "missing", sounds_set->files->missing_warning); } if (add_pos != error_msg) ShowInfoF("%s", error_msg); @@ -208,7 +208,7 @@ void GfxLoadSprites() bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path, const char *full_filename) { - bool ret = this->BaseSet<GraphicsSet, MAX_GFT, DATA_DIR>::FillSetDetails(ini, path, full_filename, false); + bool ret = this->BaseSet<GraphicsSet, MAX_GFT, BASESET_DIR>::FillSetDetails(ini, path, full_filename, false); if (ret) { IniGroup *metadata = ini->GetGroup("metadata"); IniItem *item; |