Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-22 23:57:50 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix some merge conflicts

Browse source
This commit is contained in:
EliteMasterEric 2024-05-24 16:44:12 -04:00
parent 98505e58ec
commit dd3e241f0c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/funkin/input/Controls.hx
View file

@ -997,7 +997,7 @@ class Controls extends FlxActionSet
for (control in Control.createAll()) for (control in Control.createAll())
{ {
var inputs:Array<Int> = Reflect.field(data, control.getName()); var inputs:Array<Int> = Reflect.field(data, control.getName());
inputs = inputs.unique(); inputs = inputs.distinct();
if (inputs != null) if (inputs != null)
{ {
if (inputs.length == 0) { if (inputs.length == 0) {
@ -1050,7 +1050,7 @@ class Controls extends FlxActionSet
if (inputs.length == 0) { if (inputs.length == 0) {
inputs = [FlxKey.NONE]; inputs = [FlxKey.NONE];
} else { } else {
inputs = inputs.unique(); inputs = inputs.distinct();
} }
Reflect.setField(data, control.getName(), inputs); Reflect.setField(data, control.getName(), inputs);