aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/gui_v2.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2012-06-16 01:37:40 -0400
committerMatthew Hoops2012-06-16 01:43:32 -0400
commit625f6cc71657e95e0361edefa333a38910c1aca5 (patch)
treeae5ef8582ede4d62e56253467ea144db2341b353 /engines/kyra/gui_v2.cpp
parentf02b696573fe4281e4890d71b74671804a5ebf41 (diff)
parent5230a0d61795e2855625a43d60dc3bc2ed83fc3d (diff)
downloadscummvm-rg350-625f6cc71657e95e0361edefa333a38910c1aca5.tar.gz
scummvm-rg350-625f6cc71657e95e0361edefa333a38910c1aca5.tar.bz2
scummvm-rg350-625f6cc71657e95e0361edefa333a38910c1aca5.zip
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/kyra/gui_v2.cpp')
-rw-r--r--engines/kyra/gui_v2.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index 65f8bd45e5..1df4149d2e 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -105,15 +105,11 @@ void GUI_v2::processButton(Button *button) {
switch (val1 - 1) {
case 0:
- _screen->hideMouse();
_screen->drawShape(_screen->_curPage, dataPtr, x, y, button->dimTableIndex, 0x10);
- _screen->showMouse();
break;
case 1:
- _screen->hideMouse();
_screen->printText((const char *)dataPtr, x, y, val2, val3);
- _screen->showMouse();
break;
case 3:
@@ -122,22 +118,16 @@ void GUI_v2::processButton(Button *button) {
break;
case 4:
- _screen->hideMouse();
_screen->drawBox(x, y, x2, y2, val2);
- _screen->showMouse();
break;
case 5:
- _screen->hideMouse();
_screen->fillRect(x, y, x2, y2, val2, -1, true);
- _screen->showMouse();
break;
default:
break;
}
-
- _screen->updateScreen();
}
int GUI_v2::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseWheel) {