Skip to content

Commit 5445d71

Browse files
committed
Server: Add mp_welcomecam_delay cvar
1 parent b6d9dae commit 5445d71

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/game/server/game.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ cvar_t allowmonsters = { "mp_allowmonsters", "0", FCVAR_SERVER };
5959
cvar_t mp_chattime = { "mp_chattime", "10", FCVAR_SERVER };
6060
cvar_t mp_notify_player_status = { "mp_notify_player_status", "7" }; // Notifications about join/leave/spectate
6161

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

6566
cvar_t motdfile_unicode = { "motdfile_unicode", "motd_unicode.txt", FCVAR_SERVER };
@@ -518,7 +519,6 @@ void GameDLLInit(void)
518519
CVAR_REGISTER(&sv_busters);
519520
CVAR_REGISTER(&mp_notify_player_status);
520521

521-
CVAR_REGISTER(&mp_welcomecam);
522522
CVAR_REGISTER(&mp_respawn_fix);
523523

524524
CVAR_REGISTER(&motdfile_unicode);

src/game/server/game.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ extern cvar_t teamoverride;
4444
extern cvar_t defaultteam;
4545
extern cvar_t allowmonsters;
4646
extern cvar_t mp_notify_player_status;
47-
extern cvar_t mp_welcomecam;
47+
extern ConVar mp_welcomecam;
48+
extern ConVar mp_welcomecam_delay;
4849
extern cvar_t mp_respawn_fix;
4950

5051
extern cvar_t mp_dmg_crowbar;

src/game/server/multiplay_gamerules.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,11 +603,11 @@ void CHalfLifeMultiplay ::PlayerSpawn(CBasePlayer *pPlayer)
603603
CBaseEntity *pWeaponEntity = NULL;
604604

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

612612
pPlayer->StartWelcomeCam();
613613
return;

0 commit comments

Comments
 (0)