aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/inter_v1.cpp
diff options
context:
space:
mode:
authorSven Hesse2007-04-21 20:13:15 +0000
committerSven Hesse2007-04-21 20:13:15 +0000
commit8d7d61f1f67a50f70e14e85b8c05a2aa4a4a6cb9 (patch)
tree6cbb35cb2f84019dc1ba93fdad56e0fadb84d683 /engines/gob/inter_v1.cpp
parent17b28bd65275456fbc7e4b47a58826352975c39c (diff)
downloadscummvm-rg350-8d7d61f1f67a50f70e14e85b8c05a2aa4a4a6cb9.tar.gz
scummvm-rg350-8d7d61f1f67a50f70e14e85b8c05a2aa4a4a6cb9.tar.bz2
scummvm-rg350-8d7d61f1f67a50f70e14e85b8c05a2aa4a4a6cb9.zip
Some more small fixes. Gob3 is completable now :)
svn-id: r26556
Diffstat (limited to 'engines/gob/inter_v1.cpp')
-rw-r--r--engines/gob/inter_v1.cpp48
1 files changed, 2 insertions, 46 deletions
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 5ac605e301..822c96d749 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -1663,52 +1663,8 @@ bool Inter_v1::o1_keyFunc(OpFuncParams &params) {
break;
case 2:
- key = 0;
-
- if (_vm->_global->_pressedKeys[0x48])
- key |= 1;
-
- if (_vm->_global->_pressedKeys[0x50])
- key |= 2;
-
- if (_vm->_global->_pressedKeys[0x4D])
- key |= 4;
-
- if (_vm->_global->_pressedKeys[0x4B])
- key |= 8;
-
- if (_vm->_global->_pressedKeys[0x1C])
- key |= 0x10;
-
- if (_vm->_global->_pressedKeys[0x39])
- key |= 0x20;
-
- if (_vm->_global->_pressedKeys[1])
- key |= 0x40;
-
- if (_vm->_global->_pressedKeys[0x1D])
- key |= 0x80;
-
- if (_vm->_global->_pressedKeys[0x2A])
- key |= 0x100;
-
- if (_vm->_global->_pressedKeys[0x36])
- key |= 0x200;
-
- if (_vm->_global->_pressedKeys[0x38])
- key |= 0x400;
-
- if (_vm->_global->_pressedKeys[0x3B])
- key |= 0x800;
-
- if (_vm->_global->_pressedKeys[0x3C])
- key |= 0x1000;
-
- if (_vm->_global->_pressedKeys[0x3D])
- key |= 0x2000;
-
- if (_vm->_global->_pressedKeys[0x3E])
- key |= 0x4000;
+ _vm->_util->processInput(true);
+ key = _vm->_util->checkKey();
WRITE_VAR(0, key);
_vm->_util->clearKeyBuf();