From 837d3aa54a3b202ed87166c6879bf2a51956eb00 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 8 Apr 2020 23:26:09 +0100 Subject: [PATCH] Menu and haptic tweak --- .../jni/gzdoom-g3.3mgw_mobile/src/p_map.cpp | 15 ++++++++------- .../wadsrc/static/menudef.txt | 2 -- assets/res/lzdoom.pk3 | Bin 3223207 -> 3223113 bytes 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_map.cpp b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_map.cpp index 2ce12ab..d0959b8 100644 --- a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_map.cpp +++ b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_map.cpp @@ -4432,13 +4432,14 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance, // We need to preserve this info from the damage type because the actual damage type can get overridden by the puff pflag = DMG_PLAYERATTACK; - //Haptics - long rightHanded = vr_control_scheme < 10; - QzDoom_Vibrate(150, rightHanded ? 1 : 0, 0.8); - if (weaponStabilised) - { - QzDoom_Vibrate(150, rightHanded ? 0 : 1, 0.6); - } + if ( damage > 0) { + //Haptics + long rightHanded = vr_control_scheme < 10; + QzDoom_Vibrate(150, rightHanded ? 1 : 0, 0.8); + if (weaponStabilised) { + QzDoom_Vibrate(150, rightHanded ? 0 : 1, 0.6); + } + } } // [MC] If overriding, set it to the base of the actor. diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/menudef.txt b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/menudef.txt index 256eeda..02511d9 100644 --- a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/menudef.txt +++ b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/menudef.txt @@ -341,8 +341,6 @@ OptionMenu "OptionsMenu" protected Submenu "VR Options", "VROptionsMenu" StaticText " " Submenu "$OPTMNU_CONTROLS", "CustomizeControls" - Submenu "$OPTMNU_MOUSE", "MouseOptions" - Submenu "$OPTMNU_JOYSTICK", "JoystickOptions" StaticText " " Submenu "$OPTMNU_PLAYER", "NewPlayerMenu" Submenu "$OPTMNU_GAMEPLAY", "GameplayOptions" diff --git a/assets/res/lzdoom.pk3 b/assets/res/lzdoom.pk3 index 36a9d21b1af936d33daa7396547a5707bc8055c4..aa38775a774be47920ad6078d72370e7b607b7c1 100644 GIT binary patch delta 7824 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 delta 7982 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