diff --git a/src/engine/input/GamepadInput.java b/src/engine/input/GamepadInput.java index cf0fb88..142a95b 100644 --- a/src/engine/input/GamepadInput.java +++ b/src/engine/input/GamepadInput.java @@ -107,8 +107,8 @@ public class GamepadInput { return new Vector3f(x,y); } - public String getGamepadName(){ - return glfwGetJoystickName(this.gamepadNum); + public int getGamepadName(){ + return this.gamepadNum; } } diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/gameplay/Characters/Blue/BlueNormals.java index c1fcd92..5bcbdb2 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -198,7 +198,6 @@ public class BlueNormals { f[0] = standAFrame1(); f[1] = standAFrame1(); f[2] = standAFrame1(); - f[3] = standAFrame3(); return(new attackPart(f)); } diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java index 4472f6e..376eb7e 100644 --- a/src/gameplay/match/match.java +++ b/src/gameplay/match/match.java @@ -192,13 +192,15 @@ public class match { if (glfwJoystickPresent(GLFW_JOYSTICK_1)) { gamepad1.inputRefresh(); inputsP1.recordInputsFromGamepad(gamepad1, p1.getPosX() < p2.getPosX()); + handleInputs(p1, inputsP1); } if (glfwJoystickPresent(GLFW_JOYSTICK_2)) { gamepad2.inputRefresh(); - inputsP2.recordInputsFromGamepad(gamepad2, p2.getPosX() <= p1.getPosX()); + inputsP2.recordInputsFromGamepad(gamepad2, p2.getPosX() <= p1.getPosX()); + handleInputs(p2, inputsP2); } - handleInputs(p1, inputsP1); - handleInputs(p2, inputsP2); + + // acCode = 21; break;