From 61e68af73c50042797d019393c33651e617dacbd Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Thu, 12 Oct 2023 14:49:33 -0700
Subject: [PATCH] Remove view.qc and modelevent.qc

---
 src/client/progs.src          |  2 --
 src/client/view.qc            | 65 -----------------------------------
 src/shared/w_ak47.qc          |  1 +
 src/shared/w_aug.qc           |  1 +
 src/shared/w_awp.qc           |  1 +
 src/shared/w_c4bomb.qc        |  4 +++
 src/shared/w_deagle.qc        |  1 +
 src/shared/w_elites.qc        |  1 +
 src/shared/w_fiveseven.qc     |  1 +
 src/shared/w_flashbang.qc     |  4 +++
 src/shared/w_g3sg1.qc         |  1 +
 src/shared/w_glock18.qc       |  1 +
 src/shared/w_hegrenade.qc     |  4 +++
 src/shared/w_knife.qc         |  4 +++
 src/shared/w_m3.qc            |  1 +
 src/shared/w_m4a1.qc          |  1 +
 src/shared/w_mac10.qc         |  1 +
 src/shared/w_mp5.qc           |  1 +
 src/shared/w_p228.qc          |  1 +
 src/shared/w_p90.qc           |  1 +
 src/shared/w_para.qc          |  1 +
 src/shared/w_scout.qc         |  1 +
 src/shared/w_sg550.qc         |  1 +
 src/shared/w_sg552.qc         |  1 +
 src/shared/w_smokegrenade.qc  |  4 +++
 src/shared/w_tmp.qc           |  1 +
 src/shared/w_ump45.qc         |  1 +
 src/shared/w_usp45.qc         |  8 ++---
 src/shared/w_xm1014.qc        |  1 +
 src/shared/weapons_cstrike.qc | 12 +++++++
 30 files changed, 55 insertions(+), 73 deletions(-)
 delete mode 100644 src/client/view.qc

diff --git a/src/client/progs.src b/src/client/progs.src
index 0e73389..5588170 100644
--- a/src/client/progs.src
+++ b/src/client/progs.src
@@ -30,7 +30,6 @@ cmds.qc
 game_event.qc
 ../../../valve/src/client/camera.qc
 ../../../valve/src/client/viewmodel.qc
-view.qc
 crosshair.qc
 ../../../valve/src/client/obituary.qc
 ../../../valve/src/client/hud_dmgnotify.qc
@@ -40,7 +39,6 @@ hud_weaponselect.qc
 ../../../valve/src/client/hud_sprite.qc
 ../../../valve/src/client/scoreboard.qc
 radio.qc
-../../../valve/src/client/modelevent.qc
 
 ../../../src/client/include.src
 vgui_buypages.qc
diff --git a/src/client/view.qc b/src/client/view.qc
deleted file mode 100644
index f5b4e9e..0000000
--- a/src/client/view.qc
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2016-2020 Marco Cawthorne <marco@icculus.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-void
-View_UpdateWeapon(player pl, entity vm, entity mflash)
-{
-	/* only bother upon change */
-	if (pSeat->m_iLastWeapon == pl.activeweapon) {
-		return;
-	}
-	pSeat->m_iOldWeapon = pSeat->m_iLastWeapon;
-	pSeat->m_iLastWeapon = pl.activeweapon;
-
-	if (!pl.activeweapon) {
-		return;
-	}
-
-	/* we forced a weapon call outside the prediction,
-	 * thus we need to update all the net variables to
-	 * make sure these updates are recognized. this is
-	 * vile but it'll have to do for now */
-	SAVE_STATE(pl.w_attack_next)
-	SAVE_STATE(pl.w_idle_next)
-	SAVE_STATE(pl.viewzoom)
-	SAVE_STATE(pl.weapontime)
-	SAVE_STATE(pl.weaponframe)
-
-	/* hack, we changed the wep, move this into Game_Input/PMove */
-	Weapons_Draw(pl);
-
-	/* we forced a weapon call outside the prediction,
-	 * thus we need to update all the net variables to
-	 * make sure these updates are recognized. this is
-	 * vile but it'll have to do for now */
-	ROLL_BACK(pl.w_attack_next)
-	ROLL_BACK(pl.w_idle_next)
-	ROLL_BACK(pl.viewzoom)
-	ROLL_BACK(pl.weapontime)
-	ROLL_BACK(pl.weaponframe)
-
-	/* figure out when the attachments start. in FTE attachments for
-	 * HLMDL are treated as bones. they start at numbones + 1 */
-	skel_delete(mflash.skeletonindex);
-	mflash.skeletonindex = skel_create(vm.modelindex);
-	pSeat->m_iVMBones = skel_get_numbones(mflash.skeletonindex) + 1;
-
-	if (getplayerkeyfloat(pl.entnum-1, "*team") == TEAM_CT) {
-		setcustomskin(pSeat->m_eViewModel, "", "geomset 0 2\ngeomset 1 1\n");
-	} else {
-		setcustomskin(pSeat->m_eViewModel, "", "geomset 0 1\ngeomset 1 2\n");
-	}
-}
diff --git a/src/shared/w_ak47.qc b/src/shared/w_ak47.qc
index ca93f00..9f1eca1 100644
--- a/src/shared/w_ak47.qc
+++ b/src/shared/w_ak47.qc
@@ -138,6 +138,7 @@ w_ak47_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 4;
 	pl.cs_cross_deltadist = 4;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_aug.qc b/src/shared/w_aug.qc
index d0312f7..705e5cb 100644
--- a/src/shared/w_aug.qc
+++ b/src/shared/w_aug.qc
@@ -104,6 +104,7 @@ w_aug_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 3;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_awp.qc b/src/shared/w_awp.qc
index 208b5a7..850f32b 100644
--- a/src/shared/w_awp.qc
+++ b/src/shared/w_awp.qc
@@ -138,6 +138,7 @@ w_awp_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 8;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_c4bomb.qc b/src/shared/w_c4bomb.qc
index 1ae4780..ff57379 100644
--- a/src/shared/w_c4bomb.qc
+++ b/src/shared/w_c4bomb.qc
@@ -101,6 +101,10 @@ w_c4bomb_draw(player pl)
 	Weapons_SetModel("models/v_c4.mdl");
 	Weapons_ViewAnimation(pl, C4_DRAW);
 	pl.mode_temp = 0;
+
+#ifdef CLIENT
+	CStrikeView_UpdateGeomset(pl);
+#endif
 }
 
 void
diff --git a/src/shared/w_deagle.qc b/src/shared/w_deagle.qc
index b8e3392..bdb3cf8 100644
--- a/src/shared/w_deagle.qc
+++ b/src/shared/w_deagle.qc
@@ -136,6 +136,7 @@ w_deagle_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 8;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_elites.qc b/src/shared/w_elites.qc
index 1d91205..2248374 100644
--- a/src/shared/w_elites.qc
+++ b/src/shared/w_elites.qc
@@ -159,6 +159,7 @@ w_elites_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 4;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_fiveseven.qc b/src/shared/w_fiveseven.qc
index b5f9097..0edf9e5 100644
--- a/src/shared/w_fiveseven.qc
+++ b/src/shared/w_fiveseven.qc
@@ -103,6 +103,7 @@ w_fiveseven_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 8;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_flashbang.qc b/src/shared/w_flashbang.qc
index 8e01f7c..afdd4de 100644
--- a/src/shared/w_flashbang.qc
+++ b/src/shared/w_flashbang.qc
@@ -94,6 +94,10 @@ w_flashbang_draw(player pl)
 	Weapons_SetModel("models/v_flashbang.mdl");
 	Weapons_ViewAnimation(pl, FLASHBANG_DRAW);
 	pl.mode_temp = 0;
+
+#ifdef CLIENT
+	CStrikeView_UpdateGeomset(pl);
+#endif
 }
 
 #ifdef SERVER
diff --git a/src/shared/w_g3sg1.qc b/src/shared/w_g3sg1.qc
index 5094189..c2e1c58 100644
--- a/src/shared/w_g3sg1.qc
+++ b/src/shared/w_g3sg1.qc
@@ -101,6 +101,7 @@ w_g3sg1_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 6;
 	pl.cs_cross_deltadist = 4;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_glock18.qc b/src/shared/w_glock18.qc
index 54d9c7b..b1fd973 100644
--- a/src/shared/w_glock18.qc
+++ b/src/shared/w_glock18.qc
@@ -122,6 +122,7 @@ w_glock18_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 8;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_hegrenade.qc b/src/shared/w_hegrenade.qc
index 7e1dcde..909671f 100644
--- a/src/shared/w_hegrenade.qc
+++ b/src/shared/w_hegrenade.qc
@@ -94,6 +94,10 @@ w_hegrenade_draw(player pl)
 	Weapons_SetModel("models/v_hegrenade.mdl");
 	Weapons_ViewAnimation(pl, HEGRENADE_DRAW);
 	pl.mode_temp = 0;
+
+#ifdef CLIENT
+	CStrikeView_UpdateGeomset(pl);
+#endif
 }
 
 #ifdef SERVER
diff --git a/src/shared/w_knife.qc b/src/shared/w_knife.qc
index 5a0ab27..c2b363b 100644
--- a/src/shared/w_knife.qc
+++ b/src/shared/w_knife.qc
@@ -82,6 +82,10 @@ w_knife_draw(player pl)
 {
 	Weapons_SetModel("models/v_knife.mdl");
 	Weapons_ViewAnimation(pl, KNIFE_DRAW);
+
+#ifdef CLIENT
+	CStrikeView_UpdateGeomset(pl);
+#endif
 }
 
 void
diff --git a/src/shared/w_m3.qc b/src/shared/w_m3.qc
index 8815687..1de567b 100644
--- a/src/shared/w_m3.qc
+++ b/src/shared/w_m3.qc
@@ -148,6 +148,7 @@ w_m3_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 8;
 	pl.cs_cross_deltadist = 6;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_m4a1.qc b/src/shared/w_m4a1.qc
index 9a31f48..632b099 100644
--- a/src/shared/w_m4a1.qc
+++ b/src/shared/w_m4a1.qc
@@ -119,6 +119,7 @@ w_m4a1_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 4;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_mac10.qc b/src/shared/w_mac10.qc
index 8c347df..71dc2eb 100644
--- a/src/shared/w_mac10.qc
+++ b/src/shared/w_mac10.qc
@@ -103,6 +103,7 @@ w_mac10_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 9;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_mp5.qc b/src/shared/w_mp5.qc
index f79390c..81124a4 100644
--- a/src/shared/w_mp5.qc
+++ b/src/shared/w_mp5.qc
@@ -103,6 +103,7 @@ w_mp5_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 5;
 	pl.cs_cross_deltadist = 2;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_p228.qc b/src/shared/w_p228.qc
index 9b24b42..a52d64b 100644
--- a/src/shared/w_p228.qc
+++ b/src/shared/w_p228.qc
@@ -104,6 +104,7 @@ w_p228_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 8;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_p90.qc b/src/shared/w_p90.qc
index b214596..1d4a362 100644
--- a/src/shared/w_p90.qc
+++ b/src/shared/w_p90.qc
@@ -103,6 +103,7 @@ w_p90_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 7;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_para.qc b/src/shared/w_para.qc
index facb798..1f0ce18 100644
--- a/src/shared/w_para.qc
+++ b/src/shared/w_para.qc
@@ -102,6 +102,7 @@ w_para_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 6;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_scout.qc b/src/shared/w_scout.qc
index 495b3a9..ee5a108 100644
--- a/src/shared/w_scout.qc
+++ b/src/shared/w_scout.qc
@@ -103,6 +103,7 @@ w_scout_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 5;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_sg550.qc b/src/shared/w_sg550.qc
index d3ac2ff..0c41b5a 100644
--- a/src/shared/w_sg550.qc
+++ b/src/shared/w_sg550.qc
@@ -102,6 +102,7 @@ w_sg550_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 5;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_sg552.qc b/src/shared/w_sg552.qc
index 6e6270c..0e046af 100644
--- a/src/shared/w_sg552.qc
+++ b/src/shared/w_sg552.qc
@@ -103,6 +103,7 @@ w_sg552_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 5;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_smokegrenade.qc b/src/shared/w_smokegrenade.qc
index 5efe5ca..6dba00a 100644
--- a/src/shared/w_smokegrenade.qc
+++ b/src/shared/w_smokegrenade.qc
@@ -94,6 +94,10 @@ w_smokegrenade_draw(player pl)
 	Weapons_SetModel("models/v_smokegrenade.mdl");
 	Weapons_ViewAnimation(pl, SMOKEGRENADE_DRAW);
 	pl.mode_temp = 0;
+
+#ifdef CLIENT
+	CStrikeView_UpdateGeomset(pl);
+#endif
 }
 
 #ifdef SERVER
diff --git a/src/shared/w_tmp.qc b/src/shared/w_tmp.qc
index 643d14c..2c1a56a 100644
--- a/src/shared/w_tmp.qc
+++ b/src/shared/w_tmp.qc
@@ -103,6 +103,7 @@ w_tmp_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 7;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_ump45.qc b/src/shared/w_ump45.qc
index cb77074..7713624 100644
--- a/src/shared/w_ump45.qc
+++ b/src/shared/w_ump45.qc
@@ -103,6 +103,7 @@ w_ump45_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 6;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/w_usp45.qc b/src/shared/w_usp45.qc
index 1cc69a7..333575c 100644
--- a/src/shared/w_usp45.qc
+++ b/src/shared/w_usp45.qc
@@ -121,6 +121,7 @@ w_usp45_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 8;
 	pl.cs_cross_deltadist = 3;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
@@ -182,12 +183,7 @@ w_usp45_primary(player pl)
 		Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_ONEHAND, 0.45f);
 
 #ifdef CLIENT
-	if (pl.mode_usp45 == 1) {
-		View_SetMuzzleflash(0);
-	} else {
-		View_SetMuzzleflash(MUZZLE_SMALL);
-	}
-
+	View_SetMuzzleflash(MUZZLE_SMALL);
 	View_AddEvent(w_pistol_ejectshell, 0.0f);
 #else
 	/* Different sounds without silencer */
diff --git a/src/shared/w_xm1014.qc b/src/shared/w_xm1014.qc
index 952397d..04779ca 100644
--- a/src/shared/w_xm1014.qc
+++ b/src/shared/w_xm1014.qc
@@ -147,6 +147,7 @@ w_xm1014_draw(player pl)
 #ifdef CLIENT
 	pl.cs_cross_mindist = 9;
 	pl.cs_cross_deltadist = 4;
+	CStrikeView_UpdateGeomset(pl);
 #endif
 }
 
diff --git a/src/shared/weapons_cstrike.qc b/src/shared/weapons_cstrike.qc
index abbc00c..5f1e4af 100644
--- a/src/shared/weapons_cstrike.qc
+++ b/src/shared/weapons_cstrike.qc
@@ -222,3 +222,15 @@ w_cstrke_switched(player pl)
 {
 	Cstrike_ShotReset(pl);
 }
+
+#ifdef CLIENT
+void
+CStrikeView_UpdateGeomset(player pl)
+{
+	if (getplayerkeyfloat(pl.entnum-1, "*team") == TEAM_CT) {
+		setcustomskin(pSeat->m_eViewModel, "", "geomset 0 2\ngeomset 1 1\n");
+	} else {
+		setcustomskin(pSeat->m_eViewModel, "", "geomset 0 1\ngeomset 1 2\n");
+	}
+}
+#endif