TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix drop-primary/drop-secondary keys

Browse source 
Commit 8c8b7419b6 defined Shift-F5 and Shift-F6 to adjust the VR
handling.  However, Shift-F5 and Shift-F6 already had a meaning: drop
primary weapon / drop secondary weapon.  The ordering of the logic
causes the new VR handling to suppress the old drop handling, thus
preventing players from dropping weapons.  Disable the VR meaning for
these keys so that drop-weapon works again, since F1 documents those
keys as drop-weapon.

Fixes: 8c8b7419b6 ("Improved conditionals for stereo vs non-stereo modes.")
This commit is contained in:
Kp 2022-04-17 22:27:19 +00:00
parent f79baf722c
commit 834aeea23f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
similar/main/gamecntl.cpp
View file

@ -976,6 +976,11 @@ static window_event_result HandleSystemKey(int key)
#endif
#if DXX_USE_OGL
#if 0
/* These conflict with the drop-primary and drop-secondary
* keybindings. Dropping items is more common than using VR, so
* disable these.
*/
case KEY_SHIFTED + KEY_F5:
VR_eye_offset -= 1;
reset_cockpit();
@ -984,6 +989,7 @@ static window_event_result HandleSystemKey(int key)
VR_eye_offset += 1;
reset_cockpit();
break;
#endif
case KEY_SHIFTED + KEY_ALTED + KEY_F5:
VR_eye_width -= (F1_0/10); //*= 10/11;
reset_cockpit();