Ticket #5386: agi-controllers.diff

engines/agi/cycle.cpp

@@ -387 +387 @@
 
                 if (_restartGame) {
                         setflag(fRestartGame, true);
-                        _game.lastController = 0;
                         setvar(vTimeDelay, 2);  // "normal" speed
                         _restartGame = false;
                 }

engines/agi/agi.cpp

@@ -555 +555 @@
         _predictiveDictLineCount = 0;
         _firstSlot = 0;
 
-        // NOTE: On game reload the keys do not get set again,
-        // thus it is incorrect to reset it in agiInit(). Fixes bug #2823762
-        _game.lastController = 0;
-        for (int i = 0; i < MAX_DIRS; i++)
-                _game.controllerOccured[i] = false;
+        resetControllers();
 
         setupOpcodes();
         _curLogic = NULL;

engines/agi/op_cmd.cpp

@@ -1388 +1388 @@
 }
 
 void AgiEngine::cmd_set_key(uint8 *p) {
-        int key;
+        debugC(4, kDebugLevelScripts, "%d %d %d", p0, p1, p2);
 
-        if (_game.lastController >= MAX_CONTROLLERS) {
+        int key = 256 * p1 + p0;
+        int slot = -1;
+
+        for (int i = 0; i < MAX_CONTROLLERS; i++) {
+                if (slot == -1 && !_game.controllers[i].keycode) {
+                        slot = i;
+                }
+
+                if (_game.controllers[i].keycode == key && _game.controllers[i].controller == p2) {
+                        return;
+                }
+        }
+
+        if (slot == -1) {
                 warning("Number of set.keys exceeded %d", MAX_CONTROLLERS);
                 return;
         }
 
-        debugC(4, kDebugLevelScripts, "%d %d %d", p0, p1, p2);
+        _game.controllers[slot].keycode = key;
+        _game.controllers[slot].controller = p2;
 
-        key = 256 * p1 + p0;
-
-        _game.controllers[_game.lastController].keycode = key;
-        _game.controllers[_game.lastController].controller = p2;
-        _game.lastController++;
-
         _game.controllerOccured[p2] = false;
 }
 

engines/agi/keyboard.cpp

@@ -117 +117 @@
 
         debugC(3, kDebugLevelInput, "key = %04x", key);
 
-        for (i = 0; i < _game.lastController; i++) {
+        for (i = 0; i < MAX_CONTROLLERS; i++) {
                 if (_game.controllers[i].keycode == key) {
                         debugC(3, kDebugLevelInput, "event %d: key press", _game.controllers[i].controller);
                         _game.controllerOccured[_game.controllers[i].controller] = true;

engines/agi/agi.h

@@ -603 +603 @@
 
         bool controllerOccured[MAX_DIRS];  /**< keyboard keypress events */
         AgiController controllers[MAX_CONTROLLERS];
-        int lastController;
 
         char strings[MAX_STRINGS + 1][MAX_STRINGLEN]; /**< strings */