From 8d696760b37e1dd36191a7403d44d4de105bd7de Mon Sep 17 00:00:00 2001
From: Vicent Marti
Date: Thu, 26 Jun 2008 23:15:34 +0000
Subject: Bugfixes
svn-id: r32814
---
gui/InterfaceManager.cpp | 3 ++-
gui/ThemeDefaultXML.cpp | 8 +++++++-
gui/ThemeParser.cpp | 8 ++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/gui/InterfaceManager.cpp b/gui/InterfaceManager.cpp
index 43d2aa7864..cbaf1bbf5b 100644
--- a/gui/InterfaceManager.cpp
+++ b/gui/InterfaceManager.cpp
@@ -257,7 +257,8 @@ void InterfaceManager::drawScrollbar(const Common::Rect &r, int sliderY, int sli
int InterfaceManager::runGUI() {
Common::EventManager *eventMan = _system->getEventManager();
- loadTheme("modern_theme.xml");
+ if (!loadTheme("modern_theme.xml"))
+ return 0;
_system->showOverlay();
diff --git a/gui/ThemeDefaultXML.cpp b/gui/ThemeDefaultXML.cpp
index 6067a44545..0d9faf0768 100644
--- a/gui/ThemeDefaultXML.cpp
+++ b/gui/ThemeDefaultXML.cpp
@@ -43,14 +43,20 @@ bool InterfaceManager::loadDefaultXML() {
""
""
""
+
""
+
""
""
""
+
""
""
""
-"";
+""
+
+""
+"";
if (!parser()->loadBuffer(defaultXML, true))
return false;
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index 6665154cd2..671a4a543e 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -233,8 +233,12 @@ bool ThemeParser::parserCallback_DRAWDATA() {
if (id == -1)
return parserError("%s is not a valid DrawData set identifier.", drawdataNode->values["id"].c_str());
- if (drawdataNode->values.contains("cached") && drawdataNode->values["cached"] == "true") {
- cached = true;
+ if (drawdataNode->values.contains("cache")) {
+ if (drawdataNode->values["cache"] == "true")
+ cached = true;
+ else if (drawdataNode->values["cache"] == "false")
+ cached = false;
+ else return parserError("'Parsed' value must be either true or false.");
}
// Both Max and Johannes suggest using a non-platform specfic approach based on available
--
cgit v1.2.3