Skip to content

Server: Add mp_welcomecam_delay cvar #268

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
merged 1 commit into from
Feb 16, 2025
Merged

Server: Add mp_welcomecam_delay cvar #268

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
4 changes: 2 additions & 2 deletions src/game/server/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ cvar_t allowmonsters = { "mp_allowmonsters", "0", FCVAR_SERVER };
cvar_t mp_chattime = { "mp_chattime", "10", FCVAR_SERVER };
cvar_t mp_notify_player_status = { "mp_notify_player_status", "7" }; // Notifications about join/leave/spectate

cvar_t mp_welcomecam = { "mp_welcomecam", "1", FCVAR_SERVER };
ConVar mp_welcomecam("mp_welcomecam", "1", 0, "Don't spawn players immediately on join");
ConVar mp_welcomecam_delay("mp_welcomecam_delay", "0.2", 0, "Delay before the player can leave welcome cam");
cvar_t mp_respawn_fix = { "mp_respawn_fix", "1", FCVAR_SERVER };

cvar_t motdfile_unicode = { "motdfile_unicode", "motd_unicode.txt", FCVAR_SERVER };
Expand Down Expand Up @@ -518,7 +519,6 @@ void GameDLLInit(void)
CVAR_REGISTER(&sv_busters);
CVAR_REGISTER(&mp_notify_player_status);

CVAR_REGISTER(&mp_welcomecam);
CVAR_REGISTER(&mp_respawn_fix);

CVAR_REGISTER(&motdfile_unicode);
Expand Down
3 changes: 2 additions & 1 deletion src/game/server/game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ extern cvar_t teamoverride;
extern cvar_t defaultteam;
extern cvar_t allowmonsters;
extern cvar_t mp_notify_player_status;
extern cvar_t mp_welcomecam;
extern ConVar mp_welcomecam;
extern ConVar mp_welcomecam_delay;
extern cvar_t mp_respawn_fix;

extern cvar_t mp_dmg_crowbar;
Expand Down
4 changes: 2 additions & 2 deletions src/game/server/multiplay_gamerules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,11 +603,11 @@ void CHalfLifeMultiplay ::PlayerSpawn(CBasePlayer *pPlayer)
CBaseEntity *pWeaponEntity = NULL;

// Start welcome cam for new players
if (!pPlayer->m_bPutInServer && mp_welcomecam.value != 0)
if (!pPlayer->m_bPutInServer && mp_welcomecam.GetBool() != 0)
{
// don't let him spawn as soon as he enters the server
// give enough time to plugins to send the player to spectator mode
pPlayer->m_flNextAttack = 0.2;
pPlayer->m_flNextAttack = mp_welcomecam_delay.GetFloat();

pPlayer->StartWelcomeCam();
return;
Expand Down
Loading