From 001c5d6d1257450cda17b408d2d814bf0bb1f5f7 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Thu, 6 Aug 2020 21:45:55 +0100
Subject: [PATCH] A couple of small things

Better knife orientation
Prevent laser sight on tesla and flamethrower
---
 Projects/Android/AndroidManifest.xml          |  4 +--
 .../Android/jni/rtcw/src/cgame/cg_weapons.c   |  6 ++++
 Projects/Android/jni/rtcw/src/game/q_shared.h |  2 +-
 assets/weapons_vr.cfg                         | 34 +++++++++----------
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 4c94e4f..5ce62e4 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.rtcwquest"
-		android:versionCode="26"
-		android:versionName="0.22.1" android:installLocation="auto" >
+		android:versionCode="28"
+		android:versionName="0.23.1" android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
 	<uses-feature android:glEsVersion="0x00030001" android:required="true"/>
diff --git a/Projects/Android/jni/rtcw/src/cgame/cg_weapons.c b/Projects/Android/jni/rtcw/src/cgame/cg_weapons.c
index 6452e3c..7db650d 100644
--- a/Projects/Android/jni/rtcw/src/cgame/cg_weapons.c
+++ b/Projects/Android/jni/rtcw/src/cgame/cg_weapons.c
@@ -3586,6 +3586,12 @@ void CG_AddViewWeapon( playerState_t *ps ) {
         case WP_DYNAMITE:
         case WP_GRENADE_LAUNCHER:
         case WP_GRENADE_PINEAPPLE:
+        case WP_TESLA:
+        case WP_FLAMETHROWER:
+        //Not sure about these
+        //case WP_FG42:
+        //case WP_GARAND:
+        //case WP_MAUSER:
             break;
         default:
             {
diff --git a/Projects/Android/jni/rtcw/src/game/q_shared.h b/Projects/Android/jni/rtcw/src/game/q_shared.h
index 8291472..c32759d 100644
--- a/Projects/Android/jni/rtcw/src/game/q_shared.h
+++ b/Projects/Android/jni/rtcw/src/game/q_shared.h
@@ -42,7 +42,7 @@ If you have questions concerning this license or the applicable additional terms
 // q_shared.h -- included first by ALL program modules.
 // A user mod should never modify this file
 
-#define Q3_VERSION      "RTCWQuest 0.22.1 (Wolf 1.41)"
+#define Q3_VERSION      "RTCWQuest 0.23.1 (Wolf 1.41)"
 // ver 1.0.0	- release
 // ver 1.0.1	- post-release work
 // ver 1.1.0	- patch 1 (12/12/01)
diff --git a/assets/weapons_vr.cfg b/assets/weapons_vr.cfg
index 3e604de..1b87333 100644
--- a/assets/weapons_vr.cfg
+++ b/assets/weapons_vr.cfg
@@ -33,23 +33,23 @@
 // put the weapon id at the end of the cvar name, so the knife is vr_weapon_adjustment_1
 // Values are:  scale,right,up,forward,pitch,yaw,roll
 
-seta vr_weapon_adjustment_20 "0.55,-9.49,12.98,-22.76,1.60,-0.50,0.00"
+seta vr_weapon_adjustment_1 "0.55,-4.89,8.12,-12.36,-28.60,10.80,-199.50"
+seta vr_weapon_adjustment_2 "0.60,-9.30,10.60,-19.14,-4.80,-4.90,0.00"
+seta vr_weapon_adjustment_3 "0.65,-8.24,5.51,-8.14,-4.00,0.40,3.40"
+seta vr_weapon_adjustment_6 "0.60,-10.77,17.57,-21.73,0.00,1.60,0.00"
+seta vr_weapon_adjustment_11 "0.57,-9.54,10.71,-22.90,1.70,-1.40,0.00"
+seta vr_weapon_adjustment_12 "0.75,-7.63,7.41,-11.84,-2.80,0.00,0.00"
+seta vr_weapon_adjustment_18 "0.50,-8.32,10.40,-4.28,-4.90,0.80,0.00"
+seta vr_weapon_adjustment_7 "1.04,-5.51,6.65,-7.55,0.00,0.00,0.00"
+seta vr_weapon_adjustment_9 "0.70,-5.01,6.81,13.25,0.00,0.00,0.00"
+seta vr_weapon_adjustment_10 "0.75,-2.84,7.29,22.49,0.00,0.00,0.00"
+seta vr_weapon_adjustment_13 "0.55,-9.71,8.15,-2.54,0.70,-2.00,0.00"
+seta vr_weapon_adjustment_22 "0.59,-10.44,14.52,-19.46,0.00,1.60,0.00"
+seta vr_weapon_adjustment_4 "0.55,-8.72,8.28,-0.99,-1.00,-2.00,0.00"
+seta vr_weapon_adjustment_5 "0.60,-8.44,6.16,-14.74,0.00,1.60,0.00"
+seta vr_weapon_adjustment_8 "0.70,-9.34,8.60,-6.38,0.00,0.00,0.00"
+seta vr_weapon_adjustment_14 "0.50,-11.57,16.65,-20.89,0.00,1.60,0.00"
 seta vr_weapon_adjustment_19 "0.55,-9.13,12.84,-20.25,-5.30,-4.60,0.00"
-seta vr_weapon_adjustment_14 "0.55,-12.11,15.20,-21.05,0.20,1.40,0.00"
-seta vr_weapon_adjustment_8 "0.75,-9.28,12.23,-6.09,0.00,0.00,0.00"
-seta vr_weapon_adjustment_5 "0.65,-8.61,8.82,-16.44,0.20,1.40,0.00"
-seta vr_weapon_adjustment_4 "0.53,-9.17,13.42,6.73,0.20,-1.50,5.50"
-seta vr_weapon_adjustment_22 "0.65,-10.52,13.71,-20.46,0.20,1.40,0.00"
-seta vr_weapon_adjustment_13 "0.55,-9.34,10.40,-2.15,0.20,-1.50,5.50"
-seta vr_weapon_adjustment_10 "0.70,-8.28,8.19,-12.26,0.00,0.40,0.00"
-seta vr_weapon_adjustment_9 "0.75,-9.52,7.61,-11.47,0.00,0.00,0.00"
-seta vr_weapon_adjustment_7 "1.17,-5.62,7.62,-6.15,0.00,0.00,0.00"
-seta vr_weapon_adjustment_18 "0.55,-7.88,12.70,-3.87,-4.80,1.50,-3.70"
-seta vr_weapon_adjustment_12 "0.75,-7.59,9.30,-12.25,-3.40,0.00,0.00"
-seta vr_weapon_adjustment_11 "0.55,-9.49,12.98,-22.76,1.60,-0.50,0.00"
-seta vr_weapon_adjustment_6 "0.65,-10.62,12.90,-20.74,0.20,1.40,0.00"
-seta vr_weapon_adjustment_3 "0.60,-8.76,11.68,-7.21,-3.40,0.00,3.60"
-seta vr_weapon_adjustment_2 "0.55,-9.13,12.84,-20.25,-5.30,-4.60,0.00"
-seta vr_weapon_adjustment_1 "0.60,-5.03,7.45,-13.41,0.00,0.00,0.00"
+seta vr_weapon_adjustment_20 "0.55,-9.49,12.98,-22.76,1.60,-0.50,0.00"