aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.h
diff options
context:
space:
mode:
authorMax Horn2007-06-23 10:38:03 +0000
committerMax Horn2007-06-23 10:38:03 +0000
commit4e4358e8c33bfcf8213c5b9938551835d583f747 (patch)
treeb6e4f2998b02519adca41d1be98f545a037a7641 /engines/scumm/scumm.h
parent2bbe67afdf4d4df36fc100690cf87c8a75d5a354 (diff)
downloadscummvm-rg350-4e4358e8c33bfcf8213c5b9938551835d583f747.tar.gz
scummvm-rg350-4e4358e8c33bfcf8213c5b9938551835d583f747.tar.bz2
scummvm-rg350-4e4358e8c33bfcf8213c5b9938551835d583f747.zip
Made SCUMM use Common::KeyState, too (but implemented almost no fixes/optimizations based on this)
svn-id: r27655
Diffstat (limited to 'engines/scumm/scumm.h')
-rw-r--r--engines/scumm/scumm.h5
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;