AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pause menu fix

Browse Source 
fixed pause menu not accepting input from keyboard if controller is connected
This commit is contained in:
kemo 2021-06-26 03:37:06 +02:00
parent a18c6aea04
commit 1e8129d08a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/PauseSubState.hx
View File

@ -111,19 +111,18 @@ class PauseSubState extends MusicBeatSubstate
var gamepad:FlxGamepad = FlxG.gamepads.lastActive; var gamepad:FlxGamepad = FlxG.gamepads.lastActive;
var upP = controls.UP_P; var upPcontroller:Bool = false;
var downP = controls.DOWN_P; var downPcontroller:Bool = false;
var leftP = controls.LEFT_P; var leftPcontroller:Bool = false;
var rightP = controls.RIGHT_P; var rightPcontroller:Bool = false;
var accepted = controls.ACCEPT;
var oldOffset:Float = 0; var oldOffset:Float = 0;
if (gamepad != null && KeyBinds.gamepad) if (gamepad != null && KeyBinds.gamepad)
{ {
upP = gamepad.justPressed.DPAD_UP; upPcontroller = gamepad.justPressed.DPAD_UP;
downP = gamepad.justPressed.DPAD_DOWN; downPcontroller = gamepad.justPressed.DPAD_DOWN;
leftP = gamepad.justPressed.DPAD_LEFT; leftPcontroller = gamepad.justPressed.DPAD_LEFT;
rightP = gamepad.justPressed.DPAD_RIGHT; rightPcontroller = gamepad.justPressed.DPAD_RIGHT;
} }
// pre lowercasing the song name (update) // pre lowercasing the song name (update)
@ -134,17 +133,18 @@ class PauseSubState extends MusicBeatSubstate
} }
var songPath = 'assets/data/' + songLowercase + '/'; var songPath = 'assets/data/' + songLowercase + '/';
if (upP) if (controls.UP_P || upPcontroller)
{ {
changeSelection(-1); changeSelection(-1);
}else if (downP) }
else if (controls.DOWN_P || downPcontroller)
{ {
changeSelection(1); changeSelection(1);
} }
#if cpp #if cpp
else if (leftP) else if (controls.LEFT_P || leftPcontroller)
{ {
oldOffset = PlayState.songOffset; oldOffset = PlayState.songOffset;
PlayState.songOffset -= 1; PlayState.songOffset -= 1;
@ -171,7 +171,8 @@ class PauseSubState extends MusicBeatSubstate
cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]]; cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]];
offsetChanged = true; offsetChanged = true;
} }
}else if (rightP) }
else if (controls.RIGHT_P || rightPcontroller)
{ {
oldOffset = PlayState.songOffset; oldOffset = PlayState.songOffset;
PlayState.songOffset += 1; PlayState.songOffset += 1;
@ -199,7 +200,7 @@ class PauseSubState extends MusicBeatSubstate
} }
#end #end
if (accepted) if (controls.ACCEPT)
{ {
var daSelected:String = menuItems[curSelected]; var daSelected:String = menuItems[curSelected];