diff options
author | Vicent Marti | 2008-09-07 21:45:18 +0000 |
---|---|---|
committer | Vicent Marti | 2008-09-07 21:45:18 +0000 |
commit | 2de0d7d42e100b56861c1f95ba8a6bab2cf9ff0d (patch) | |
tree | 30f190f784f2c7a1c20660d569bf04eb100eb973 | |
parent | dcc2caf6d07592eb63085c32e39cab27d027cf36 (diff) | |
download | scummvm-rg350-2de0d7d42e100b56861c1f95ba8a6bab2cf9ff0d.tar.gz scummvm-rg350-2de0d7d42e100b56861c1f95ba8a6bab2cf9ff0d.tar.bz2 scummvm-rg350-2de0d7d42e100b56861c1f95ba8a6bab2cf9ff0d.zip |
Bugfix: Theme loading on platforms which don't support cursor palettes.
svn-id: r34427
-rw-r--r-- | gui/ThemeEngine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 8da4d3d808..17623845b0 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -462,6 +462,8 @@ bool ThemeEngine::addDrawData(const Common::String &data, bool cached) { bool ThemeEngine::loadTheme(Common::String fileName) { unloadTheme(); + warning("Loading theme: %s.\n", fileName.c_str()); + if (fileName != "builtin") { if (fileName.hasSuffix(".zip")) ImageMan.addArchive(fileName); @@ -1004,7 +1006,7 @@ void ThemeEngine::setUpCursor() { bool ThemeEngine::createCursor(const Common::String &filename, int hotspotX, int hotspotY, int scale) { if (!_system->hasFeature(OSystem::kFeatureCursorHasPalette)) - return false; + return true; const Surface *cursor = _bitmaps[filename]; |