Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-14 19:25:16 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge 1107c1e160 into 55c2dabe84

Browse source
This commit is contained in:
gamerbross 2024-10-16 05:20:55 -04:00 committed by GitHub
commit c4d18d3fc9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/funkin/save/Save.hx
View file

@ -861,9 +861,9 @@ class Save
switch (inputType) switch (inputType)
{ {
case Keys: case Keys:
return (playerId == 0) ? data?.options?.controls?.p1.keyboard : data?.options?.controls?.p2.keyboard; return (playerId == 1) ? data?.options?.controls?.p1.keyboard : data?.options?.controls?.p2.keyboard;
case Gamepad(_): case Gamepad(_):
return (playerId == 0) ? data?.options?.controls?.p1.gamepad : data?.options?.controls?.p2.gamepad; return (playerId == 1) ? data?.options?.controls?.p1.gamepad : data?.options?.controls?.p2.gamepad;
} }
} }
@ -878,27 +878,7 @@ class Save
public function setControls(playerId:Int, inputType:Device, controls:SaveControlsData):Void public function setControls(playerId:Int, inputType:Device, controls:SaveControlsData):Void
{ {
switch (inputType) getControls(playerId, inputType) = controls;
{
case Keys:
if (playerId == 0)
{
data.options.controls.p1.keyboard = controls;
}
else
{
data.options.controls.p2.keyboard = controls;
}
case Gamepad(_):
if (playerId == 0)
{
data.options.controls.p1.gamepad = controls;
}
else
{
data.options.controls.p2.gamepad = controls;
}
}
flush(); flush();
} }