diff options
| author | David Corrales | 2007-06-23 18:51:33 +0000 |
|---|---|---|
| committer | David Corrales | 2007-06-23 18:51:33 +0000 |
| commit | cacd7a28fd51d960947de88abbf30c487e66529d (patch) | |
| tree | f3baa59853bfb307e452b86b9d93c4737b1fa6ab /engines/gob/util.h | |
| parent | 0ac96302fe9c04df79cb01a77d19535b45fe2db0 (diff) | |
| parent | 90c2210dae8c91fa8babc6b05564e15c9d445d18 (diff) | |
| download | scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.gz scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.bz2 scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.zip | |
Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
Diffstat (limited to 'engines/gob/util.h')
| -rw-r--r-- | engines/gob/util.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/gob/util.h b/engines/gob/util.h index 09fe668518..2cc0547a20 100644 --- a/engines/gob/util.h +++ b/engines/gob/util.h @@ -26,6 +26,8 @@ #ifndef GOB_UTIL_H #define GOB_UTIL_H +#include "common/keyboard.h" + #include "gob/video.h" namespace Gob { @@ -90,7 +92,7 @@ public: protected: int16 _mouseButtons; - int16 _keyBuffer[KEYBUFSIZE]; + Common::KeyState _keyBuffer[KEYBUFSIZE]; int16 _keyBufferHead; int16 _keyBufferTail; @@ -99,9 +101,9 @@ protected: GobEngine *_vm; bool keyBufferEmpty(); - void addKeyToBuffer(int16 key); - bool getKeyFromBuffer(int16& key); - int16 translateKey(int16 key); + void addKeyToBuffer(const Common::KeyState &key); + bool getKeyFromBuffer(Common::KeyState &key); + int16 translateKey(const Common::KeyState &key); void checkJoystick(); }; |