aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/menu.cpp
diff options
context:
space:
mode:
authorMartin Kiewitz2016-02-02 11:33:07 +0100
committerMartin Kiewitz2016-02-02 11:33:40 +0100
commit7aeadba863ed1893fa6095008d35b32ce5117749 (patch)
tree905d5e433331eb5ee2c99d7ac47a2f857c6e02d7 /engines/sci/graphics/menu.cpp
parenta9511e78d1a6594129aec973d8240cea4b93d2a1 (diff)
downloadscummvm-rg350-7aeadba863ed1893fa6095008d35b32ce5117749.tar.gz
scummvm-rg350-7aeadba863ed1893fa6095008d35b32ce5117749.tar.bz2
scummvm-rg350-7aeadba863ed1893fa6095008d35b32ce5117749.zip
SCI: Removed ".data" from SciEvent
Was the ScummVM-system-Keycode, sometimes modified. Changed Menu/Portrait/Controls32-code to use .character instead. Cleaned up a bit of code in getScummVMEvent()
Diffstat (limited to 'engines/sci/graphics/menu.cpp')
-rw-r--r--engines/sci/graphics/menu.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp
index 9d92039111..eb3f5888c7 100644
--- a/engines/sci/graphics/menu.cpp
+++ b/engines/sci/graphics/menu.cpp
@@ -747,7 +747,7 @@ GuiMenuItemEntry *GfxMenu::interactiveWithKeyboard() {
// - sierra didn't wrap around when changing item id
// - sierra allowed item id to be 0, which didn't make any sense
do {
- switch (curEvent.data) {
+ switch (curEvent.character) {
case SCI_KEY_ESC:
_curMenuId = curItemEntry->menuId; _curItemId = curItemEntry->id;
return NULL;
@@ -776,10 +776,10 @@ GuiMenuItemEntry *GfxMenu::interactiveWithKeyboard() {
newMenuId = newItemEntry->menuId; newItemId = newItemEntry->id;
// if we do this step again because of a separator line -> don't repeat left/right, but go down
- switch (curEvent.data) {
+ switch (curEvent.character) {
case SCI_KEY_LEFT:
case SCI_KEY_RIGHT:
- curEvent.data = SCI_KEY_DOWN;
+ curEvent.character = SCI_KEY_DOWN;
}
}
} while (newItemEntry->separatorLine);