From c0b09aab2de6fca0c76d66ec717f16591380331f Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Mon, 1 May 2023 17:38:14 +0100
Subject: [PATCH] Ensure menu displayed in front of player on start-up

---
 Projects/Android/AndroidManifest.xml                         | 4 ++--
 Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c        | 4 ++--
 Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 70fd13b..1b734c1 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.lambda1vr"
-		android:versionCode="31"
-		android:versionName="1.6.1" android:installLocation="auto" >
+		android:versionCode="32"
+		android:versionName="1.6.2" 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/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
index 38fdf78..c44e08a 100644
--- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
+++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
@@ -155,7 +155,7 @@ void VR_SetHMDOrientation(float pitch, float yaw, float roll)
 {
 	VectorSet(hmdorientation, pitch, yaw, roll);
 
-	if (!VR_UseScreenLayer())
+	if (!VR_UseScreenLayer() || playerYaw == -999.0)
 	{
 		playerYaw = yaw;
 	}
@@ -351,7 +351,7 @@ void initialize_gl4es();
 void VR_Init()
 {
 	//Initialise all our variables
-	playerYaw = 0.0f;
+	playerYaw = -999.0f; // ensure we get the first player yaw once available
 	showingScreenLayer = false;
 	remote_movementSideways = 0.0f;
 	remote_movementForward = 0.0f;
diff --git a/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c b/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c
index e0235c2..92fea0d 100644
--- a/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c
+++ b/Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c
@@ -139,7 +139,7 @@ Q_buildcommit will identify this build as release or "notset"
 */
 const char *Q_buildcommit( void )
 {
-	return "Lambda1VR-v1.6.1";
+	return "Lambda1VR-v1.6.2";
 }
 
 /*