Ticket #3114: bug_1678230_fix_2.diff

op_cmd.cpp

@@ -1233 +1233 @@
         if ((g_agi->getFeatures() & GF_AGIPAL) && p0 >= 101 && p0 < 110) {
                 g_gfx->setAGIPal(p0);
                 return;
-        } else
-                g_gfx->shakeStart();
+        } 
 
+        //Disables input while shaking to prevent bug #1678230
+        int originalValue = game.inputEnabled;
+        game.inputEnabled = 0;
+
+        g_gfx->shakeStart();
+
         g_sprites->commitBoth();                /* Fixes SQ1 demo */
         for (i = 4 * p0; i; i--) {
                 g_gfx->shakeScreen(i & 1);
@@ -1243 +1248 @@
                 g_agi->mainCycle();
         }
         g_gfx->shakeEnd();
+
+        //Sets input back to what it was
+        game.inputEnabled = originalValue;
 }
 
 static void (*agiCommand[183])(uint8 *) = {