mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-15 17:22:12 +00:00
Make mouselook follow the first-person option when a spectator, even when other variables assume you're in third person (resolves #340).
This commit is contained in:
parent
d99e3f8337
commit
fcfbd403f0
1 changed files with 4 additions and 4 deletions
|
@ -1019,11 +1019,11 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics)
|
||||||
movebkey = PLAYER1INPUTDOWN(gc_backward);
|
movebkey = PLAYER1INPUTDOWN(gc_backward);
|
||||||
|
|
||||||
mouseaiming = (PLAYER1INPUTDOWN(gc_mouseaiming)) ^
|
mouseaiming = (PLAYER1INPUTDOWN(gc_mouseaiming)) ^
|
||||||
(cv_chasecam.value ? cv_chasefreelook.value : cv_alwaysfreelook.value);
|
((cv_chasecam.value && !player->spectator) ? cv_chasefreelook.value : cv_alwaysfreelook.value);
|
||||||
analogjoystickmove = cv_usejoystick.value && !Joystick.bGamepadStyle;
|
analogjoystickmove = cv_usejoystick.value && !Joystick.bGamepadStyle;
|
||||||
gamepadjoystickmove = cv_usejoystick.value && Joystick.bGamepadStyle;
|
gamepadjoystickmove = cv_usejoystick.value && Joystick.bGamepadStyle;
|
||||||
|
|
||||||
thisjoyaiming = (cv_chasecam.value) ? cv_chasefreelook.value : cv_alwaysfreelook.value;
|
thisjoyaiming = (cv_chasecam.value && !player->spectator) ? cv_chasefreelook.value : cv_alwaysfreelook.value;
|
||||||
|
|
||||||
// Reset the vertical look if we're no longer joyaiming
|
// Reset the vertical look if we're no longer joyaiming
|
||||||
if (!thisjoyaiming && joyaiming)
|
if (!thisjoyaiming && joyaiming)
|
||||||
|
@ -1348,11 +1348,11 @@ void G_BuildTiccmd2(ticcmd_t *cmd, INT32 realtics)
|
||||||
movebkey = PLAYER2INPUTDOWN(gc_backward);
|
movebkey = PLAYER2INPUTDOWN(gc_backward);
|
||||||
|
|
||||||
mouseaiming = (PLAYER2INPUTDOWN(gc_mouseaiming)) ^
|
mouseaiming = (PLAYER2INPUTDOWN(gc_mouseaiming)) ^
|
||||||
(cv_chasecam2.value ? cv_chasefreelook2.value : cv_alwaysfreelook2.value);
|
((cv_chasecam2.value && !player->spectator) ? cv_chasefreelook2.value : cv_alwaysfreelook2.value);
|
||||||
analogjoystickmove = cv_usejoystick2.value && !Joystick2.bGamepadStyle;
|
analogjoystickmove = cv_usejoystick2.value && !Joystick2.bGamepadStyle;
|
||||||
gamepadjoystickmove = cv_usejoystick2.value && Joystick2.bGamepadStyle;
|
gamepadjoystickmove = cv_usejoystick2.value && Joystick2.bGamepadStyle;
|
||||||
|
|
||||||
thisjoyaiming = (cv_chasecam2.value) ? cv_chasefreelook2.value : cv_alwaysfreelook2.value;
|
thisjoyaiming = (cv_chasecam2.value && !player->spectator) ? cv_chasefreelook2.value : cv_alwaysfreelook2.value;
|
||||||
|
|
||||||
// Reset the vertical look if we're no longer joyaiming
|
// Reset the vertical look if we're no longer joyaiming
|
||||||
if (!thisjoyaiming && joyaiming)
|
if (!thisjoyaiming && joyaiming)
|
||||||
|
|
Loading…
Reference in a new issue