From 2dbf8e32c91440ed60ee0d60a0729e2c6407a5f7 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Fri, 8 Oct 2021 21:50:55 +0200
Subject: [PATCH] Make use of the new Enable/Disable model functions to
 hide/show sniper rifles during zooming

---
 src/shared/w_awp.qc   |  4 ++++
 src/shared/w_g3sg1.qc |  3 +++
 src/shared/w_scout.qc |  4 ++++
 src/shared/w_sg550.qc | 10 +++++++---
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/shared/w_awp.qc b/src/shared/w_awp.qc
index ed8fbcf..f31d69f 100644
--- a/src/shared/w_awp.qc
+++ b/src/shared/w_awp.qc
@@ -158,15 +158,19 @@ w_awp_release(void)
 
 	if (pl.w_idle_next > 0.0f) {
 		pl.viewzoom = 1.0f;
+		Weapons_EnableModel();
 		return;
 	}
 
 	if (pl.mode_temp == 1) {
 		pl.viewzoom = 0.45f;
+		Weapons_DisableModel();
 	} else if (pl.mode_temp == 2) {
 		pl.viewzoom = 0.1f;
+		Weapons_DisableModel();
 	} else {
 		pl.viewzoom = 1.0f;
+		Weapons_EnableModel();
 	}
 }
 
diff --git a/src/shared/w_g3sg1.qc b/src/shared/w_g3sg1.qc
index 113ca17..cb239c0 100644
--- a/src/shared/w_g3sg1.qc
+++ b/src/shared/w_g3sg1.qc
@@ -160,10 +160,13 @@ w_g3sg1_secondary(void)
 	/* Simple toggle of fovs */
 	if (pl.viewzoom == 1.0f) {
 		pl.viewzoom = 0.45f;
+		Weapons_DisableModel();
 	} else if (pl.viewzoom == 0.45f) {
 		pl.viewzoom = 0.1f;
+		Weapons_DisableModel();
 	} else {
 		pl.viewzoom = 1.0f;
+		Weapons_EnableModel();
 	}
 	pl.w_attack_next = 0.5f;
 }
diff --git a/src/shared/w_scout.qc b/src/shared/w_scout.qc
index d7d8d1e..6a1daec 100644
--- a/src/shared/w_scout.qc
+++ b/src/shared/w_scout.qc
@@ -124,15 +124,19 @@ w_scout_release(void)
 
 	if (pl.w_idle_next > 0.0f) {
 		pl.viewzoom = 1.0f;
+		Weapons_EnableModel();
 		return;
 	}
 
 	if (pl.mode_temp == 1) {
 		pl.viewzoom = 0.45f;
+		Weapons_DisableModel();
 	} else if (pl.mode_temp == 2) {
 		pl.viewzoom = 0.1f;
+		Weapons_DisableModel();
 	} else {
 		pl.viewzoom = 1.0f;
+		Weapons_EnableModel();
 	}
 }
 
diff --git a/src/shared/w_sg550.qc b/src/shared/w_sg550.qc
index 9fe5139..81f964f 100644
--- a/src/shared/w_sg550.qc
+++ b/src/shared/w_sg550.qc
@@ -158,12 +158,16 @@ w_sg550_secondary(void)
 		return;
 
 	/* Simple toggle of fovs */
-	if (pl.viewzoom == 1.0f)
+	if (pl.viewzoom == 1.0f) {
 		pl.viewzoom = 0.45f;
-	else if (pl.viewzoom == 0.45f)
+		Weapons_DisableModel();
+	} else if (pl.viewzoom == 0.45f) {
 		pl.viewzoom = 0.1f;
-	else
+		Weapons_DisableModel();
+	} else {
 		pl.viewzoom = 1.0f;
+		Weapons_EnableModel();
+	}
 
 	pl.w_attack_next = 0.5f;
 }