From 00d07de8a72fb452c58643b96589bc79e44552ba Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Mon, 6 Feb 2023 21:43:31 +0000
Subject: [PATCH] Update menu in pk3

remove warning about positional tracking issues (thanks to Mitch fixing it in Raze upstream)
Ensure SW pitch is set correctly
---
 source/core/version.h               | 2 +-
 source/games/blood/src/controls.cpp | 1 +
 source/games/duke/src/input.cpp     | 1 +
 source/games/exhumed/src/input.cpp  | 1 +
 source/games/sw/src/input.cpp       | 4 +++-
 wadsrc/static/menudef.txt           | 4 ----
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/core/version.h b/source/core/version.h
index 149ef8312..b39036d07 100644
--- a/source/core/version.h
+++ b/source/core/version.h
@@ -44,7 +44,7 @@ const char *GetVersionString();
 
 #define VERSIONSTR "1.7pre"
 
-#define RAZEXR_VERSIONSTR "RazeXR 0.1.2"
+#define RAZEXR_VERSIONSTR "RazeXR 0.1.3"
 
 // The version as seen in the Windows resource
 #define RC_FILEVERSION 1,6,9999,0
diff --git a/source/games/blood/src/controls.cpp b/source/games/blood/src/controls.cpp
index 0435d24f6..9979c3b65 100644
--- a/source/games/blood/src/controls.cpp
+++ b/source/games/blood/src/controls.cpp
@@ -58,6 +58,7 @@ void GameInterface::GetInput(ControlInfo* const hidInput, double const scaleAdju
 	if (!SyncInput() && gamestate == GS_LEVEL && pPlayer->actor->xspr.health != 0)
 	{
 		pPlayer->Angles.RenderAngles.Yaw += DAngle::fromDeg(input.avel);
+		//For VR just set the pitch directly
 		pPlayer->Angles.RenderAngles.Pitch = DAngle::fromDeg(input.horz);
 	}
 
diff --git a/source/games/duke/src/input.cpp b/source/games/duke/src/input.cpp
index 1d5b12bc2..83c405325 100644
--- a/source/games/duke/src/input.cpp
+++ b/source/games/duke/src/input.cpp
@@ -841,6 +841,7 @@ void GameInterface::GetInput(ControlInfo* const hidInput, double const scaleAdju
 	if (!SyncInput() && p->GetActor()->spr.extra > 0)
 	{
 		p->Angles.RenderAngles.Yaw += p->adjustavel(input.avel);
+		//For VR just set the pitch directly
 		p->Angles.RenderAngles.Pitch = DAngle::fromDeg(input.horz);
 	}
 
diff --git a/source/games/exhumed/src/input.cpp b/source/games/exhumed/src/input.cpp
index af78efdcb..487096d31 100644
--- a/source/games/exhumed/src/input.cpp
+++ b/source/games/exhumed/src/input.cpp
@@ -85,6 +85,7 @@ void GameInterface::GetInput(ControlInfo* const hidInput, double const scaleAdju
     if (!SyncInput() && gamestate == GS_LEVEL && !nFreeze)
     {
         pPlayer->Angles.RenderAngles.Yaw += DAngle::fromDeg(input.avel);
+        //For VR just set the pitch directly
         pPlayer->Angles.RenderAngles.Pitch = DAngle::fromDeg(input.horz);
 
         if (input.horz)
diff --git a/source/games/sw/src/input.cpp b/source/games/sw/src/input.cpp
index b1516e375..d07dd8936 100644
--- a/source/games/sw/src/input.cpp
+++ b/source/games/sw/src/input.cpp
@@ -180,9 +180,11 @@ void GameInterface::GetInput(ControlInfo* const hidInput, double const scaleAdju
     {
         if ((pp->Flags2 & PF2_INPUT_CAN_AIM))
         {
-            pp->Angles.RenderAngles.Pitch += DAngle::fromDeg(input.horz);
+            //For VR just set the pitch directly
+            pp->Angles.RenderAngles.Pitch = DAngle::fromDeg(input.horz);
         }
 
+
         if ((pp->Flags2 & PF2_INPUT_CAN_TURN_GENERAL))
         {
             pp->Angles.RenderAngles.Yaw += DAngle::fromDeg(input.avel);
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 5e5ef55d6..5cda49c94 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -553,10 +553,6 @@ OptionMenu "VROptionsMenu" protected
 	StaticText 	""
 	Slider "Height Adjust",	"vr_height_adjust", 0.0, 1.0, 0.1
 	StaticText 	""
-	StaticText 	""
-	StaticText 	"Positional Tracking will exacerbate some rendering glitches"
-	StaticText 	"when crossing sector boundaries"
-	StaticText 	""
 	Option "Positional Tracking",	"vr_positional_tracking", "YesNo"
 
     StaticText ""