FlxKeyboard: fix debugger and VCR keys not using the native correction

For instance, this made it impossible to use one of the F-keys as a debugger toggle key.
HaxeFlixel · Sep 3, 2016 · 470c8e8 · 470c8e8
1 parent b9e082c
commit 470c8e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/flixel/input/FlxKeyManager.hx b/flixel/input/FlxKeyManager.hx
@@ -289,17 +289,18 @@ class FlxKeyManager<Key:Int, KeyList:FlxBaseKeyList> implements IFlxInputManager
 	 * A Helper function to check whether an array of keycodes contains 
 	 * a certain key safely (returns false if the array is null).
 	 */ 
-	private function inKeyArray(KeyArray:Array<Key>, Key:Key):Bool
+	private function inKeyArray(KeyArray:Array<Key>, Event:KeyboardEvent):Bool
 	{
 		if (KeyArray == null)
 		{
 			return false;
 		}
 		else
 		{
+			var code = resolveKeyCode(Event);
 			for (key in KeyArray)
 			{
-				if (key == Key || key == -2)
+				if (key == code || key == -2)
 				{
 					return true;
 				}

diff --git a/flixel/input/keyboard/FlxKeyboard.hx b/flixel/input/keyboard/FlxKeyboard.hx
@@ -95,7 +95,7 @@ class FlxKeyboard extends FlxKeyManager<FlxKey, FlxKeyList>
 
 		// Debugger toggle
 		#if FLX_DEBUG
-			if (FlxG.game.debugger != null && inKeyArray(FlxG.debugger.toggleKeys, event.keyCode))
+			if (FlxG.game.debugger != null && inKeyArray(FlxG.debugger.toggleKeys, event))
 			{
 				FlxG.debugger.visible = !FlxG.debugger.visible;
 			}
@@ -108,7 +108,7 @@ class FlxKeyboard extends FlxKeyManager<FlxKey, FlxKeyList>
 
 		// Attempted to cancel the replay?
 		#if FLX_RECORD
-			if (FlxG.game.replaying && !inKeyArray(FlxG.debugger.toggleKeys, event.keyCode) && inKeyArray(FlxG.vcr.cancelKeys, event.keyCode))
+			if (FlxG.game.replaying && !inKeyArray(FlxG.debugger.toggleKeys, event) && inKeyArray(FlxG.vcr.cancelKeys, event))
 			{
 				FlxG.vcr.cancelReplay();
 			}