aboutsummaryrefslogtreecommitdiff
path: root/engines/agi/op_cmd.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2009-06-06 17:48:09 +0000
committerEugene Sandulenko2009-06-06 17:48:09 +0000
commitea3373708c6aaea0f04543b913883dbb74556f52 (patch)
tree1adbf3e565fd784b2878c3e34d716caaaab4ab88 /engines/agi/op_cmd.cpp
parentd6a4dbeb1d41d7d51e58822db9e4036fd1fbeeae (diff)
downloadscummvm-rg350-ea3373708c6aaea0f04543b913883dbb74556f52.tar.gz
scummvm-rg350-ea3373708c6aaea0f04543b913883dbb74556f52.tar.bz2
scummvm-rg350-ea3373708c6aaea0f04543b913883dbb74556f52.zip
Correct implementation for set.key opcode. Fixes #2605104: "AGI: Manhunter, F3 hotkey dosent work", removed number of hacks
svn-id: r41259
Diffstat (limited to 'engines/agi/op_cmd.cpp')
-rw-r--r--engines/agi/op_cmd.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index fdcc76826d..98351daf4b 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -1408,12 +1408,13 @@ cmd(set_key) {
debugC(4, kDebugLevelScripts, "%d %d %d", p0, p1, p2);
- if (game.evKeyp[p2].data != 0) // TBC sets c23 (ESC) twice!
- return;
-
key = 256 * p1 + p0;
- game.evKeyp[p2].data = key;
- game.evKeyp[p2].occured = false;
+
+ game.controllers[game.lastController].keycode = key;
+ game.controllers[game.lastController].controller = p2;
+ game.lastController++;
+
+ game.controllerOccured[p2] = false;
}
cmd(set_string) {