aboutsummaryrefslogtreecommitdiff
path: root/engines/agi/keyboard.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2006-05-24 21:40:24 +0000
committerPaweł Kołodziejski2006-05-24 21:40:24 +0000
commit383b598c5cde4c64729d89a7ca84039dc5fabb58 (patch)
treec677e5ba33ee5c255b2937497a0bbef647233e45 /engines/agi/keyboard.cpp
parent0f5a4b304b4cb3aa498610617d3ded63aad69c3d (diff)
downloadscummvm-rg350-383b598c5cde4c64729d89a7ca84039dc5fabb58.tar.gz
scummvm-rg350-383b598c5cde4c64729d89a7ca84039dc5fabb58.tar.bz2
scummvm-rg350-383b598c5cde4c64729d89a7ca84039dc5fabb58.zip
converted to scummvm console style
svn-id: r22618
Diffstat (limited to 'engines/agi/keyboard.cpp')
-rw-r--r--engines/agi/keyboard.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index 540d188bba..d73e1d1914 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -34,10 +34,6 @@ namespace Agi {
char last_sentence[40];
-#ifdef USE_CONSOLE
-extern struct agi_console console;
-#endif
-
/* FIXME */
extern int open_dialogue;
@@ -349,11 +345,8 @@ int wait_key() {
while (42) {
poll_timer(); /* msdos driver -> does nothing */
key = do_poll_keyboard();
- if (!console_keyhandler(key)) {
- if (key == KEY_ENTER || key == KEY_ESCAPE || key == BUTTON_LEFT)
- break;
- }
- console_cycle();
+ if (key == KEY_ENTER || key == KEY_ESCAPE || key == BUTTON_LEFT)
+ break;
}
return key;
}
@@ -370,9 +363,8 @@ int wait_any_key() {
while (42) {
poll_timer(); /* msdos driver -> does nothing */
key = do_poll_keyboard();
- if (!console_keyhandler(key) && key)
+ if (key)
break;
- console_cycle();
}
return key;
}