From 25e03150a6837623b57cc49a6713ba561006e27f Mon Sep 17 00:00:00 2001 From: bjarni Date: Tue, 2 Jan 2007 20:39:07 +0000 Subject: (svn r7766) -Fix: [OSX] removed incorrect debug message about corrupted/missing grf files The md5 code now looks in the secundary data dir as well Note: OSX builds can still give the incorrect message: dbg: [sl] Cannot open savegame 'data/opntitle.dat' for saving/loading. --- src/gfxinit.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/gfxinit.c b/src/gfxinit.c index ae9fb3cb8..cfc7adbc4 100644 --- a/src/gfxinit.c +++ b/src/gfxinit.c @@ -121,6 +121,20 @@ static bool FileMD5(const MD5File file, bool warn) } #endif +#if defined SECOND_DATA_DIR + /* If we failed to find the file in the first data directory, we will try the other one */ + + if (f == NULL) { + snprintf(buf, lengthof(buf), "%s%s", _paths.second_data_dir, file.filename); + f = fopen(buf, "rb"); + + if (f == NULL) { + strtolower(buf + strlen(_paths.second_data_dir) - 1); + f = fopen(buf, "rb"); + } + } +#endif + if (f != NULL) { md5_state_t filemd5state; md5_byte_t buffer[1024]; -- cgit v1.2.3-70-g09d2