From 5ca43984e0fe5c8260d56fd58d8eab80599e624f Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sat, 15 May 2021 19:11:22 +0100
Subject: [PATCH] Finish removal of the useHapticsService cvar

---
 Projects/Android/AndroidManifest.xml                  | 11 ++++++++---
 Projects/Android/build.gradle                         |  5 ++++-
 .../Android/gradle/wrapper/gradle-wrapper.properties  |  2 +-
 .../d3es-multithread-master/neo/framework/Licensee.h  |  2 +-
 .../d3es-multithread-master/neo/sound/snd_world.cpp   |  4 +---
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 6025648..7a98a2b 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.doom3quest"
-		android:versionCode="24"
-		android:versionName="1.2.0" android:installLocation="auto" >
+		android:versionCode="25"
+		android:versionName="1.2.1"
+		android:installLocation="auto">
 
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
@@ -17,7 +18,11 @@
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
-	<application android:allowBackup="false" android:icon="@drawable/ic_qquest" android:label="@string/doom3quest">
+	<application android:allowBackup="false"
+		android:icon="@drawable/ic_qquest"
+		android:label="@string/doom3quest"
+		android:extractNativeLibs="true">
+
 		<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
 		<meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2"/>
 		<!-- The activity is the built-in NativeActivity framework class. -->
diff --git a/Projects/Android/build.gradle b/Projects/Android/build.gradle
index d321d44..6fb0e4a 100644
--- a/Projects/Android/build.gradle
+++ b/Projects/Android/build.gradle
@@ -62,4 +62,7 @@ buildscript {
     repositories {
         google()
     }
-}
\ No newline at end of file
+}
+
+task prepareKotlinBuildScriptModel {
+}
diff --git a/Projects/Android/gradle/wrapper/gradle-wrapper.properties b/Projects/Android/gradle/wrapper/gradle-wrapper.properties
index 3ab2e78..33e5449 100644
--- a/Projects/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Projects/Android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
diff --git a/Projects/Android/jni/d3es-multithread-master/neo/framework/Licensee.h b/Projects/Android/jni/d3es-multithread-master/neo/framework/Licensee.h
index f2f7bb5..36e4ce7 100644
--- a/Projects/Android/jni/d3es-multithread-master/neo/framework/Licensee.h
+++ b/Projects/Android/jni/d3es-multithread-master/neo/framework/Licensee.h
@@ -41,7 +41,7 @@ If you have questions concerning this license or the applicable additional terms
 #define GAME_NAME						"Doom3Quest"		// appears on window titles and errors
 #endif
 
-#define ENGINE_VERSION					"Doom3Quest 1.2.0"	// printed in console
+#define ENGINE_VERSION					"Doom3Quest 1.2.1"	// printed in console
 
 #ifdef ID_REPRODUCIBLE_BUILD
 	// for reproducible builds we hardcode values that would otherwise come from __DATE__ and __TIME__
diff --git a/Projects/Android/jni/d3es-multithread-master/neo/sound/snd_world.cpp b/Projects/Android/jni/d3es-multithread-master/neo/sound/snd_world.cpp
index 78f82ca..90e1406 100644
--- a/Projects/Android/jni/d3es-multithread-master/neo/sound/snd_world.cpp
+++ b/Projects/Android/jni/d3es-multithread-master/neo/sound/snd_world.cpp
@@ -1357,7 +1357,6 @@ void idSoundWorldLocal::ReadFromSaveGame( idFile *savefile ) {
 			}
 
 			//Only concerned with registering looping sounds with the haptics service
-            if (cvarSystem->GetCVarBool("vr_useHapticsService"))
             {
                 bool looping = (def->parms.soundShaderFlags & SSF_LOOPING) != 0;
                 if (looping)
@@ -1769,8 +1768,7 @@ void idSoundWorldLocal::AddChannelContribution( idSoundEmitterLocal *sound, idSo
 	float inputSamples[MIXBUFFER_SAMPLES*2+16];
 	float *alignedInputSamples = (float *) ( ( ( (intptr_t)inputSamples ) + 15 ) & ~15 );
 
-	if (cvarSystem->GetCVarBool("vr_useHapticsService") &&
-		looping)
+	if (looping)
 	{
 		idVec3 direction = (listenerPos / DOOM_TO_METERS) - sound->origin;