Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.
This commit is contained in:
parent
4b604328d5
commit
45af6d8899
|
@ -8913,7 +8913,7 @@ static const char *const GAMETYPERULE_LIST[] = {
|
||||||
"HIDEFROZEN",
|
"HIDEFROZEN",
|
||||||
"BLINDFOLDED",
|
"BLINDFOLDED",
|
||||||
"FIRSTPERSON",
|
"FIRSTPERSON",
|
||||||
"MATCHEMERALDS",
|
"POWERSTONES",
|
||||||
"TEAMFLAGS",
|
"TEAMFLAGS",
|
||||||
"PITYSHIELD",
|
"PITYSHIELD",
|
||||||
"DEATHPENALTY",
|
"DEATHPENALTY",
|
||||||
|
|
|
@ -408,7 +408,7 @@ enum GameTypeRules
|
||||||
GTR_HIDEFROZEN = 1<<11, // Frozen after hide time (Hide and Seek, but not Tag)
|
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_BLINDFOLDED = 1<<12, // Blindfolded view (Tag and Hide and Seek)
|
||||||
GTR_FIRSTPERSON = 1<<13, // First person camera
|
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_TEAMFLAGS = 1<<15, // Gametype has team flags (CTF)
|
||||||
GTR_PITYSHIELD = 1<<16, // Award pity shield
|
GTR_PITYSHIELD = 1<<16, // Award pity shield
|
||||||
GTR_DEATHPENALTY = 1<<17, // Death score penalty
|
GTR_DEATHPENALTY = 1<<17, // Death score penalty
|
||||||
|
|
|
@ -3200,7 +3200,7 @@ UINT32 gametypedefaultrules[NUMGAMETYPES] =
|
||||||
GTR_RACE|GTR_SPAWNENEMIES|GTR_SPAWNINVUL|GTR_ALLOWEXIT,
|
GTR_RACE|GTR_SPAWNENEMIES|GTR_SPAWNINVUL|GTR_ALLOWEXIT,
|
||||||
|
|
||||||
// Match
|
// 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
|
// Team Match
|
||||||
GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_TEAMS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY|GTR_PITYSHIELD,
|
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,
|
GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_STARTCOUNTDOWN|GTR_BLINDFOLDED|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY,
|
||||||
|
|
||||||
// CTF
|
// 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,
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -3205,7 +3205,7 @@ static void P_KillPlayer(player_t *player, mobj_t *source, INT32 damage)
|
||||||
{
|
{
|
||||||
if ((gametyperules & GTR_RINGSLINGER) && !(gametyperules & GTR_TAG))
|
if ((gametyperules & GTR_RINGSLINGER) && !(gametyperules & GTR_TAG))
|
||||||
P_PlayerRingBurst(player, player->rings);
|
P_PlayerRingBurst(player, player->rings);
|
||||||
if (gametyperules & GTR_MATCHEMERALDS)
|
if (gametyperules & GTR_POWERSTONES)
|
||||||
P_PlayerEmeraldBurst(player, false);
|
P_PlayerEmeraldBurst(player, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11893,7 +11893,7 @@ static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i)
|
||||||
if (!cv_powerstones.value)
|
if (!cv_powerstones.value)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (!(gametyperules & GTR_MATCHEMERALDS))
|
if (!(gametyperules & GTR_POWERSTONES))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
runemeraldmanager = true;
|
runemeraldmanager = true;
|
||||||
|
|
Loading…
Reference in a new issue