From 45af6d889906401067abe72fc73ae338934995ab Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sat, 28 Dec 2019 19:49:34 -0300
Subject: [PATCH] Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.

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

diff --git a/src/dehacked.c b/src/dehacked.c
index 5023f55ee..3c7fe25aa 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -8913,7 +8913,7 @@ static const char *const GAMETYPERULE_LIST[] = {
 	"HIDEFROZEN",
 	"BLINDFOLDED",
 	"FIRSTPERSON",
-	"MATCHEMERALDS",
+	"POWERSTONES",
 	"TEAMFLAGS",
 	"PITYSHIELD",
 	"DEATHPENALTY",
diff --git a/src/doomstat.h b/src/doomstat.h
index faedf48d5..8046b5ed9 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -408,7 +408,7 @@ enum GameTypeRules
 	GTR_HIDEFROZEN       = 1<<11, // Frozen after hide time (Hide and Seek, but not Tag)
 	GTR_BLINDFOLDED      = 1<<12, // Blindfolded view (Tag and Hide and Seek)
 	GTR_FIRSTPERSON      = 1<<13, // First person camera
-	GTR_MATCHEMERALDS    = 1<<14, // Ringslinger emeralds (Match and CTF)
+	GTR_POWERSTONES      = 1<<14, // Power stones (Match and CTF)
 	GTR_TEAMFLAGS        = 1<<15, // Gametype has team flags (CTF)
 	GTR_PITYSHIELD       = 1<<16, // Award pity shield
 	GTR_DEATHPENALTY     = 1<<17, // Death score penalty
diff --git a/src/g_game.c b/src/g_game.c
index 4adc0d604..c8e185f56 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3200,7 +3200,7 @@ UINT32 gametypedefaultrules[NUMGAMETYPES] =
 	GTR_RACE|GTR_SPAWNENEMIES|GTR_SPAWNINVUL|GTR_ALLOWEXIT,
 
 	// Match
-	GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_MATCHEMERALDS|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY|GTR_PITYSHIELD|GTR_DEATHPENALTY,
+	GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_POWERSTONES|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY|GTR_PITYSHIELD|GTR_DEATHPENALTY,
 	// Team Match
 	GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_TEAMS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY|GTR_PITYSHIELD,
 
@@ -3210,7 +3210,7 @@ UINT32 gametypedefaultrules[NUMGAMETYPES] =
 	GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_STARTCOUNTDOWN|GTR_BLINDFOLDED|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY,
 
 	// CTF
-	GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_TEAMS|GTR_TEAMFLAGS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_MATCHEMERALDS|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY|GTR_PITYSHIELD,
+	GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_TEAMS|GTR_TEAMFLAGS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_POWERSTONES|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY|GTR_PITYSHIELD,
 };
 
 //
diff --git a/src/p_inter.c b/src/p_inter.c
index 87b0c0a43..2bbfafdb7 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -3205,7 +3205,7 @@ static void P_KillPlayer(player_t *player, mobj_t *source, INT32 damage)
 	{
 		if ((gametyperules & GTR_RINGSLINGER) && !(gametyperules & GTR_TAG))
 			P_PlayerRingBurst(player, player->rings);
-		if (gametyperules & GTR_MATCHEMERALDS)
+		if (gametyperules & GTR_POWERSTONES)
 			P_PlayerEmeraldBurst(player, false);
 	}
 
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 75bc174a5..b6ec5df83 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11893,7 +11893,7 @@ static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i)
 		if (!cv_powerstones.value)
 			return false;
 
-		if (!(gametyperules & GTR_MATCHEMERALDS))
+		if (!(gametyperules & GTR_POWERSTONES))
 			return false;
 
 		runemeraldmanager = true;