From a1268d9045924e1a6bdcc3983f51e5f5b2b4e4a3 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Tue, 1 Aug 2023 18:22:19 +0100
Subject: [PATCH] Slight adjustment as to when to draw hand models

---
 Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp    | 4 +++-
 Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp b/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
index b1ca05d..d37e758 100644
--- a/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
+++ b/Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
@@ -2374,6 +2374,7 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView ) {
 			&& !vr->weapon_stabilised
 			&& !vr->in_vehicle
 			&& !cg_pano.integer
+			&& cg.zoomMode == 0
 			&& (cg.snap->ps.viewEntity == 0 || cg.snap->ps.viewEntity >= ENTITYNUM_WORLD))
 		{
 			vec3_t end, forward;
@@ -2389,7 +2390,8 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView ) {
 
 			handEnt.renderfx = RF_DEPTHHACK | RF_VRVIEWMODEL;
 
-			if (!g_entities[cg.snap->ps.viewEntity].client->ps.dualSabers)
+			if (!g_entities[cg.snap->ps.viewEntity].client->ps.dualSabers ||
+				cg.snap->ps.weapon != WP_SABER)
 			{
 				if (cg.snap->ps.powerups[PW_FORCE_PUSH] > cg.time ||
 					(cg.snap->ps.forcePowersActive & (1<<FP_GRIP)) ||
diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
index 9566de6..0c92f71 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
@@ -2040,6 +2040,7 @@ wasForceSpeed=isForceSpeed;
 			&& !vr->weapon_stabilised
 			&& !vr->in_vehicle
 			&& !cg_pano.integer
+			&& cg.zoomMode == 0
 			&& (cg.snap->ps.viewEntity == 0 || cg.snap->ps.viewEntity >= ENTITYNUM_WORLD))
 		{
 			vec3_t end, forward;