aboutsummaryrefslogtreecommitdiff
path: root/sword2/function.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-05-09 13:32:04 +0000
committerTorbjörn Andersson2004-05-09 13:32:04 +0000
commitfc970b3c75fd64f399a4c22222d7e295825184c9 (patch)
tree92998da511ba26705bbdc7cbe161e32bb9e031b6 /sword2/function.cpp
parent577600537c2e3cfdacb4e53ccfdab7e06b55a0ed (diff)
downloadscummvm-rg350-fc970b3c75fd64f399a4c22222d7e295825184c9.tar.gz
scummvm-rg350-fc970b3c75fd64f399a4c22222d7e295825184c9.tar.bz2
scummvm-rg350-fc970b3c75fd64f399a4c22222d7e295825184c9.zip
Removed the buffering of mouse and keyboard events. I don't think any of
our other engines do this, so there is little reason for BS2 to. I did add a filtering mechanism so that mouse button releases and scroll wheeling is ignored during normal gameplay, but I don't know if that was necessary either. Since this left little more than an empty husk where the Input class used to be, I've eliminated that class and buried its remains in Sword2Engine. svn-id: r13812
Diffstat (limited to 'sword2/function.cpp')
-rw-r--r--sword2/function.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sword2/function.cpp b/sword2/function.cpp
index eab786fcb2..4fd756d529 100644
--- a/sword2/function.cpp
+++ b/sword2/function.cpp
@@ -662,9 +662,9 @@ int32 Logic::fnPlayCredits(int32 *params) {
_vm->_graphics->updateDisplay();
- KeyboardEvent ke;
+ KeyboardEvent *ke = _vm->keyboardEvent();
- if (_vm->_input->readKey(&ke) == RD_OK && ke.keycode == 27) {
+ if (ke && ke->keycode == 27) {
if (!abortCredits) {
abortCredits = true;
_vm->_graphics->fadeDown();