[Scummvm-cvs-logs] SF.net SVN: scummvm:[53022] scummvm/branches/branch-1-2-0/gui/GuiManager. cpp

[agent-q at users.sourceforge.net]

Revision: 53022
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53022&view=rev
Author:   agent-q
Date:     2010-10-04 22:41:22 +0000 (Mon, 04 Oct 2010)

Log Message:
-----------
GUI: Don't search for theme zip files on startup when running on the DS.  Themes aren't supported anyway, and the search severely delays startup.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/gui/GuiManager.cpp

Modified: scummvm/branches/branch-1-2-0/gui/GuiManager.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/gui/GuiManager.cpp	2010-10-04 22:39:55 UTC (rev 53021)
+++ scummvm/branches/branch-1-2-0/gui/GuiManager.cpp	2010-10-04 22:41:22 UTC (rev 53022)
@@ -72,6 +72,12 @@
 	ConfMan.registerDefault("gui_renderer", ThemeEngine::findModeConfigName(ThemeEngine::_defaultRendererMode));
 	ThemeEngine::GraphicsMode gfxMode = (ThemeEngine::GraphicsMode)ThemeEngine::findMode(ConfMan.get("gui_renderer"));
 
+#ifdef __DS__
+	if (!loadNewTheme("builtin", gfxMode)) {
+		// Loading the built-in theme failed as well. Bail out
+		error("Failed to load any GUI theme, aborting");
+	}
+#else
 	// Try to load the theme
 	if (!loadNewTheme(themefile, gfxMode)) {
 		// Loading the theme failed, try to load the built-in theme
@@ -80,7 +86,7 @@
 			error("Failed to load any GUI theme, aborting");
 		}
 	}
-
+#endif
 	_tooltip = 0;
 }
 


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