mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'no-encore-palette' into 'master'
DEVELOP cvar to disable encore palette See merge request KartKrew/Kart!1373
This commit is contained in:
commit
55c3da2892
4 changed files with 12 additions and 1 deletions
|
|
@ -413,6 +413,10 @@ consvar_t cv_kartspeedometer = CVAR_INIT ("speedometer", "Percentage", CV_SAVE,
|
|||
consvar_t cv_kartvoices = CVAR_INIT ("tauntvoices", "Tasteful", CV_SAVE, kartvoices_cons_t, NULL);
|
||||
consvar_t cv_karthorns = CVAR_INIT ("taunthorns", "Tasteful", CV_SAVE, kartvoices_cons_t, NULL);
|
||||
|
||||
#ifdef DEVELOP
|
||||
consvar_t cv_kartencoremap = CVAR_INIT ("encoremap", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
|
||||
#endif
|
||||
|
||||
static CV_PossibleValue_t kartbot_cons_t[] = {
|
||||
{0, "Off"},
|
||||
{1, "Lv.1"},
|
||||
|
|
|
|||
|
|
@ -90,6 +90,9 @@ extern consvar_t cv_kartbot;
|
|||
extern consvar_t cv_karteliminatelast;
|
||||
extern consvar_t cv_thunderdome;
|
||||
extern consvar_t cv_kartusepwrlv;
|
||||
#ifdef DEVELOP
|
||||
extern consvar_t cv_kartencoremap;
|
||||
#endif
|
||||
|
||||
extern consvar_t cv_votetime;
|
||||
extern consvar_t cv_botscanvote;
|
||||
|
|
|
|||
|
|
@ -386,6 +386,10 @@ void K_RegisterKartStuff(void)
|
|||
CV_RegisterVar(&cv_debugencorevote);
|
||||
|
||||
CV_RegisterVar(&cv_reducevfx);
|
||||
|
||||
#ifdef DEVELOP
|
||||
CV_RegisterVar(&cv_kartencoremap);
|
||||
#endif
|
||||
}
|
||||
|
||||
//}
|
||||
|
|
|
|||
|
|
@ -8177,7 +8177,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||
|
||||
if (mapheaderinfo[gamemap-1])
|
||||
{
|
||||
if (encoremode)
|
||||
if (encoremode && cv_kartencoremap.value)
|
||||
{
|
||||
encoreLump = vres_Find(curmapvirt, "ENCORE");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue