cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-01-27 07:17:20 +00:00
Code Issues Releases Wiki Activity

george the janitor

Browse source
This commit is contained in:
Brandon 2020-11-02 14:37:23 -05:00
parent 245ca2f573
commit b1d44d51e0
1 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
source/Controls.hx
View file

@ -282,7 +282,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->FlxInputState->Void)
{ {
switch (control) switch (control)
{ {
@ -336,6 +336,7 @@ class Controls extends FlxActionSet
public function copyFrom(controls:Controls, ?device:Device) public function copyFrom(controls:Controls, ?device:Device)
{ {
#if (haxe >= "4.0.0")
for (name => action in controls.byName) for (name => action in controls.byName)
{ {
for (input in action.inputs) for (input in action.inputs)
@ -344,14 +345,31 @@ class Controls extends FlxActionSet
byName[name].add(cast input); byName[name].add(cast input);
} }
} }
#else
for (name in controls.byName.keys())
{
var action = controls.byName[name];
for (input in action.inputs)
{
if (device == null || isDevice(input, device))
byName[name].add(cast input);
}
}
#end
switch (device) switch (device)
{ {
case null: case null:
// add all // add all
#if (haxe >= "4.0.0")
for (gamepad in controls.gamepadsAdded) for (gamepad in controls.gamepadsAdded)
if (!gamepadsAdded.contains(gamepad)) if (!gamepadsAdded.contains(gamepad))
gamepadsAdded.push(gamepad); gamepadsAdded.push(gamepad);
#else
for (gamepad in controls.gamepadsAdded)
if (gamepadsAdded.indexOf(gamepad) == -1)
gamepadsAdded.push(gamepad);
#end
mergeKeyboardScheme(controls.keyboardScheme); mergeKeyboardScheme(controls.keyboardScheme);
@ -390,7 +408,7 @@ class Controls extends FlxActionSet
#if (haxe >= "4.0.0") #if (haxe >= "4.0.0")
inline forEachBound(control, (action, state) -> addKeys(action, keys, state)); inline forEachBound(control, (action, state) -> addKeys(action, keys, state));
#else #else
forEachBound(control, action => addKeys(action, keys, state), state => addKeys(action, keys, state)); forEachBound(control, function(action, state) addKeys(action, keys, state));
#end #end
} }
@ -403,7 +421,7 @@ class Controls extends FlxActionSet
#if (haxe >= "4.0.0") #if (haxe >= "4.0.0")
inline forEachBound(control, (action, _) -> removeKeys(action, keys)); inline forEachBound(control, (action, _) -> removeKeys(action, keys));
#else #else
forEachBound(control, action => removeKeys(action, keys), _ => removeKeys(action, keys)); forEachBound(control, function(action, _) removeKeys(action, keys));
#end #end
} }
@ -517,18 +535,26 @@ class Controls extends FlxActionSet
public function addGamepad(id:Int, ?buttonMap:Map<Control, Array<FlxGamepadInputID>>):Void public function addGamepad(id:Int, ?buttonMap:Map<Control, Array<FlxGamepadInputID>>):Void
{ {
gamepadsAdded.push(id); gamepadsAdded.push(id);
#if (haxe >= "4.0.0")
for (control => buttons in buttonMap) for (control => buttons in buttonMap)
bindButtons(control, id, buttons); inline bindButtons(control, id, buttons);
#else
for (control in buttonMap.keys())
bindButtons(control, id, buttonMap[control]);
#end
} }
inline function addGamepadLiteral(id:Int, ?buttonMap:Map<Control, Array<FlxGamepadInputID>>):Void inline function addGamepadLiteral(id:Int, ?buttonMap:Map<Control, Array<FlxGamepadInputID>>):Void
{ {
gamepadsAdded.push(id); gamepadsAdded.push(id);
for (control => buttons in buttonMap)
#if (haxe >= "4.0.0") #if (haxe >= "4.0.0")
for (control => buttons in buttonMap)
inline bindButtons(control, id, buttons); inline bindButtons(control, id, buttons);
#else #else
bindButtons(control, id, buttons); for (control in buttonMap.keys())
bindButtons(control, id, buttonMap[control]);
#end #end
} }
@ -571,7 +597,7 @@ class Controls extends FlxActionSet
#if (haxe >= "4.0.0") #if (haxe >= "4.0.0")
inline forEachBound(control, (action, state) -> addButtons(action, buttons, state, id)); inline forEachBound(control, (action, state) -> addButtons(action, buttons, state, id));
#else #else
forEachBound(control, action => addButtons(action, buttons, state, id), state => addButtons(action, buttons, state, id)); forEachBound(control, function(action, state) addButtons(action, buttons, state, id));
#end #end
} }
@ -584,7 +610,7 @@ class Controls extends FlxActionSet
#if (haxe >= "4.0.0") #if (haxe >= "4.0.0")
inline forEachBound(control, (action, _) -> removeButtons(action, gamepadID, buttons)); inline forEachBound(control, (action, _) -> removeButtons(action, gamepadID, buttons));
#else #else
forEachBound(control, action => removeButtons(action, gamepadID, buttons), _ => removeButtons(action, gamepadID, buttons)); forEachBound(control, function(action, _) removeButtons(action, gamepadID, buttons));
#end #end
} }