diff options
| author | Vicent Marti | 2008-07-06 21:38:26 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-07-06 21:38:26 +0000 |
| commit | 9b7faedb0de9f9c3bc18bff5bfc0a629142806b5 (patch) | |
| tree | f9c65087ea14da612d81f743ebbfab2fc6812419 | |
| parent | 40bf717d3ba7974d95414bf8c8cf1abe34de288d (diff) | |
| download | scummvm-rg350-9b7faedb0de9f9c3bc18bff5bfc0a629142806b5.tar.gz scummvm-rg350-9b7faedb0de9f9c3bc18bff5bfc0a629142806b5.tar.bz2 scummvm-rg350-9b7faedb0de9f9c3bc18bff5bfc0a629142806b5.zip | |
Bug fixes for "judgement day" (yay).
svn-id: r32932
| -rw-r--r-- | graphics/VectorRenderer.h | 5 | ||||
| -rw-r--r-- | gui/ThemeDefaultXML.cpp | 4 | ||||
| -rw-r--r-- | gui/ThemeRenderer.cpp | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/graphics/VectorRenderer.h b/graphics/VectorRenderer.h index d6b315d2b3..08c8a8435d 100644 --- a/graphics/VectorRenderer.h +++ b/graphics/VectorRenderer.h @@ -535,8 +535,13 @@ public: * @see VectorRenderer::copyFrame() */ virtual void copyFrame(OSystem *sys, const Common::Rect &r) { +#ifdef OVERLAY_MULTIPLE_DEPTHS + sys->copyRectToOverlay((const PixelType*)_activeSurface->getBasePtr(r.left, r.top), + _activeSurface->w, r.left, r.top, r.width(), r.height()); +#else sys->copyRectToOverlay((const OverlayColor*)_activeSurface->getBasePtr(r.left, r.top), _activeSurface->w, r.left, r.top, r.width(), r.height()); +#endif } virtual void copyWholeFrame(OSystem *sys) { diff --git a/gui/ThemeDefaultXML.cpp b/gui/ThemeDefaultXML.cpp index 11ef1b58b0..182535a9c6 100644 --- a/gui/ThemeDefaultXML.cpp +++ b/gui/ThemeDefaultXML.cpp @@ -51,6 +51,10 @@ bool ThemeRenderer::loadDefaultXML() { "</drawdata>" "<drawdata id = 'button_idle' cache = false>" + "<drawstep func = 'roundedsq' radius = '8' stroke = 0 fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' size = 'auto' shadow = 3 />" + "</drawdata>" + + "<drawdata id = 'button_hover' cache = false>" "<drawstep func = 'roundedsq' radius = '8' fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' size = 'auto' shadow = 3 />" "</drawdata>" "</render_info>" diff --git a/gui/ThemeRenderer.cpp b/gui/ThemeRenderer.cpp index d17698c9c1..281c02f8f4 100644 --- a/gui/ThemeRenderer.cpp +++ b/gui/ThemeRenderer.cpp @@ -196,6 +196,9 @@ bool ThemeRenderer::addDrawData(DrawData data_id, bool cached) { bool ThemeRenderer::loadTheme(Common::String themeName) { unloadTheme(); + if (themeName == "builtin" && !loadDefaultXML()) + error("Could not load default embeded theme."); + if (!loadThemeXML(themeName)) { warning("Could not parse custom theme '%s'.\nFalling back to default theme", themeName.c_str()); |