Add weapon hiding

Author: xen-000

cfg/cs2fixes/cs2fixes.cfg

@@ -55,6 +55,7 @@ cs2f_burn_slowdown				0.6		// The slowdown of each burn damage tick as a multipl
 cs2f_burn_interval				0.3		// The interval between burn damage ticks
 
 // Hide settings
+cs2f_hide_weapons				0		// Whether to hide weapons along with their holders
 cs2f_hide_distance_default 		250		// The default distance for hide
 cs2f_hide_distance_max 			2000	// The max distance for hide
 cs2f_hide_teammates_only		0		// Whether to hide teammates only

src/commands.cpp

@@ -431,6 +431,7 @@ CON_COMMAND_CHAT(noshake, "- toggle noshake")
 }
 
 CConVar<bool> g_cvarEnableHide("cs2f_hide_enable", FCVAR_NONE, "Whether to enable hide (WARNING: randomly crashes clients since 2023-12-13 CS2 update)", false);
+CConVar<bool> g_cvarHideWeapons("cs2f_hide_weapons", FCVAR_NONE, "Whether to hide weapons along with their holders", false);
 CConVar<int> g_cvarDefaultHideDistance("cs2f_hide_distance_default", FCVAR_NONE, "The default distance for hide", 250, true, 0, false, 0);
 CConVar<int> g_cvarMaxHideDistance("cs2f_hide_distance_max", FCVAR_NONE, "The max distance for hide", 2000, true, 0, false, 0);
 

src/commands.h

@@ -33,6 +33,7 @@ extern CConVar<bool> g_cvarEnableStopSound;
 extern CConVar<bool> g_cvarEnableNoShake;
 extern CConVar<float> g_cvarMaxShakeAmp;
 extern CConVar<bool> g_cvarEnableHide;
+extern CConVar<bool> g_cvarHideWeapons;
 
 #define CMDFLAG_NONE (0)
 #define CMDFLAG_NOHELP (1 << 0) // Don't show in !help menu

src/cs2fixes.cpp

@@ -1052,7 +1052,22 @@ void CS2Fixes::Hook_CheckTransmit(CCheckTransmitInfo** ppInfoList, int infoCount
 			// Do not hide leaders or item holders to other players
 			ZEPlayer* pOtherZEPlayer = g_playerManager->GetPlayer(j);
 			if (pSelfZEPlayer->ShouldBlockTransmit(j) && pOtherZEPlayer && !pOtherZEPlayer->IsLeader() && g_pEWHandler->FindItemInstanceByOwner(j, false, 0) == -1)
+			{
 				pInfo->m_pTransmitEntity->Clear(pPawn->entindex());
+
+				if (g_cvarHideWeapons.Get())
+				{
+					auto pVecWeapons = pPawn->m_pWeaponServices->m_hMyWeapons();
+
+					FOR_EACH_VEC(*pVecWeapons, i)
+					{
+						auto pWeapon = (*pVecWeapons)[i].Get();
+
+						if (pWeapon)
+							pInfo->m_pTransmitEntity->Clear(pWeapon->entindex());
+					}
+				}
+			}
 		}
 
 		// Don't transmit glow model to it's owner