Merge branch 'battle-test' into 'master'

Add battletest cvar, force Battle mode instead of Prisons in FREE PLAY

See merge request KartKrew/Kart!1090
This commit is contained in:
toaster 2023-03-24 20:09:26 +00:00
commit 86bf07b118
4 changed files with 4 additions and 1 deletions

View file

@ -445,6 +445,7 @@ consvar_t cv_kartdebugdirector = CVAR_INIT ("debugdirector", "Off", CV_CHEAT, CV
consvar_t cv_spbtest = CVAR_INIT ("spbtest", "Off", CV_CHEAT|CV_NETVAR, CV_OnOff, NULL);
consvar_t cv_gptest = CVAR_INIT ("gptest", "Off", CV_CHEAT|CV_NETVAR, CV_OnOff, NULL);
consvar_t cv_debugrank = CVAR_INIT ("debugrank", "Off", CV_CHEAT, CV_OnOff, NULL);
consvar_t cv_battletest = CVAR_INIT ("battletest", "Off", CV_CHEAT|CV_NETVAR, CV_OnOff, NULL);
static CV_PossibleValue_t capsuletest_cons_t[] = {
{CV_CAPSULETEST_OFF, "Off"},

View file

@ -96,6 +96,7 @@ extern consvar_t cv_kartdebugnodes, cv_kartdebugcolorize, cv_kartdebugdirector;
extern consvar_t cv_spbtest, cv_gptest, cv_reducevfx;
extern consvar_t cv_kartdebugwaypoints, cv_kartdebugbotpredict;
extern consvar_t cv_debugrank;
extern consvar_t cv_battletest;
typedef enum {
CV_CAPSULETEST_OFF,

View file

@ -771,7 +771,7 @@ void K_BattleInit(boolean singleplayercontext)
{
size_t i;
if ((gametyperules & GTR_PRISONS) && singleplayercontext && !battleprisons)
if ((gametyperules & GTR_PRISONS) && singleplayercontext && !battleprisons && !cv_battletest.value)
{
mapthing_t *mt = mapthings;
for (i = 0; i < nummapthings; i++, mt++)

View file

@ -351,6 +351,7 @@ void K_RegisterKartStuff(void)
CV_RegisterVar(&cv_spbtest);
CV_RegisterVar(&cv_gptest);
CV_RegisterVar(&cv_capsuletest);
CV_RegisterVar(&cv_battletest);
CV_RegisterVar(&cv_reducevfx);
}