[Scummvm-cvs-logs] SF.net SVN: scummvm: [32932] scummvm/branches/gsoc2008-gui

Tanoku at users.sourceforge.net Tanoku at users.sourceforge.net
Sun Jul 6 23:38:27 CEST 2008


Revision: 32932
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32932&view=rev
Author:   Tanoku
Date:     2008-07-06 14:38:26 -0700 (Sun, 06 Jul 2008)

Log Message:
-----------
Bug fixes for "judgement day" (yay).

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h
    scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp

Modified: scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h
===================================================================
--- scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h	2008-07-06 19:25:32 UTC (rev 32931)
+++ scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h	2008-07-06 21:38:26 UTC (rev 32932)
@@ -535,8 +535,13 @@
 	 * @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) {

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp	2008-07-06 19:25:32 UTC (rev 32931)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp	2008-07-06 21:38:26 UTC (rev 32932)
@@ -51,6 +51,10 @@
 	"</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>"

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-07-06 19:25:32 UTC (rev 32931)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-07-06 21:38:26 UTC (rev 32932)
@@ -196,6 +196,9 @@
 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());
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list