From fd826d4a89098b1b6c2bd2a54684813a8a0949e7 Mon Sep 17 00:00:00 2001 From: Rain Clark Date: Wed, 5 Oct 2016 08:01:07 -0400 Subject: [PATCH] Revert "X marks the spor :x:" This reverts commit c5537151f2f5fa9452cdca0eb5d912c3cbf0fa57. --- source/Gel.hx | 2 +- source/HUD.hx | 13 +++++-------- source/MenuState.hx | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/source/Gel.hx b/source/Gel.hx index 212090e..edaf45c 100644 --- a/source/Gel.hx +++ b/source/Gel.hx @@ -141,7 +141,7 @@ class Gel extends FlxSprite Discipline -=5; Waste +=5; } - } + }x public function Praise():Void { diff --git a/source/HUD.hx b/source/HUD.hx index b17d264..571055c 100644 --- a/source/HUD.hx +++ b/source/HUD.hx @@ -6,7 +6,6 @@ import flixel.group.FlxGroup; import flixel.system.FlxSound; import flixel.text.FlxText; import flixel.util.FlxColor; -import flixel.input.gamepad.FlxGamepad; using flixel.util.FlxSpriteUtil; @@ -159,16 +158,15 @@ class HUD extends FlxTypedGroup override public function update(elapsed:Float):Void { super.update(elapsed); - // TODO: Add gamepad support - // TODO: Add WASD support? - // TODO: Add vertical menu movent - if (FlxG.keys.justPressed.RIGHT || FlxG.gamepads.anyJustPressed(DPAD_RIGHT)) + + if (FlxG.keys.justPressed.RIGHT) nextOption(true); - else if (FlxG.keys.justPressed.LEFT || FlxG.gamepads.anyJustPressed(DPAD_LEFT)) + else if (FlxG.keys.justPressed.LEFT) nextOption(false); - else if (FlxG.keys.justPressed.X || FlxG.gamepads.anyJustPressed(B)) + else if (FlxG.keys.justPressed.X) makeOption(_menuOption); + _gel.update(elapsed); if (_gel.CurrentMood == Gel.Mood.NEUTRAL) @@ -191,7 +189,6 @@ class HUD extends FlxTypedGroup private function nextOption(increment:Bool):Void { - // TODO: Add vertical menu movent if (increment) { if (_menuOption >= 7) diff --git a/source/MenuState.hx b/source/MenuState.hx index 12c14d6..b865e0f 100644 --- a/source/MenuState.hx +++ b/source/MenuState.hx @@ -50,7 +50,7 @@ class MenuState extends FlxState override public function update(elapsed:Float):Void { - if(FlxG.keys.pressed.ENTER || FlxG.gamepads.anyJustPressed(START)) + if(FlxG.keys.pressed.ENTER) pressStart(); super.update(elapsed);