Correct implementation for set.key opcode. Fixes #2605104: "AGI: Manhunter, F3 hotkey dosent work", removed number of hacks

svn-id: r41259

1 files changed, 2 insertions, 10 deletions

diff --git a/engines/agi/menu.cpp b/engines/agi/menu.cpp
index fb39fb5a35..27e234ebc9 100644
--- a/engines/agi/menu.cpp
+++ b/engines/agi/menu.cpp
@@ -375,15 +375,7 @@ bool Menu::keyhandler(int key) {
 					// activate that option
 					if (d->enabled) {
 						debugC(6, kDebugLevelMenu | kDebugLevelInput, "event %d registered", d->event);
-						_vm->_game.evKeyp[d->event].occured = true;
-						_vm->_game.evKeyp[d->event].data = d->event;
-						// In LSL1, event 0x20 is set when changing the game speed to normal via the menu
-						// Do not set the event data to 0x20, as this event is then incorrectly triggered
-						// when the spacebar is pressed, which has a keycode equal to 0x20 as well
-						// Fixes bug #1751390 - "LSL: after changing game speed, space key turn unfunctional"
-						if (d->event == 0x20)
-							_vm->_game.evKeyp[d->event].data = d->event + 1;
-
+						_vm->_game.controllerOccured[d->event] = true;
 						_vm->_menuSelected = true;
 
 						goto exit_menu;
@@ -415,7 +407,7 @@ bool Menu::keyhandler(int key) {
 
 		if (d->enabled) {
 			debugC(6, kDebugLevelMenu | kDebugLevelInput, "event %d registered", d->event);
-			_vm->_game.evKeyp[d->event].occured = true;
+			_vm->_game.controllerOccured[d->event] = true;
 			goto exit_menu;
 		}
 		break;