cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

shot in the dark 4.0 stuff

This commit is contained in:
Brandon 2020-11-02 00:39:28 -05:00
parent c1420f33b0
commit 00a4b532ed
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
art/build-lime-SWITCH.bat
View File

@ -23,7 +23,7 @@ lime build switch -release -final -v
@echo off @echo off
color 0e color 0e
@echo on @echo on
lime deploy switch -v lime deploy switch -final -v
@echo off @echo off
color 0b color 0b
@echo on @echo on

26
source/Controls.hx
View File

@ -278,7 +278,7 @@ class Controls extends FlxActionSet
* @param func * @param func
* @return ->Void) * @return ->Void)
*/ */
function forEachBound(control:Control, func:FlxActionDigital -> Void, func:FlxInputState -> Void) function forEachBound(control:Control, func:FlxActionDigital -> Void, func:FlxInputState -> Void)
{ {
switch (control) switch (control)
{ {
@ -383,7 +383,11 @@ class Controls extends FlxActionSet
*/ */
public function bindKeys(control:Control, keys:Array<FlxKey>) public function bindKeys(control:Control, keys:Array<FlxKey>)
{ {
inline forEachBound(control, (action, state) -> addKeys(action, keys, state)); #if (haxe >= "4.0.0")
inline forEachBound(control, (action, state) -> addKeys(action, keys, state));
#else
forEachBound(control, (action, state) -> addKeys(action, keys, state));
#end
} }
/** /**
@ -392,7 +396,11 @@ class Controls extends FlxActionSet
*/ */
public function unbindKeys(control:Control, keys:Array<FlxKey>) public function unbindKeys(control:Control, keys:Array<FlxKey>)
{ {
inline forEachBound(control, (action, _) -> removeKeys(action, keys)); #if (haxe >= "4.0.0")
inline forEachBound(control, (action, _) -> removeKeys(action, keys));
#else
forEachBound(control, (action, _) -> removeKeys(action, keys));
#end
} }
inline static function addKeys(action:FlxActionDigital, keys:Array<FlxKey>, state:FlxInputState) inline static function addKeys(action:FlxActionDigital, keys:Array<FlxKey>, state:FlxInputState)
@ -516,7 +524,11 @@ class Controls extends FlxActionSet
*/ */
public function bindButtons(control:Control, id, buttons) public function bindButtons(control:Control, id, buttons)
{ {
inline forEachBound(control, (action, state) -> addButtons(action, buttons, state, id)); #if (haxe >= "4.0.0")
inline forEachBound(control, (action, state) -> addButtons(action, buttons, state, id));
#else
forEachBound(control, (action, state) -> addButtons(action, buttons, state, id));
#end
} }
/** /**
@ -525,7 +537,11 @@ class Controls extends FlxActionSet
*/ */
public function unbindButtons(control:Control, gamepadID:Int, buttons) public function unbindButtons(control:Control, gamepadID:Int, buttons)
{ {
inline forEachBound(control, (action, _) -> removeButtons(action, gamepadID, buttons)); #if (haxe >= "4.0.0")
inline forEachBound(control, (action, _) -> removeButtons(action, gamepadID, buttons));
#else
forEachBound(control, (action, _) -> removeButtons(action, gamepadID, buttons));
#end
} }
inline static function addButtons(action:FlxActionDigital, buttons:Array<FlxGamepadInputID>, state, id) inline static function addButtons(action:FlxActionDigital, buttons:Array<FlxGamepadInputID>, state, id)