thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no-encore-palette' into 'master'

Browse source 
DEVELOP cvar to disable encore palette

See merge request KartKrew/Kart!1373
This commit is contained in:
James R 2023-08-08 22:19:21 +00:00
commit 55c3da2892
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_netcmd.c
View file

@ -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_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); 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[] = { static CV_PossibleValue_t kartbot_cons_t[] = {
{0, "Off"}, {0, "Off"},
{1, "Lv.1"}, {1, "Lv.1"},

3
src/d_netcmd.h
View file

@ -90,6 +90,9 @@ extern consvar_t cv_kartbot;
extern consvar_t cv_karteliminatelast; extern consvar_t cv_karteliminatelast;
extern consvar_t cv_thunderdome; extern consvar_t cv_thunderdome;
extern consvar_t cv_kartusepwrlv; extern consvar_t cv_kartusepwrlv;
#ifdef DEVELOP
extern consvar_t cv_kartencoremap;
#endif
extern consvar_t cv_votetime; extern consvar_t cv_votetime;
extern consvar_t cv_botscanvote; extern consvar_t cv_botscanvote;

4
src/k_kart.c
View file

@ -386,6 +386,10 @@ void K_RegisterKartStuff(void)
CV_RegisterVar(&cv_debugencorevote); CV_RegisterVar(&cv_debugencorevote);
CV_RegisterVar(&cv_reducevfx); CV_RegisterVar(&cv_reducevfx);
#ifdef DEVELOP
CV_RegisterVar(&cv_kartencoremap);
#endif
} }
//} //}

2
src/p_setup.c
View file

@ -8177,7 +8177,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
if (mapheaderinfo[gamemap-1]) if (mapheaderinfo[gamemap-1])
{ {
if (encoremode) if (encoremode && cv_kartencoremap.value)
{ {
encoreLump = vres_Find(curmapvirt, "ENCORE"); encoreLump = vres_Find(curmapvirt, "ENCORE");
} }