teambeef/questzdoom
0
0
Fork 0
mirror of https://github.com/DrBeef/QuestZDoom.git synced 2025-03-04 16:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menu and haptic tweak

Browse source
This commit is contained in:
Simon 2020-04-08 23:26:09 +01:00
parent 933b33d661
commit 837d3aa54a
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_map.cpp
View file

@ -4432,14 +4432,15 @@ 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 // We need to preserve this info from the damage type because the actual damage type can get overridden by the puff
pflag = DMG_PLAYERATTACK; pflag = DMG_PLAYERATTACK;
if ( damage > 0) {
//Haptics //Haptics
long rightHanded = vr_control_scheme < 10; long rightHanded = vr_control_scheme < 10;
QzDoom_Vibrate(150, rightHanded ? 1 : 0, 0.8); QzDoom_Vibrate(150, rightHanded ? 1 : 0, 0.8);
if (weaponStabilised) if (weaponStabilised) {
{
QzDoom_Vibrate(150, rightHanded ? 0 : 1, 0.6); QzDoom_Vibrate(150, rightHanded ? 0 : 1, 0.6);
} }
} }
}
// [MC] If overriding, set it to the base of the actor. // [MC] If overriding, set it to the base of the actor.
// Offset by the amount specified. // Offset by the amount specified.

2
Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/menudef.txt
View file

@ -341,8 +341,6 @@ OptionMenu "OptionsMenu" protected
Submenu "VR Options", "VROptionsMenu" Submenu "VR Options", "VROptionsMenu"
StaticText " " StaticText " "
Submenu "$OPTMNU_CONTROLS", "CustomizeControls" Submenu "$OPTMNU_CONTROLS", "CustomizeControls"
Submenu "$OPTMNU_MOUSE", "MouseOptions"
Submenu "$OPTMNU_JOYSTICK", "JoystickOptions"
StaticText " " StaticText " "
Submenu "$OPTMNU_PLAYER", "NewPlayerMenu" Submenu "$OPTMNU_PLAYER", "NewPlayerMenu"
Submenu "$OPTMNU_GAMEPLAY", "GameplayOptions" Submenu "$OPTMNU_GAMEPLAY", "GameplayOptions"

BIN
assets/res/lzdoom.pk3
View file

Binary file not shown.