thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: synced with ScummVM

Browse source
This commit is contained in:
Pawel Kolodziejski 2013-07-07 15:29:33 +02:00
parent 1f3ad19a38
commit 068ff94d20
228 changed files with 11689 additions and 4232 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gui/ThemeParser.cpp
View file

@ -335,11 +335,15 @@ bool ThemeParser::parserCallback_drawstep(ParserNode *node) {
drawstep->drawingCall = getDrawingFunctionCallback(functionName);
if (drawstep->drawingCall == 0)
if (drawstep->drawingCall == 0) {
delete drawstep;
return parserError(functionName + " is not a valid drawing function name");
}
if (!parseDrawStep(node, drawstep, true))
if (!parseDrawStep(node, drawstep, true)) {
delete drawstep;
return false;
}
_theme->addDrawStep(getParentNode(node)->values["id"], *drawstep);
delete drawstep;
@ -691,7 +695,7 @@ bool ThemeParser::parserCallback_layout(ParserNode *node) {
return false;
}
Common::parseBool(node->values["center"], center);
(void)Common::parseBool(node->values["center"], center);
if (node->values["type"] == "vertical")
_theme->getEvaluator()->addLayout(GUI::ThemeLayout::kLayoutVertical, spacing, center);