aboutsummaryrefslogtreecommitdiff
path: root/engines/agi/keyboard.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2006-05-24 11:39:29 +0000
committerPaweł Kołodziejski2006-05-24 11:39:29 +0000
commit691ae72a591f761af458882a9ae5c5b945948921 (patch)
tree0ccaa5646f6ba6dd4ab02cd5ce9a22e56f76607c /engines/agi/keyboard.cpp
parent1ec169ad3a14533662a74f992d95e0b820623ad5 (diff)
downloadscummvm-rg350-691ae72a591f761af458882a9ae5c5b945948921.tar.gz
scummvm-rg350-691ae72a591f761af458882a9ae5c5b945948921.tar.bz2
scummvm-rg350-691ae72a591f761af458882a9ae5c5b945948921.zip
include mouse support always
svn-id: r22605
Diffstat (limited to 'engines/agi/keyboard.cpp')
-rw-r--r--engines/agi/keyboard.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index 998b95f1cd..540d188bba 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -136,14 +136,12 @@ int handle_controller(int key) {
}
}
-#ifdef USE_MOUSE
if (key == BUTTON_LEFT) {
if (getflag(F_menus_work) && mouse.y <= CHAR_LINES) {
new_input_mode(INPUT_MENU);
return true;
}
}
-#endif
if (game.player_control) {
int d = 0;
@@ -176,7 +174,6 @@ int handle_controller(int key) {
break;
}
}
-#ifdef USE_MOUSE
if (!opt.agimouse) {
/* Handle mouse button events */
if (key == BUTTON_LEFT) {
@@ -186,7 +183,6 @@ int handle_controller(int key) {
return true;
}
}
-#endif
v->flags &= ~ADJ_EGO_XY;
@@ -354,11 +350,7 @@ int wait_key() {
poll_timer(); /* msdos driver -> does nothing */
key = do_poll_keyboard();
if (!console_keyhandler(key)) {
- if (key == KEY_ENTER || key == KEY_ESCAPE
-#ifdef USE_MOUSE
- || key == BUTTON_LEFT
-#endif
- )
+ if (key == KEY_ENTER || key == KEY_ESCAPE || key == BUTTON_LEFT)
break;
}
console_cycle();