1
0
mirror of https://github.com/Melon-Bread/Pet.GB synced 2024-11-24 20:58:19 -05:00

Revert "X marks the spor "

This reverts commit c5537151f2.
This commit is contained in:
Rain Clark 2016-10-05 08:01:07 -04:00
parent c5537151f2
commit fd826d4a89
3 changed files with 7 additions and 10 deletions

View File

@ -141,7 +141,7 @@ class Gel extends FlxSprite
Discipline -=5; Discipline -=5;
Waste +=5; Waste +=5;
} }
} }x
public function Praise():Void public function Praise():Void
{ {

View File

@ -6,7 +6,6 @@ import flixel.group.FlxGroup;
import flixel.system.FlxSound; import flixel.system.FlxSound;
import flixel.text.FlxText; import flixel.text.FlxText;
import flixel.util.FlxColor; import flixel.util.FlxColor;
import flixel.input.gamepad.FlxGamepad;
using flixel.util.FlxSpriteUtil; using flixel.util.FlxSpriteUtil;
@ -159,16 +158,15 @@ class HUD extends FlxTypedGroup<FlxSprite>
override public function update(elapsed:Float):Void override public function update(elapsed:Float):Void
{ {
super.update(elapsed); super.update(elapsed);
// TODO: Add gamepad support
// TODO: Add WASD support? if (FlxG.keys.justPressed.RIGHT)
// TODO: Add vertical menu movent
if (FlxG.keys.justPressed.RIGHT || FlxG.gamepads.anyJustPressed(DPAD_RIGHT))
nextOption(true); nextOption(true);
else if (FlxG.keys.justPressed.LEFT || FlxG.gamepads.anyJustPressed(DPAD_LEFT)) else if (FlxG.keys.justPressed.LEFT)
nextOption(false); nextOption(false);
else if (FlxG.keys.justPressed.X || FlxG.gamepads.anyJustPressed(B)) else if (FlxG.keys.justPressed.X)
makeOption(_menuOption); makeOption(_menuOption);
_gel.update(elapsed); _gel.update(elapsed);
if (_gel.CurrentMood == Gel.Mood.NEUTRAL) if (_gel.CurrentMood == Gel.Mood.NEUTRAL)
@ -191,7 +189,6 @@ class HUD extends FlxTypedGroup<FlxSprite>
private function nextOption(increment:Bool):Void private function nextOption(increment:Bool):Void
{ {
// TODO: Add vertical menu movent
if (increment) if (increment)
{ {
if (_menuOption >= 7) if (_menuOption >= 7)

View File

@ -50,7 +50,7 @@ class MenuState extends FlxState
override public function update(elapsed:Float):Void override public function update(elapsed:Float):Void
{ {
if(FlxG.keys.pressed.ENTER || FlxG.gamepads.anyJustPressed(START)) if(FlxG.keys.pressed.ENTER)
pressStart(); pressStart();
super.update(elapsed); super.update(elapsed);