Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.
This commit is contained in:
parent
1fb244d87f
commit
4b604328d5
|
@ -8909,7 +8909,7 @@ static const char *const GAMETYPERULE_LIST[] = {
|
||||||
"TAG",
|
"TAG",
|
||||||
"POINTLIMIT",
|
"POINTLIMIT",
|
||||||
"TIMELIMIT",
|
"TIMELIMIT",
|
||||||
"HIDETIME",
|
"STARTCOUNTDOWN",
|
||||||
"HIDEFROZEN",
|
"HIDEFROZEN",
|
||||||
"BLINDFOLDED",
|
"BLINDFOLDED",
|
||||||
"FIRSTPERSON",
|
"FIRSTPERSON",
|
||||||
|
|
|
@ -404,7 +404,7 @@ enum GameTypeRules
|
||||||
GTR_TAG = 1<<7, // Tag and Hide and Seek
|
GTR_TAG = 1<<7, // Tag and Hide and Seek
|
||||||
GTR_POINTLIMIT = 1<<8, // Ringslinger point limit
|
GTR_POINTLIMIT = 1<<8, // Ringslinger point limit
|
||||||
GTR_TIMELIMIT = 1<<9, // Ringslinger time limit
|
GTR_TIMELIMIT = 1<<9, // Ringslinger time limit
|
||||||
GTR_HIDETIME = 1<<10, // Hide time (Tag and Hide and Seek)
|
GTR_STARTCOUNTDOWN = 1<<10, // Hide time countdown (Tag and Hide and Seek)
|
||||||
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
|
||||||
|
|
|
@ -3205,9 +3205,9 @@ UINT32 gametypedefaultrules[NUMGAMETYPES] =
|
||||||
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,
|
||||||
|
|
||||||
// Tag
|
// Tag
|
||||||
GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_HIDETIME|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,
|
||||||
// Hide and Seek
|
// Hide and Seek
|
||||||
GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_HIDETIME|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_MATCHEMERALDS|GTR_DEATHMATCHSTARTS|GTR_SPAWNINVUL|GTR_RESPAWNDELAY|GTR_PITYSHIELD,
|
||||||
|
|
|
@ -694,7 +694,7 @@ static void ST_drawTime(void)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Counting down the hidetime?
|
// Counting down the hidetime?
|
||||||
if ((gametyperules & GTR_HIDETIME) && (stplyr->realtime <= (hidetime*TICRATE)))
|
if ((gametyperules & GTR_STARTCOUNTDOWN) && (stplyr->realtime <= (hidetime*TICRATE)))
|
||||||
{
|
{
|
||||||
tics = (hidetime*TICRATE - stplyr->realtime);
|
tics = (hidetime*TICRATE - stplyr->realtime);
|
||||||
if (tics < 3*TICRATE)
|
if (tics < 3*TICRATE)
|
||||||
|
@ -705,7 +705,7 @@ static void ST_drawTime(void)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Hidetime finish!
|
// Hidetime finish!
|
||||||
if ((gametyperules & GTR_HIDETIME) && (stplyr->realtime < ((hidetime+1)*TICRATE)))
|
if ((gametyperules & GTR_STARTCOUNTDOWN) && (stplyr->realtime < ((hidetime+1)*TICRATE)))
|
||||||
ST_drawRaceNum(hidetime*TICRATE - stplyr->realtime);
|
ST_drawRaceNum(hidetime*TICRATE - stplyr->realtime);
|
||||||
|
|
||||||
// Time limit?
|
// Time limit?
|
||||||
|
@ -723,7 +723,7 @@ static void ST_drawTime(void)
|
||||||
downwards = true;
|
downwards = true;
|
||||||
}
|
}
|
||||||
// Post-hidetime normal.
|
// Post-hidetime normal.
|
||||||
else if (gametyperules & GTR_HIDETIME)
|
else if (gametyperules & GTR_STARTCOUNTDOWN)
|
||||||
tics = stplyr->realtime - hidetime*TICRATE;
|
tics = stplyr->realtime - hidetime*TICRATE;
|
||||||
// "Shadow! What are you doing? Hurry and get back here
|
// "Shadow! What are you doing? Hurry and get back here
|
||||||
// right now before the island blows up with you on it!"
|
// right now before the island blows up with you on it!"
|
||||||
|
|
Loading…
Reference in New Issue