From a83dfc79893b7c2fbe373fa99b0c694f127d0091 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sun, 29 Jan 2023 08:36:46 +0000
Subject: [PATCH] Added haptics for ATST

---
 Projects/Android/AndroidManifest.xml                  |  4 ++--
 Projects/Android/jni/OpenJK/Android.mk                | 11 +++--------
 .../Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp   |  4 +++-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 1eb818a..598a29d 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/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.jkquest"
-		android:versionCode="35"
-		android:versionName="0.5.4" android:installLocation="auto" >
+		android:versionCode="36"
+		android:versionName="0.5.5" android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
 	<uses-feature android:glEsVersion="0x00030002" android:required="true"/>
diff --git a/Projects/Android/jni/OpenJK/Android.mk b/Projects/Android/jni/OpenJK/Android.mk
index b63cb45..f476b77 100644
--- a/Projects/Android/jni/OpenJK/Android.mk
+++ b/Projects/Android/jni/OpenJK/Android.mk
@@ -5,15 +5,10 @@ LOCAL_PATH := $(call my-dir)
 OPENXR_HMD := META_QUEST
 #OPENXR_HMD := PICO_XR
 
-JK3_BASE_CFLAGS = -D$(OPENXR_HMD) -DHAVE_GLES -DFINAL_BUILD -fexceptions  -Wall -Wno-write-strings -Wno-comment   -fno-caller-saves -fno-tree-vectorize -Wno-unused-but-set-variable -fvisibility=hidden
-JK3_BASE_CPPFLAGS =  -fvisibility-inlines-hidden -Wno-invalid-offsetof -fvisibility=hidden
+JK3_BASE_CFLAGS = -O1 -D$(OPENXR_HMD) -DHAVE_GLES -DFINAL_BUILD -fexceptions  -Wall -Wno-write-strings -Wno-comment   -fno-caller-saves -fno-tree-vectorize -Wno-unused-but-set-variable -fvisibility=hidden
+JK3_BASE_CPPFLAGS =  -O1 -fvisibility-inlines-hidden -Wno-invalid-offsetof -fvisibility=hidden
 
-ifeq ($(NDK_DEBUG), 0)
-JK3_BASE_CFLAGS += -O3
-JK3_BASE_CPPFLAGS += -O3
-endif
-
-JK3_BASE_LDLIBS = 
+JK3_BASE_LDLIBS =
 
 #Armv7
 # JK3_BASE_CFLAGS += -mfloat-abi=softfp
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
index ee1ff30..61f8656 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
@@ -3302,7 +3302,8 @@ void CG_FireWeapon( centity_t *cent, qboolean alt_fire )
 			case WP_BRYAR_PISTOL:
 			case WP_BOWCASTER:
 			case WP_BLASTER:
-				cgi_HapticEvent("machinegun_fire", position, 0, 100, 0, 0);
+			case WP_ATST_MAIN:
+				cgi_HapticEvent("machinegun_fire", position, 0, (ent->weapon == WP_BRYAR_PISTOL) ? 60 : 100, 0, 0);
 				break;
 			case WP_BLASTER_PISTOL:
 				cgi_HapticEvent("shotgun_fire", position, 0, 100, 0, 0);
@@ -3313,6 +3314,7 @@ void CG_FireWeapon( centity_t *cent, qboolean alt_fire )
 				cgi_HapticEvent("handgrenade_fire", position, 0, 80, 0, 0);
 				break;
 			case WP_ROCKET_LAUNCHER:
+			case WP_ATST_SIDE:
 				cgi_HapticEvent("rocket_fire", position, 0, 100, 0, 0);
 				break;
 			case WP_DISRUPTOR: