From 70468332d69b81a6c5a4a16b1681c33ba6d7e881 Mon Sep 17 00:00:00 2001
From: Grant Bagwell <general@grantbagwell.co.uk>
Date: Wed, 5 Apr 2023 22:19:45 +0200
Subject: [PATCH] TBDC Cleanup

---
 Projects/Android/jni/JKXR/VrInputDefault.cpp          | 10 ++++++----
 Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Projects/Android/jni/JKXR/VrInputDefault.cpp b/Projects/Android/jni/JKXR/VrInputDefault.cpp
index 050aa94..24ce518 100644
--- a/Projects/Android/jni/JKXR/VrInputDefault.cpp
+++ b/Projects/Android/jni/JKXR/VrInputDefault.cpp
@@ -414,7 +414,9 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
             }
         }
 
-        static bool changed = false;
+        /*
+        //Parameter Changer
+         static bool changed = false;
         if (between(-0.2f, primaryJoystickX, 0.2f) &&
             between(0.8f, pPrimaryJoystick->y, 1.0f)) {
             if(!changed) {
@@ -433,7 +435,7 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
         else
         {
             changed = false;
-        }
+        }*/
 
         //dominant hand stuff first
         {
@@ -445,7 +447,7 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
             VectorCopy(vr.weaponoffset, vr.weaponoffset_history[0]);
             vr.weaponoffset_history_timestamp[0] = vr.weaponoffset_timestamp;
 
-            //if (vr.saberBlockDebounce < cl.serverTime) {
+
             VectorSet(vr.weaponposition, pWeapon->Pose.position.x,
                       pWeapon->Pose.position.y, pWeapon->Pose.position.z);
 
@@ -454,7 +456,7 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
                       pWeapon->Pose.position.y, pWeapon->Pose.position.z);
             VectorSubtract(vr.weaponoffset, vr.hmdposition, vr.weaponoffset);
             vr.weaponoffset_timestamp = Sys_Milliseconds();
-            //}
+
 
             vec3_t velocity;
             VectorSet(velocity, pWeapon->Velocity.linearVelocity.x,
diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp
index 713f995..475fe6a 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp
@@ -6792,7 +6792,7 @@ Ghoul2 Insert End
 			vr->saberBlockDebounce < cg.time &&
 			bladeNum == 0) // Only need to do this for the first blade
     {
-		cvar_t *vr_saber_block_debounce_time = gi.cvar("vr_saber_block_debounce_time", "1000", CVAR_ARCHIVE); // defined in VrCvars.h
+		cvar_t *vr_saber_block_debounce_time = gi.cvar("vr_saber_block_debounce_time", "200", CVAR_ARCHIVE); // defined in VrCvars.h
 		vr->saberBlockDebounce = cg.time + vr_saber_block_debounce_time->integer;
 
 		cgi_HapticEvent("shotgun_fire", 0, vr->right_handed ? (2 - saberNum) : (1 + saberNum), 100, 0, 0);