Merge pull request #269 from tmp64/feature/respawn-delay

Server: Add mp_respawn_delay cvar

Author: tmp64

src/game/server/game.cpp

@@ -61,7 +61,8 @@ cvar_t mp_notify_player_status = { "mp_notify_player_status", "7" }; // Notifica
 
 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 };
+ConVar mp_respawn_fix("mp_respawn_fix", "1", 0, "Fix inconsistent respawn times and standing corpses");
+ConVar mp_respawn_delay("mp_respawn_delay", "1.5", 0, "Time until palyers can respawn after death. Requires mp_respawn_fix 1.");
 
 cvar_t motdfile_unicode = { "motdfile_unicode", "motd_unicode.txt", FCVAR_SERVER };
 cvar_t motdfile_html = { "motdfile_html", "motd.html", FCVAR_SERVER };
@@ -523,8 +524,6 @@ void GameDLLInit(void)
 	CVAR_REGISTER(&sv_busters);
 	CVAR_REGISTER(&mp_notify_player_status);
 
-	CVAR_REGISTER(&mp_respawn_fix);
-
 	CVAR_REGISTER(&motdfile_unicode);
 	CVAR_REGISTER(&motdfile_html);
 

src/game/server/game.h

@@ -46,7 +46,8 @@ extern cvar_t allowmonsters;
 extern cvar_t mp_notify_player_status;
 extern ConVar mp_welcomecam;
 extern ConVar mp_welcomecam_delay;
-extern cvar_t mp_respawn_fix;
+extern ConVar mp_respawn_fix;
+extern ConVar mp_respawn_delay;
 extern ConVar mp_wallgauss;
 extern ConVar mp_rpg_fix;
 extern ConVar mp_blastradius;

src/game/server/player.cpp

@@ -1406,18 +1406,24 @@ void CBasePlayer::PlayerDeathThink(void)
 	pev->angles.x = 0;
 
 	if (pev->modelindex && (!m_fSequenceFinished) && (pev->deadflag == DEAD_DYING))
-		StudioFrameAdvance();
-
-	if (mp_respawn_fix.value <= 0)
 	{
+		StudioFrameAdvance();
 		m_flRespawnTimer += gpGlobals->frametime;
-		if (m_flRespawnTimer < 4.0f) // 120 frames at 30fps -- animations should be no longer than this
-			return;
+
+		if (!mp_respawn_fix.GetBool())
+		{
+			// HL25 behavior: wait until animation ends.
+			// If animation is longer than 4 seconds, assume it finished.
+			if (m_flRespawnTimer < 4.0f)
+				return;
+		}
 	}
-	else
+
+	if (mp_respawn_fix.GetBool())
 	{
+		// BHL behavior: wait for fixed time
 		// time given to animate corpse and don't allow to respawn till this time ends
-		if (gpGlobals->time < m_flDeathAnimationStartTime + 1.5)
+		if (gpGlobals->time < m_flDeathAnimationStartTime + mp_respawn_delay.GetFloat())
 			return;
 	}