New flag SF_PLAYEREQUIP_REMOVEWEAPONS

Vaqtincha · Apr 29, 2021 · 15e5c4b · 15e5c4b
1 parent bfe67e1
commit 15e5c4b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/regamedll/dlls/maprules.cpp b/regamedll/dlls/maprules.cpp
@@ -580,6 +580,12 @@ void CGamePlayerEquip::EquipPlayer(CBaseEntity *pEntity)
 		return;
 
 	CBasePlayer *pPlayer = static_cast<CBasePlayer *>(pEntity);
+
+	if (RemoveWeapons())
+	{
+		pPlayer->RemoveAllItems(FALSE);
+	}
+
 	for (int i = 0; i < MAX_EQUIP; i++)
 	{
 		if (FStringNull(m_weaponNames[i]))

diff --git a/regamedll/dlls/maprules.h b/regamedll/dlls/maprules.h
@@ -245,6 +245,7 @@ class CGameCounterSet: public CRulePointEntity
 #define MAX_EQUIP 32
 #define SF_PLAYEREQUIP_USEONLY BIT(0) // If set, the game_player_equip entity will not equip respawning players,
                                       // but only react to direct triggering, equipping its activator. This makes its master obsolete.
+#define SF_PLAYEREQUIP_REMOVEWEAPONS BIT(1) // Remove all weapons before give.
 
 // Sets the default player equipment
 class CGamePlayerEquip: public CRulePointEntity
@@ -256,6 +257,7 @@ class CGamePlayerEquip: public CRulePointEntity
 
 public:
 	bool UseOnly() const { return (pev->spawnflags & SF_PLAYEREQUIP_USEONLY) == SF_PLAYEREQUIP_USEONLY; }
+	bool RemoveWeapons() const { return (pev->spawnflags & SF_PLAYEREQUIP_REMOVEWEAPONS) == SF_PLAYEREQUIP_REMOVEWEAPONS; }
 
 private:
 	void EquipPlayer(CBaseEntity *pPlayer);