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

Bug fixes to get new keyboard pack working

Browse source 
svn-id: r33465
This commit is contained in:
Stephen Kennedy 2008-07-31 10:54:13 +00:00
parent 8345c1b687
commit ad6563a57a
3 changed files with 55 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backends/common/virtual-keyboard-parser.cpp
View file

@ -300,13 +300,15 @@ bool VirtualKeyboardParser::parserCallback_Layout() {
}
_mode->bitmapName = layoutNode->values["bitmap"];
if (!ImageMan.registerSurface(_mode->bitmapName, 0))
return parserError("Error loading bitmap '%s'", _mode->bitmapName.c_str());
_mode->image = ImageMan.getSurface(_mode->bitmapName);
if (!_mode->image)
return parserError("Error loading bitmap '%s'", _mode->bitmapName.c_str());
if (!_mode->image) {
if (!ImageMan.registerSurface(_mode->bitmapName, 0))
return parserError("Error loading bitmap '%s'", _mode->bitmapName.c_str());
_mode->image = ImageMan.getSurface(_mode->bitmapName);
if (!_mode->image)
return parserError("Error loading bitmap '%s'", _mode->bitmapName.c_str());
}
if (layoutNode->values.contains("transparent_color")) {
int r, g, b;
@ -347,9 +349,9 @@ bool VirtualKeyboardParser::parserCallback_Area() {
Common::String& target = areaNode->values["target"];
Common::String& coords = areaNode->values["coords"];
if (target == "preview_area") {
if (target == "display_area") {
if (shape != "rect")
return parserError("preview_area must be a rect area");
return parserError("display_area must be a rect area");
_mode->previewArea = new Common::Rect();
return parseRect(_mode->previewArea, coords);
} else if (shape == "rect") {