aboutsummaryrefslogtreecommitdiff
path: root/sword2/controls.cpp
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/controls.cpp
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/controls.cpp')
-rw-r--r--sword2/controls.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sword2/controls.cpp b/sword2/controls.cpp
index d4817153b8..c677e3f4b2 100644
--- a/sword2/controls.cpp
+++ b/sword2/controls.cpp
@@ -280,7 +280,7 @@ void Dialog::setResult(int result) {
}
int Dialog::runModal() {
- uint32 oldFilter = _vm->setEventFilter(0);
+ uint32 oldFilter = _vm->setInputEventFilter(0);
int i;
@@ -386,7 +386,7 @@ int Dialog::runModal() {
setResult(0);
}
- _vm->setEventFilter(oldFilter);
+ _vm->setInputEventFilter(oldFilter);
return _result;
}