From d3d91726f54184969a69463b8fedf70417224af5 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Wed, 18 Dec 2019 14:57:42 -0300
Subject: [PATCH] GTR_EMERALDHUNT and GTR_SPAWNENEMIES

---
 src/dehacked.c | 2 ++
 src/doomstat.h | 2 ++
 src/g_game.c   | 9 ++++-----
 src/g_game.h   | 2 +-
 src/p_mobj.c   | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index b316fb40e..7e584cbf8 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -8805,6 +8805,8 @@ static const char *const GAMETYPERULE_LIST[] = {
 	"PITYSHIELD",
 	"DEATHPENALTY",
 	"NOSPECTATORSPAWN",
+	"EMERALDHUNT",
+	"SPAWNENEMIES",
 	NULL
 };
 
diff --git a/src/doomstat.h b/src/doomstat.h
index 7d6839e52..a1c347b62 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -411,6 +411,8 @@ enum GameTypeRules
 	GTR_PITYSHIELD       = 1<<14, // Award pity shield
 	GTR_DEATHPENALTY     = 1<<15, // Death score penalty
 	GTR_NOSPECTATORSPAWN = 1<<16, // For use with GTR_SPECTATORS - spawn in the map instead of with the spectators
+	GTR_EMERALDHUNT      = 1<<17, // Emerald Hunt
+	GTR_SPAWNENEMIES     = 1<<18, // Spawn enemies
 };
 
 // String names for gametypes
diff --git a/src/g_game.c b/src/g_game.c
index 07a6034bb..1974c271f 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3075,14 +3075,14 @@ const char *Gametype_ConstantNames[NUMGAMETYPES] =
 };
 
 // Game type rules
-INT16 gametypedefaultrules[NUMGAMETYPES] =
+UINT32 gametypedefaultrules[NUMGAMETYPES] =
 {
 	// Co-op
-	GTR_PLATFORM|GTR_LIVES|GTR_CHASECAM,
+	GTR_PLATFORM|GTR_LIVES|GTR_CHASECAM|GTR_EMERALDHUNT|GTR_SPAWNENEMIES,
 	// Competition
-	GTR_PLATFORM|GTR_LIVES|GTR_RACE|GTR_CHASECAM,
+	GTR_PLATFORM|GTR_LIVES|GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES,
 	// Race
-	GTR_PLATFORM|GTR_RACE|GTR_CHASECAM,
+	GTR_PLATFORM|GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES,
 
 	// Match
 	GTR_RINGSLINGER|GTR_SPECTATORS|GTR_TIMELIMIT|GTR_EMERALDS|GTR_PITYSHIELD|GTR_DEATHPENALTY,
@@ -3116,7 +3116,6 @@ void G_SetGametype(INT16 gtype)
 //
 INT16 G_AddGametype(UINT32 rules)
 {
-	INT32 i;
 	INT16 newgtype = gametypecount;
 	gametypecount++;
 
diff --git a/src/g_game.h b/src/g_game.h
index e2eea52c1..81998b6e6 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -201,7 +201,7 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill);
 void G_StopDemo(void);
 boolean G_CheckDemoStatus(void);
 
-extern INT16 gametypedefaultrules[NUMGAMETYPES];
+extern UINT32 gametypedefaultrules[NUMGAMETYPES];
 extern UINT32 gametypetol[NUMGAMETYPES];
 
 void G_SetGametype(INT16 gametype);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 193746db8..1913ef91f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11682,7 +11682,7 @@ You should think about modifying the deathmatch starts to take full advantage of
 	if (i == MT_EMERHUNT)
 	{
 		// Emerald Hunt is Coop only.
-		if (gametype != GT_COOP)
+		if (!(gametyperules & GTR_EMERALDHUNT))
 			return;
 
 		ss = R_PointInSubsector(mthing->x << FRACBITS, mthing->y << FRACBITS);
@@ -11708,7 +11708,7 @@ You should think about modifying the deathmatch starts to take full advantage of
 		runemeraldmanager = true;
 	}
 
-	if (!G_PlatformGametype()) // No enemies in match or CTF modes
+	if (!(gametyperules & GTR_SPAWNENEMIES)) // No enemies in match or CTF modes
 		if ((mobjinfo[i].flags & MF_ENEMY) || (mobjinfo[i].flags & MF_BOSS))
 			return;