Added External Haptics Intensity config

Affects level of all external haptics

Projects/Android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.questzdoom"
-		android:versionCode="26"
-		android:versionName="1.2.1" android:installLocation="auto" >
+		android:versionCode="27"
+		android:versionName="1.2.2" android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
 	<uses-feature android:glEsVersion="0x00030001" android:required="true"/>
@@ -13,10 +13,6 @@
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.BLUETOOTH" />
-	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 

Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/c_cvars.cpp

@@ -1677,6 +1677,8 @@ FBaseCVar *FindCVarSub (const char *var_name, int namelen)
 	return var;
 }
 
+EXTERN_CVAR(Float, ext_haptic_level_global_intensity)
+
 float C_GetExternalHapticLevelValue(const char *haptic_name)
 {
 	char buffer[256];
@@ -1684,10 +1686,10 @@ float C_GetExternalHapticLevelValue(const char *haptic_name)
 	FBaseCVar *pCVar = FindCVar(buffer, NULL);
 	if (pCVar != NULL)
 	{
-		return pCVar->GetGenericRep(CVAR_Float).Float;
+		return pCVar->GetGenericRep(CVAR_Float).Float * ext_haptic_level_global_intensity;
 	}
 
-	return 1.0;
+	return ext_haptic_level_global_intensity;
 }
 
 FBaseCVar *GetCVar(int playernum, const char *cvarname)

Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_actionfunctions.cpp

@@ -105,6 +105,7 @@ FRandom pr_cajump("CustomJump");
 CVAR(Bool, vr_recoil, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 
 //External Haptics Level CVARs
+CVAR(Float, ext_haptic_level_global_intensity, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR(Float, ext_haptic_level_damage_projectile, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR(Float, ext_haptic_level_pickup_weapon, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR(Float, ext_haptic_level_pickup, 1.0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)

Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/version.h

@@ -41,7 +41,7 @@ const char *GetVersionString();
 
 /** Lots of different version numbers **/
 
-#define VERSIONSTR "DrBeef's QuestZDoom-1.2.1 (LZDoom 3.86)"
+#define VERSIONSTR "DrBeef's QuestZDoom-1.2.2 (LZDoom 3.86)"
 
 // The version as seen in the Windows resource
 #define RC_FILEVERSION 3,86,0

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

@@ -2345,6 +2345,7 @@ OptionMenu VROptionsMenu protected
 	StaticText "Haptics"
 	Slider "Item Pickup Haptic Level",  "vr_pickup_haptic_level", 0.0, 1.0, 0.1, 2
 	Slider "Quake Haptic Level",        "vr_quake_haptic_level", 0.0, 1.0, 0.1, 2
+	Slider "External Haptics Intensity",   "ext_haptic_level_global_intensity", 0.0, 2.0, 0.1, 2
 
 	StaticText ""
 	StaticText "Weapon"