Skip to content

Server: Add mp_weapondrop_type cvar #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmp64 merged 1 commit into from
Aug 10, 2025
Merged

Server: Add mp_weapondrop_type cvar #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/game/server/gamerules.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@ enum
GR_PLR_DROP_AMMO_NO,
};

// additional enum for flag check
enum
{
FLAG_GR_DROP_DEFAULT,
FLAG_GR_DROP_GUN_ALL = 1 << 0,
FLAG_GR_DROP_GUN_ACTIVE = 1 << 1,
FLAG_GR_DROP_GUN_NO = 1 << 2,
FLAG_GR_DROP_AMMO_ALL = 1 << 3,
FLAG_GR_DROP_AMMO_ACTIVE = 1 << 4,
FLAG_GR_DROP_AMMO_NO = 1 << 5
};

// Player relationship return codes
enum
{
Expand Down
28 changes: 28 additions & 0 deletions src/game/server/multiplay_gamerules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@

#include <CBugfixedServer.h>

ConVar mp_weapondrop_type("mp_weapondrop_type", "0", 0, "Sets drop behavior for weapons/ammo after death\n"
" 0 - default behavior\n"
" +1 - gun: drop all\n"
" +2 - gun: drop active only\n"
" +4 - gun: drop none\n"
" +8 - ammo: drop all\n"
" +16 - ammo: drop active only\n"
" +32 - ammo: drop none\n"
" Flags can be combined (sum values).");

extern DLL_GLOBAL CGameRules *g_pGameRules;
extern DLL_GLOBAL BOOL g_fGameOver;
extern int gmsgDeathMsg; // client dll messages
Expand Down Expand Up @@ -1135,13 +1145,31 @@ float CHalfLifeMultiplay::FlHEVChargerRechargeTime(void)
//=========================================================
int CHalfLifeMultiplay::DeadPlayerWeapons(CBasePlayer *pPlayer)
{
int flags = mp_weapondrop_type.GetInt();

if (flags & FLAG_GR_DROP_GUN_ALL)
return GR_PLR_DROP_GUN_ALL;
else if (flags & FLAG_GR_DROP_GUN_ACTIVE)
return GR_PLR_DROP_GUN_ACTIVE;
else if (flags & FLAG_GR_DROP_GUN_NO)
return GR_PLR_DROP_GUN_NO;

return GR_PLR_DROP_GUN_ACTIVE;
}

//=========================================================
//=========================================================
int CHalfLifeMultiplay::DeadPlayerAmmo(CBasePlayer *pPlayer)
{
int flags = mp_weapondrop_type.GetInt();

if (flags & FLAG_GR_DROP_AMMO_ALL)
return GR_PLR_DROP_AMMO_ALL;
else if (flags & FLAG_GR_DROP_AMMO_ACTIVE)
return GR_PLR_DROP_AMMO_ACTIVE;
else if (flags & FLAG_GR_DROP_AMMO_NO)
return GR_PLR_DROP_AMMO_NO;

return GR_PLR_DROP_AMMO_ACTIVE;
}

Expand Down
Loading