zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-13 19:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mouse quick fix

Browse source 
# Conflicts:
#	source/blood/src/controls.cpp
This commit is contained in:
nukeykt 2019-08-16 13:31:07 +09:00 committed by Christoph Oelckers
parent fbd3bdb665
commit 316ddb1fb5
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/blood/src/controls.cpp
View file

@ -185,16 +185,10 @@ void ctrlGetInput(void)
else if (gMouseAiming) else if (gMouseAiming)
gInput.keyFlags.lookCenter = 1; gInput.keyFlags.lookCenter = 1;
int32_t const aimMode = (gMouseAim) ? (int32_t)analog_lookingupanddown : MouseAnalogueAxes[1];
if (aimMode != mouseyaxismode)
{
CONTROL_MapAnalogAxis(1, aimMode, controldevice_mouse);
mouseyaxismode = aimMode;
}
CONTROL_GetInput(&info); CONTROL_GetInput(&info);
#if 0
// these don't seem to have an on switch
if (MouseDeadZone) if (MouseDeadZone)
{ {
if (info.mousey > 0) if (info.mousey > 0)
@ -215,6 +209,7 @@ void ctrlGetInput(void)
else else
info.mousex = tabledivide32_noinline(info.mousex, MouseBias); info.mousex = tabledivide32_noinline(info.mousex, MouseBias);
} }
#endif
if (gQuitRequest) if (gQuitRequest)
gInput.keyFlags.quit = 1; gInput.keyFlags.quit = 1;
@ -466,10 +461,12 @@ void ctrlGetInput(void)
else else
gInput.mlook = ClipRange(info.dz>>7, -127, 127); gInput.mlook = ClipRange(info.dz>>7, -127, 127);
#endif #endif
gInput.q16mlook = fix16_clamp(fix16_div(fix16_from_int(info.mousey*2), F16(256)), F16(-127)>>2, F16(127)>>2); if (gMouseAim)
gInput.q16mlook = fix16_clamp(fix16_div(fix16_from_int(info.mousey), F16(128)), F16(-127)>>2, F16(127)>>2);
else
forward = ClipRange(forward - info.mousey, -2048, 2048);
if (!gMouseAimingFlipped) if (!gMouseAimingFlipped)
gInput.q16mlook = -gInput.q16mlook; gInput.q16mlook = -gInput.q16mlook;
forward = ClipRange(forward - info.dz, -2048, 2048);
if (KB_KeyPressed(sc_Pause)) // 0xc5 in disassembly if (KB_KeyPressed(sc_Pause)) // 0xc5 in disassembly
{ {