Merge pull request #268 from tmp64/feature/welcome-cam-delay

Server: Add mp_welcomecam_delay cvar

Author: tmp64

src/game/server/game.cpp

@@ -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 };
@@ -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);

src/game/server/game.h

@@ -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;

src/game/server/multiplay_gamerules.cpp

@@ -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;