mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
GameTypeRules: Add GTR_NOPOSITION
Says on the tin - introtime == starttime.
This commit is contained in:
parent
d84ee59887
commit
57b1ad15a5
3 changed files with 17 additions and 10 deletions
|
|
@ -5854,6 +5854,7 @@ const char *const GAMETYPERULE_LIST[] = {
|
||||||
|
|
||||||
"NOMP",
|
"NOMP",
|
||||||
"NOCUPSELECT",
|
"NOCUPSELECT",
|
||||||
|
"NOPOSITION",
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -546,10 +546,10 @@ enum GameTypeRules
|
||||||
|
|
||||||
// Bonus gametype rules
|
// Bonus gametype rules
|
||||||
GTR_PRISONS = 1<<10, // Can enter Prison Break mode
|
GTR_PRISONS = 1<<10, // Can enter Prison Break mode
|
||||||
GTR_CATCHER = 1<<11, // UFO Catcher (only works with GTR_CIRCUIT)
|
GTR_CATCHER = 1<<11, // UFO Catcher (only works with GTR_CIRCUIT)
|
||||||
GTR_ROLLINGSTART = 1<<12, // Rolling start (only works with GTR_CIRCUIT)
|
GTR_ROLLINGSTART = 1<<12, // Rolling start (only works with GTR_CIRCUIT)
|
||||||
GTR_SPECIALSTART = 1<<13, // White fade instant start
|
GTR_SPECIALSTART = 1<<13, // White fade instant start
|
||||||
GTR_BOSS = 1<<14, // Boss intro and spawning
|
GTR_BOSS = 1<<14, // Boss intro and spawning
|
||||||
|
|
||||||
// General purpose rules
|
// General purpose rules
|
||||||
GTR_POINTLIMIT = 1<<15, // Reaching point limit ends the round
|
GTR_POINTLIMIT = 1<<15, // Reaching point limit ends the round
|
||||||
|
|
@ -557,12 +557,13 @@ enum GameTypeRules
|
||||||
GTR_OVERTIME = 1<<17, // Allow overtime behavior
|
GTR_OVERTIME = 1<<17, // Allow overtime behavior
|
||||||
GTR_ENCORE = 1<<18, // Alternate Encore mirroring, scripting, and texture remapping
|
GTR_ENCORE = 1<<18, // Alternate Encore mirroring, scripting, and texture remapping
|
||||||
|
|
||||||
GTR_TEAMS = 1<<19, // Teams are forced on
|
GTR_TEAMS = 1<<19, // Teams are forced on
|
||||||
GTR_NOTEAMS = 1<<20, // Teams are forced off
|
GTR_NOTEAMS = 1<<20, // Teams are forced off
|
||||||
GTR_TEAMSTARTS = 1<<21, // Use team-based start positions
|
GTR_TEAMSTARTS = 1<<21, // Use team-based start positions
|
||||||
|
|
||||||
GTR_NOMP = 1<<22, // No multiplayer
|
GTR_NOMP = 1<<22, // No multiplayer
|
||||||
GTR_NOCUPSELECT = 1<<23, // Your maps are not selected via cup.
|
GTR_NOCUPSELECT = 1<<23, // Your maps are not selected via cup.
|
||||||
|
GTR_NOPOSITION = 1<<24, // No POSITION
|
||||||
|
|
||||||
// free: to and including 1<<31
|
// free: to and including 1<<31
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -186,7 +186,12 @@ void K_TimerInit(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
starttime = (introtime + (3*TICRATE)) + ((2*TICRATE) + (numbulbs * bulbtime)); // Start countdown time, + buffer time
|
starttime = introtime;
|
||||||
|
if (!(gametyperules & GTR_NOPOSITION))
|
||||||
|
{
|
||||||
|
// Start countdown time + buffer time
|
||||||
|
starttime += ((3*TICRATE) + ((2*TICRATE) + (numbulbs * bulbtime)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
K_BattleInit(domodeattack);
|
K_BattleInit(domodeattack);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue