diff options
Diffstat (limited to 'engines/queen/input.h')
| -rw-r--r-- | engines/queen/input.h | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/engines/queen/input.h b/engines/queen/input.h index 9afb7472b1..86092aeed6 100644 --- a/engines/queen/input.h +++ b/engines/queen/input.h @@ -28,14 +28,11 @@ #include "common/util.h" #include "common/rect.h" +#include "common/events.h" #include "queen/defs.h" class OSystem; -namespace Common { - class EventManager; -} - namespace Queen { class Input { @@ -57,7 +54,7 @@ public: void delay(uint amount); //! convert input to verb - int checkKeys(); + void checkKeys(); //! use instead of KEYVERB=0 void clearKeyVerb() { _keyVerb = VERB_NONE; } @@ -97,26 +94,6 @@ public: private: - enum KeyCode { - KEY_SPACE = ' ', - KEY_COMMA = ',', - KEY_DOT = '.', - - KEY_DIGIT_1 = '1', - KEY_DIGIT_2 = '2', - KEY_DIGIT_3 = '3', - KEY_DIGIT_4 = '4', - - KEY_ESCAPE = 27, - KEY_RETURN = 13, - KEY_BACKSPACE = 8, - - KEY_F1 = 282, - KEY_F11 = KEY_F1 + 10, - KEY_F5 = KEY_F1 + 4, - KEY_F12 - }; - //! used to get keyboard and mouse events OSystem *_system; @@ -153,7 +130,7 @@ private: bool _debugger; //! set by delay(); - int _inKey; + Common::KeyCode _inKey; //! set by delay(); int _mouseButton; |