From 203f4c50a0516f26f2eac8e61be9340558c31c6e Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Fri, 27 Dec 2019 12:28:00 -0300
Subject: [PATCH] add G_CompetitionGametype(void)

---
 src/g_game.c  | 10 ++++++++++
 src/g_game.h  |  1 +
 src/p_setup.c |  2 +-
 src/p_user.c  |  2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 3ba3ab40f..28de6693f 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3492,6 +3492,16 @@ boolean G_TagGametype(void)
 	return (gametyperules & GTR_TAG);
 }
 
+//
+// G_CompetitionGametype
+//
+// For gametypes that are race gametypes, and have lives.
+//
+boolean G_CompetitionGametype(void)
+{
+	return ((gametyperules & GTR_RACE) && (gametyperules & GTR_LIVES));
+}
+
 /** Get the typeoflevel flag needed to indicate support of a gametype.
   * In single-player, this always returns TOL_SP.
   * \param gametype The gametype for which support is desired.
diff --git a/src/g_game.h b/src/g_game.h
index 238dd1964..6916bba6e 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -223,6 +223,7 @@ boolean G_GametypeHasSpectators(void);
 boolean G_RingSlingerGametype(void);
 boolean G_PlatformGametype(void);
 boolean G_TagGametype(void);
+boolean G_CompetitionGametype(void);
 boolean G_EnoughPlayersFinished(void);
 void G_ExitLevel(void);
 void G_NextLevel(void);
diff --git a/src/p_setup.c b/src/p_setup.c
index 5fc740191..3f49a1680 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2159,7 +2159,7 @@ static void P_LevelInitStuff(void)
 	{
 		G_PlayerReborn(i, true);
 
-		if (canresetlives && (netgame || multiplayer) && playeringame[i] && (gametype == GT_COMPETITION || players[i].lives <= 0))
+		if (canresetlives && (netgame || multiplayer) && playeringame[i] && (G_CompetitionGametype() || players[i].lives <= 0))
 		{
 			// In Co-Op, replenish a user's lives if they are depleted.
 			players[i].lives = cv_startinglives.value;
diff --git a/src/p_user.c b/src/p_user.c
index e9c32813a..ff6ffc677 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -9491,7 +9491,7 @@ static void P_DeathThink(player_t *player)
 		INT32 i, deadtimercheck = INT32_MAX;
 
 		// In a net/multiplayer game, and out of lives
-		if (gametype == GT_COMPETITION)
+		if (G_CompetitionGametype())
 		{
 			for (i = 0; i < MAXPLAYERS; i++)
 			{