etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-14 13:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release_1'

Browse source
This commit is contained in:
minenice55 2024-01-06 22:59:01 -05:00
commit 9ab5cb86a1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Assets/Scripts/InputSystem/PlayerInput.cs
View file

@ -47,7 +47,7 @@ namespace HeavenStudio
public static InputController.ControlStyles CurrentControlStyle = InputController.ControlStyles.Pad; public static InputController.ControlStyles CurrentControlStyle = InputController.ControlStyles.Pad;
static List<InputController> inputDevices; static List<InputController> inputDevices = new List<InputController>();
public delegate InputController[] InputControllerInitializer(); public delegate InputController[] InputControllerInitializer();
@ -126,6 +126,7 @@ namespace HeavenStudio
//so such controllers should have a reference to the other controller in the pair //so such controllers should have a reference to the other controller in the pair
foreach (InputController i in inputDevices) foreach (InputController i in inputDevices)
{ {
if (i == null) continue;
if (i.GetPlayer() == player) if (i.GetPlayer() == player)
{ {
return i; return i;
@ -142,6 +143,7 @@ namespace HeavenStudio
//controller IDs are determined by connection order (the Keyboard is always first) //controller IDs are determined by connection order (the Keyboard is always first)
for (int i = 0; i < inputDevices.Count; i++) for (int i = 0; i < inputDevices.Count; i++)
{ {
if (inputDevices[i] == null) continue;
if (inputDevices[i].GetPlayer() == player) if (inputDevices[i].GetPlayer() == player)
{ {
return i; return i;
@ -152,8 +154,10 @@ namespace HeavenStudio
public static void UpdateInputControllers() public static void UpdateInputControllers()
{ {
if (inputDevices == null) return;
foreach (InputController i in inputDevices) foreach (InputController i in inputDevices)
{ {
if (i == null) continue;
i.UpdateState(); i.UpdateState();
} }
} }