lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Organise gametype ruleset again.

Browse source
This commit is contained in:
Jaime Passos 2019-12-28 20:18:21 -03:00
parent 7a00b3a331
commit ae0acfba0f
2 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/dehacked.c
View file

@ -8902,34 +8902,34 @@ static const char *const GAMETYPERULE_LIST[] = {
"CAMPAIGN", "CAMPAIGN",
"RINGSLINGER", "RINGSLINGER",
"SPECTATORS", "SPECTATORS",
"FRIENDLYFIRE",
"LIVES", "LIVES",
"TEAMS", "TEAMS",
"FIRSTPERSON",
"POWERSTONES",
"TEAMFLAGS",
"FRIENDLY", "FRIENDLY",
"SPECIALSTAGES",
"EMERALDTOKENS",
"EMERALDHUNT",
"RACE", "RACE",
"TAG", "TAG",
"POINTLIMIT", "POINTLIMIT",
"TIMELIMIT", "TIMELIMIT",
"OVERTIME",
"HURTMESSAGES",
"FRIENDLYFIRE",
"STARTCOUNTDOWN", "STARTCOUNTDOWN",
"HIDEFROZEN", "HIDEFROZEN",
"BLINDFOLDED", "BLINDFOLDED",
"FIRSTPERSON", "RESPAWNDELAY",
"POWERSTONES",
"TEAMFLAGS",
"PITYSHIELD", "PITYSHIELD",
"DEATHPENALTY", "DEATHPENALTY",
"NOSPECTATORSPAWN", "NOSPECTATORSPAWN",
"DEATHMATCHSTARTS", "DEATHMATCHSTARTS",
"SPECIALSTAGES", "SPAWNINVUL",
"EMERALDTOKENS",
"EMERALDHUNT",
"SPAWNENEMIES", "SPAWNENEMIES",
"ALLOWEXIT", "ALLOWEXIT",
"NOTITLECARD", "NOTITLECARD",
"OVERTIME",
"HURTMESSAGES",
"SPAWNINVUL",
"RESPAWNDELAY",
NULL NULL
}; };

56
src/doomstat.h
View file

@ -397,34 +397,34 @@ enum GameTypeRules
GTR_CAMPAIGN = 1, // Linear Co-op map progression, don't allow random maps GTR_CAMPAIGN = 1, // Linear Co-op map progression, don't allow random maps
GTR_RINGSLINGER = 1<<1, // Outside of Co-op, Competition, and Race (overriden by cv_ringslinger) GTR_RINGSLINGER = 1<<1, // Outside of Co-op, Competition, and Race (overriden by cv_ringslinger)
GTR_SPECTATORS = 1<<2, // Outside of Co-op, Competition, and Race GTR_SPECTATORS = 1<<2, // Outside of Co-op, Competition, and Race
GTR_FRIENDLYFIRE = 1<<3, // Always allow friendly fire GTR_LIVES = 1<<3, // Co-op and Competition
GTR_LIVES = 1<<4, // Co-op and Competition GTR_TEAMS = 1<<4, // Team Match, CTF
GTR_TEAMS = 1<<5, // Team Match, CTF GTR_FIRSTPERSON = 1<<5, // First person camera
GTR_FRIENDLY = 1<<6, // Co-op GTR_POWERSTONES = 1<<6, // Power stones (Match and CTF)
GTR_RACE = 1<<7, // Race and Competition GTR_TEAMFLAGS = 1<<7, // Gametype has team flags (CTF)
GTR_TAG = 1<<8, // Tag and Hide and Seek GTR_FRIENDLY = 1<<8, // Co-op
GTR_POINTLIMIT = 1<<9, // Ringslinger point limit GTR_SPECIALSTAGES = 1<<9, // Allow special stages
GTR_TIMELIMIT = 1<<10, // Ringslinger time limit GTR_EMERALDTOKENS = 1<<10, // Spawn emerald tokens
GTR_STARTCOUNTDOWN = 1<<11, // Hide time countdown (Tag and Hide and Seek) GTR_EMERALDHUNT = 1<<11, // Emerald Hunt
GTR_HIDEFROZEN = 1<<12, // Frozen after hide time (Hide and Seek, but not Tag) GTR_RACE = 1<<12, // Race and Competition
GTR_BLINDFOLDED = 1<<13, // Blindfolded view (Tag and Hide and Seek) GTR_TAG = 1<<13, // Tag and Hide and Seek
GTR_FIRSTPERSON = 1<<14, // First person camera GTR_POINTLIMIT = 1<<14, // Ringslinger point limit
GTR_POWERSTONES = 1<<15, // Power stones (Match and CTF) GTR_TIMELIMIT = 1<<15, // Ringslinger time limit
GTR_TEAMFLAGS = 1<<16, // Gametype has team flags (CTF) GTR_OVERTIME = 1<<16, // Allow overtime
GTR_PITYSHIELD = 1<<17, // Award pity shield GTR_HURTMESSAGES = 1<<17, // Hit and death messages
GTR_DEATHPENALTY = 1<<18, // Death score penalty GTR_FRIENDLYFIRE = 1<<18, // Always allow friendly fire
GTR_NOSPECTATORSPAWN = 1<<19, // Use with GTR_SPECTATORS, spawn in the map instead of with the spectators GTR_STARTCOUNTDOWN = 1<<19, // Hide time countdown (Tag and Hide and Seek)
GTR_DEATHMATCHSTARTS = 1<<20, // Use deathmatch starts GTR_HIDEFROZEN = 1<<20, // Frozen after hide time (Hide and Seek, but not Tag)
GTR_SPECIALSTAGES = 1<<21, // Allow special stages GTR_BLINDFOLDED = 1<<21, // Blindfolded view (Tag and Hide and Seek)
GTR_EMERALDTOKENS = 1<<22, // Spawn emerald tokens GTR_RESPAWNDELAY = 1<<22, // Respawn delay
GTR_EMERALDHUNT = 1<<23, // Emerald Hunt GTR_PITYSHIELD = 1<<23, // Award pity shield
GTR_SPAWNENEMIES = 1<<24, // Spawn enemies GTR_DEATHPENALTY = 1<<24, // Death score penalty
GTR_ALLOWEXIT = 1<<25, // Allow exit sectors GTR_NOSPECTATORSPAWN = 1<<25, // Use with GTR_SPECTATORS, spawn in the map instead of with the spectators
GTR_NOTITLECARD = 1<<26, // Don't show the title card GTR_DEATHMATCHSTARTS = 1<<26, // Use deathmatch starts
GTR_OVERTIME = 1<<27, // Allow overtime GTR_SPAWNINVUL = 1<<27, // Babysitting deterrent
GTR_HURTMESSAGES = 1<<28, // Hit and death messages GTR_SPAWNENEMIES = 1<<28, // Spawn enemies
GTR_SPAWNINVUL = 1<<29, // Babysitting deterrent GTR_ALLOWEXIT = 1<<29, // Allow exit sectors
GTR_RESPAWNDELAY = 1<<30, // Respawn delay GTR_NOTITLECARD = 1<<30, // Don't show the title card
}; };
// String names for gametypes // String names for gametypes