diff options
| -rw-r--r-- | gui/ThemeRenderer.cpp | 4 | ||||
| -rw-r--r-- | gui/theme.cpp | 4 | ||||
| -rw-r--r-- | gui/themes/scummodern.zip | bin | 87340 -> 34925 bytes |
3 files changed, 4 insertions, 4 deletions
diff --git a/gui/ThemeRenderer.cpp b/gui/ThemeRenderer.cpp index f323807903..5ead02ae9a 100644 --- a/gui/ThemeRenderer.cpp +++ b/gui/ThemeRenderer.cpp @@ -182,7 +182,7 @@ void ThemeRenderer::unloadTheme() { for (ImagesMap::iterator i = _bitmaps.begin(); i != _bitmaps.end(); ++i) ImageMan.unregisterSurface(i->_key); - ImageMan.remArchive(_themeFileName + ".zip"); + ImageMan.remArchive(_themeFileName); _themeEval->reset(); _themeOk = false; @@ -358,7 +358,7 @@ bool ThemeRenderer::loadTheme(Common::String fileName) { if (ConfMan.hasKey("extrapath")) Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath")); - ImageMan.addArchive(fileName + ".zip"); + ImageMan.addArchive(fileName); } if (fileName == "builtin") { diff --git a/gui/theme.cpp b/gui/theme.cpp index 3e77919ba9..45fc047c45 100644 --- a/gui/theme.cpp +++ b/gui/theme.cpp @@ -43,7 +43,7 @@ const Graphics::Font *Theme::loadFont(const char *filename) { return font; #ifdef USE_ZLIB - unzFile zipFile = unzOpen((getThemeFileName() + ".zip").c_str()); + unzFile zipFile = unzOpen((getThemeFileName()).c_str()); if (zipFile && unzLocateFile(zipFile, cacheFilename.c_str(), 2) == UNZ_OK) { unz_file_info fileInfo; unzOpenCurrentFile(zipFile); @@ -73,7 +73,7 @@ const Graphics::Font *Theme::loadFont(const char *filename) { #ifdef USE_ZLIB if (!font) { - unzFile zipFile = unzOpen((getThemeFileName() + ".zip").c_str()); + unzFile zipFile = unzOpen((getThemeFileName()).c_str()); if (zipFile && unzLocateFile(zipFile, filename, 2) == UNZ_OK) { unz_file_info fileInfo; unzOpenCurrentFile(zipFile); diff --git a/gui/themes/scummodern.zip b/gui/themes/scummodern.zip Binary files differindex bbd750a1fa..e12c89830b 100644 --- a/gui/themes/scummodern.zip +++ b/gui/themes/scummodern.zip |