aboutsummaryrefslogtreecommitdiff
path: root/sword2/sword2.h
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-07-09 13:21:21 +0000
committerTorbjörn Andersson2005-07-09 13:21:21 +0000
commitf7a6729a01ce8c07dddf4a7f7c0b25f8690e2c1a (patch)
treed14d72b8cc3acabeb0877fd00a0f358f01812306 /sword2/sword2.h
parent866d3e3db357293aea3e70a55b3944bf3dccd5ac (diff)
downloadscummvm-rg350-f7a6729a01ce8c07dddf4a7f7c0b25f8690e2c1a.tar.gz
scummvm-rg350-f7a6729a01ce8c07dddf4a7f7c0b25f8690e2c1a.tar.bz2
scummvm-rg350-f7a6729a01ce8c07dddf4a7f7c0b25f8690e2c1a.zip
This should really be two or three different commits, but I'm too lazy for
that: * Re-worked the elevator script bug workaround so that it's more consistent with the other two script bug workarounds. * Some renamings to make it more clear that game events and input events are two completely different things. * Added function for clearing pending input events, and used that to fix an annoying keyboard repeat bug when closing the debug console. (The console would keep re-opening because the key press to open it kept repeating even though the key had been released.) svn-id: r18522
Diffstat (limited to 'sword2/sword2.h')
-rw-r--r--sword2/sword2.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sword2/sword2.h b/sword2/sword2.h
index ffbe086b24..370046beee 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -97,7 +97,7 @@ struct StartUp {
class Sword2Engine : public Engine {
private:
- uint32 _eventFilter;
+ uint32 _inputEventFilter;
// The event "buffers"
MouseEvent _mouseEvent;
@@ -161,9 +161,10 @@ public:
uint32 _controlsFontId;
uint32 _redFontId;
- uint32 setEventFilter(uint32 filter);
+ uint32 setInputEventFilter(uint32 filter);
- void parseEvents();
+ void clearInputEvents();
+ void parseInputEvents();
bool checkForMouseEvents();
MouseEvent *mouseEvent();