From ea3373708c6aaea0f04543b913883dbb74556f52 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 6 Jun 2009 17:48:09 +0000
Subject: Correct implementation for set.key opcode. Fixes #2605104: "AGI:
 Manhunter, F3 hotkey dosent work", removed number of hacks

svn-id: r41259
---
 engines/agi/op_cmd.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines/agi/op_cmd.cpp')

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) {
-- 
cgit v1.2.3