Remove GTR_PLATFORM
This commit is contained in:
parent
768080977f
commit
6d7262e985
|
@ -8857,7 +8857,7 @@ static const char *const PLAYERFLAG_LIST[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char *const GAMETYPERULE_LIST[] = {
|
static const char *const GAMETYPERULE_LIST[] = {
|
||||||
"PLATFORM",
|
"\x01",
|
||||||
"TAG",
|
"TAG",
|
||||||
"RINGSLINGER",
|
"RINGSLINGER",
|
||||||
"SPECTATORS",
|
"SPECTATORS",
|
||||||
|
|
|
@ -389,7 +389,7 @@ enum GameType
|
||||||
// Game type rules
|
// Game type rules
|
||||||
enum GameTypeRules
|
enum GameTypeRules
|
||||||
{
|
{
|
||||||
GTR_PLATFORM = 1, // Co-op, Competition, and Race
|
GTR_SORRYNOTHING = 1,
|
||||||
GTR_TAG = 1<<1, // Tag and Hide and Seek
|
GTR_TAG = 1<<1, // Tag and Hide and Seek
|
||||||
GTR_RINGSLINGER = 1<<2, // Not Co-op, not Competition, and not Race (overriden by cv_ringslinger)
|
GTR_RINGSLINGER = 1<<2, // Not Co-op, not Competition, and not Race (overriden by cv_ringslinger)
|
||||||
GTR_SPECTATORS = 1<<3, // Not Co-op, not Competition, and not Race
|
GTR_SPECTATORS = 1<<3, // Not Co-op, not Competition, and not Race
|
||||||
|
|
|
@ -3088,11 +3088,11 @@ const char *Gametype_ConstantNames[NUMGAMETYPES] =
|
||||||
UINT32 gametypedefaultrules[NUMGAMETYPES] =
|
UINT32 gametypedefaultrules[NUMGAMETYPES] =
|
||||||
{
|
{
|
||||||
// Co-op
|
// Co-op
|
||||||
GTR_PLATFORM|GTR_CAMPAIGN|GTR_LIVES|GTR_CHASECAM|GTR_EMERALDHUNT|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_EMERALDTOKENS|GTR_SPECIALSTAGES,
|
GTR_CAMPAIGN|GTR_LIVES|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_EMERALDHUNT|GTR_EMERALDTOKENS|GTR_SPECIALSTAGES,
|
||||||
// Competition
|
// Competition
|
||||||
GTR_PLATFORM|GTR_NOGAMEEND|GTR_LIVES|GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_EMERALDTOKENS,
|
GTR_RACE|GTR_LIVES|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_EMERALDTOKENS|GTR_ALLOWEXIT|GTR_NOGAMEEND,
|
||||||
// Race
|
// Race
|
||||||
GTR_PLATFORM|GTR_NOGAMEEND|GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT,
|
GTR_RACE|GTR_CHASECAM|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_NOGAMEEND,
|
||||||
|
|
||||||
// Match
|
// Match
|
||||||
GTR_RINGSLINGER|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_EMERALDS|GTR_PITYSHIELD|GTR_DEATHPENALTY,
|
GTR_RINGSLINGER|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_EMERALDS|GTR_PITYSHIELD|GTR_DEATHPENALTY,
|
||||||
|
@ -3378,8 +3378,7 @@ boolean G_RingSlingerGametype(void)
|
||||||
//
|
//
|
||||||
boolean G_PlatformGametype(void)
|
boolean G_PlatformGametype(void)
|
||||||
{
|
{
|
||||||
return (gametyperules & GTR_PLATFORM);
|
return (!G_RingSlingerGametype());
|
||||||
//return (gametype == GT_COOP || gametype == GT_RACE || gametype == GT_COMPETITION);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in a new issue