From f47f9593f83e6d1579edebe90ebfb57957e1a07e Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sat, 30 May 2020 10:45:28 +0100
Subject: [PATCH] Fix weapon projectile origin height  when standing in water

---
 Projects/Android/AndroidManifest.xml                          | 4 ++--
 .../gzdoom-g3.3mgw_mobile/src/gl/stereo3d/gl_oculusquest.cpp  | 4 ++--
 Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/version.h      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index cecec0c..1ec6e66 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.questzdoom"
-		android:versionCode="18"
-		android:versionName="1.1.0" android:installLocation="auto" >
+		android:versionCode="19"
+		android:versionName="1.1.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/gzdoom-g3.3mgw_mobile/src/gl/stereo3d/gl_oculusquest.cpp b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/stereo3d/gl_oculusquest.cpp
index c68e894..3b173fe 100644
--- a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/stereo3d/gl_oculusquest.cpp
+++ b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/stereo3d/gl_oculusquest.cpp
@@ -480,8 +480,8 @@ namespace s3d
 
                     player->mo->AttackPos.X = player->mo->X() - (weaponoffset[0] * vr_vunits_per_meter);
                     player->mo->AttackPos.Y = player->mo->Y() - (weaponoffset[2] * vr_vunits_per_meter);
-                    player->mo->AttackPos.Z = player->mo->Z() + (((hmdPosition[1] + weaponoffset[1] + vr_height_adjust) * vr_vunits_per_meter) / pixelstretch) + (player->viewheight -
-                            getDoomPlayerHeightWithoutCrouch(player));
+                    player->mo->AttackPos.Z = r_viewpoint.CenterEyePos.Z + (((hmdPosition[1] + weaponoffset[1] + vr_height_adjust) * vr_vunits_per_meter) / pixelstretch) -
+                            getDoomPlayerHeightWithoutCrouch(player); // Fixes wrong shot height when in water
 
                     player->mo->AttackDir = MapAttackDir;
                 }
diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/version.h b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/version.h
index 7e64509..74ef4e3 100644
--- a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/version.h
+++ b/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.1.0 (LZDoom 3.85)"
+#define VERSIONSTR "DrBeef's QuestZDoom-1.1.1 (LZDoom 3.85)"
 
 // The version as seen in the Windows resource
 #define RC_FILEVERSION 3,85,0