remove weapons and gibs after some time on maps with respawns enabled

src/game/server/neo/neo_player.cpp

@@ -2046,13 +2046,13 @@ void CNEO_Player::SetDeadModel(const CTakeDamageInfo& info)
 	{
 		for (int i = 0; i < NEO_GIB_LIMB__ENUM_COUNT; i++)
 		{
-			CGib::SpawnSpecificGibs(this, 1, 10, 1000, modelManager->GetGibModel((NeoSkin)GetSkin(), (NeoClass)GetClass(), GetTeamNumber(), NeoGibLimb(i)));
+			SpawnSpecificGibs(10, 1000, modelManager->GetGibModel((NeoSkin)GetSkin(), (NeoClass)GetClass(), GetTeamNumber(), NeoGibLimb(i)));
 		}
 		UTIL_BloodSpray(info.GetDamagePosition(), info.GetDamageForce(), BLOOD_COLOR_RED, 10, FX_BLOODSPRAY_ALL);
 	}
 	else
 	{
-		CGib::SpawnSpecificGibs(this, 1, 10, 1000, modelManager->GetGibModel((NeoSkin)GetSkin(), (NeoClass)GetClass(), GetTeamNumber(), NeoGibLimb(deadModelType-1)));
+		SpawnSpecificGibs(10, 1000, modelManager->GetGibModel((NeoSkin)GetSkin(), (NeoClass)GetClass(), GetTeamNumber(), NeoGibLimb(deadModelType - 1)));
 		UTIL_BloodSpray(info.GetDamagePosition(), info.GetDamageForce(), BLOOD_COLOR_RED, 10, FX_BLOODSPRAY_GORE | FX_BLOODSPRAY_DROPS);
 	}
 	SetPlayerCorpseModel(deadModelType);
@@ -2082,6 +2082,25 @@ void CNEO_Player::SetPlayerCorpseModel(int type)
 	}
 }
 
+void CNEO_Player::SpawnSpecificGibs(float vMinVelocity, float vMaxVelocity, const char* cModelName)
+{
+	CGib* pGib = CREATE_ENTITY(CGib, "gib");
+
+	if (NEORules()->CanRespawnAnyTime())
+	{
+		constexpr float GIB_LIFETIME = 30.f;
+		pGib->Spawn(cModelName, GIB_LIFETIME);
+	}
+	else
+	{
+		pGib->Spawn(cModelName);
+	}
+
+	pGib->m_nBody = 0;
+	pGib->InitGib(this, vMinVelocity, vMaxVelocity);
+	pGib->SetOwnerEntity(this);
+}
+
 float CNEO_Player::GetReceivedDamageScale(CBaseEntity* pAttacker)
 {
 	if ((NEORules()->GetGameType() == NEO_GAME_TYPE_TDM || NEORules()->GetGameType() == NEO_GAME_TYPE_DM)

src/game/server/neo/neo_player.h

@@ -115,6 +115,7 @@ class CNEO_Player : public CHL2MP_Player
 	void SetPlayerTeamModel(void);
 	void SetDeadModel(const CTakeDamageInfo& info);
 	void SetPlayerCorpseModel(int type);
+	void SpawnSpecificGibs(float vMinVelocity, float vMaxVelocity, const char* cModelName);
 	virtual void PickDefaultSpawnTeam(void) OVERRIDE;
 
 	virtual bool StartObserverMode(int mode) OVERRIDE;

src/game/shared/neo/neo_gamerules.cpp

@@ -4060,12 +4060,12 @@ inline const char* CNEORules::GetGameTypeName(void)
 	return NEO_GAME_TYPE_SETTINGS[GetGameType()].gameTypeName;
 }
 
-inline const bool CNEORules::CanChangeTeamClassLoadoutWhenAlive()
+bool CNEORules::CanChangeTeamClassLoadoutWhenAlive()
 {
 	return NEO_GAME_TYPE_SETTINGS[GetGameType()].changeTeamClassLoadoutWhenAlive;
 }
 
-inline const bool CNEORules::CanRespawnAnyTime()
+bool CNEORules::CanRespawnAnyTime()
 {
 	return NEO_GAME_TYPE_SETTINGS[GetGameType()].respawns;
 }

src/game/shared/neo/neo_gamerules.h

@@ -198,8 +198,8 @@ class CNEORules : public CHL2MPRules, public CGameEventListener
 	int GetForcedSkin();
 	int GetForcedWeapon();
 	virtual const char* GetGameTypeName(void) OVERRIDE;
-	virtual const bool CanChangeTeamClassLoadoutWhenAlive();
-	virtual const bool CanRespawnAnyTime();
+	bool CanChangeTeamClassLoadoutWhenAlive();
+	bool CanRespawnAnyTime();
 
 	void GetDMHighestScorers(
 #ifdef GAME_DLL

src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp

@@ -21,6 +21,7 @@ extern ConVar weaponstay;
 #include "c_neo_player.h"
 #else
 #include "items.h"
+#include "neo_gamerules.h"
 #endif // CLIENT_DLL
 
 #include "basecombatweapon_shared.h"
@@ -1276,8 +1277,8 @@ void CNEOBaseCombatWeapon::SetPickupTouch(void)
 		return;
 	}
 
-	if (!weaponstay.GetBool())
-	{
+	if (!weaponstay.GetBool() || NEORules()->CanRespawnAnyTime())
+	{ // regardless of the value of mp_weaponstay, disappear weapons in game modes with respawns enabled. Otherwise things can get too chaotic
 		BaseClass::SetPickupTouch();
 		return;
 	}