mirror of
https://github.com/badvision/lawless-legends.git
synced 2025-01-30 06:30:41 +00:00
fix small bugs, increase deadzone again
This commit is contained in:
parent
5c01149516
commit
a2141312c4
@ -288,7 +288,7 @@ public class Joystick extends Device {
|
||||
} else if (readGLFWJoystick()) {
|
||||
float x = -0.5f;
|
||||
float y = 0.5f;
|
||||
if (controllerMapping != null) {
|
||||
if (controllerMapping != null && !useManualMapping) {
|
||||
x = axes.get(controllerMapping.xaxis) * (controllerMapping.xinvert ? -1.0f : 1.0f);
|
||||
y = axes.get(controllerMapping.yaxis) * (controllerMapping.yinvert ? -1.0f : 1.0f);
|
||||
} else {
|
||||
@ -386,7 +386,7 @@ public class Joystick extends Device {
|
||||
boolean b0rapid = getButton(hasMapping ? controllerMapping.button0rapid : null, button0rapid);
|
||||
boolean b1 = getButton(hasMapping ? controllerMapping.button1 : null, button1);
|
||||
boolean b1rapid = getButton(hasMapping ? controllerMapping.button1rapid : null, button1rapid);
|
||||
boolean pause = getButton(!hasMapping ? controllerMapping.pause : null);
|
||||
boolean pause = getButton(hasMapping ? controllerMapping.pause : null);
|
||||
|
||||
if (b0rapid) {
|
||||
if (button0heldSince == 0) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user