mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-22 10:17:22 +00:00
Bug fixes for "judgement day" (yay).
svn-id: r32932
This commit is contained in:
parent
40bf717d3b
commit
9b7faedb0d
@ -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) {
|
||||
|
@ -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>"
|
||||
|
@ -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());
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user