mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-11-15 11:22:55 +00:00
Fix a merge issue.
This commit is contained in:
parent
3b5e85d050
commit
9a47666fc7
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue