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/scumm/scumm.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/scumm/scumm.h')
| -rw-r--r-- | engines/scumm/scumm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 59c5923e3b..8c8124714d 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -29,6 +29,7 @@ #include "engines/engine.h" #include "common/endian.h" #include "common/file.h" +#include "common/keyboard.h" #include "common/rect.h" #include "common/str.h" #include "graphics/surface.h" @@ -482,7 +483,7 @@ public: protected: void waitForTimer(int msec_delay); virtual void processInput(); - virtual void processKeyboard(int lastKeyHit); + virtual void processKeyboard(Common::KeyState lastKeyHit); virtual void clearClickedStatus(); // Cursor/palette @@ -584,7 +585,7 @@ public: Common::String generateFilename(const int room) const; protected: - int _keyPressed; + Common::KeyState _keyPressed; bool _keyDownMap[512]; // FIXME - 512 is a guess. it's max(kbd.ascii) Common::Point _mouse; |