From 480d56838f9e853c625597e31918682ed0a7d955 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Mon, 20 May 2019 00:50:44 -0400 Subject: [PATCH] Add cvars to prevent issues --- src/d_netcmd.c | 2 ++ src/d_netcmd.h | 3 ++- src/k_kart.c | 4 ++++ src/m_menu.c | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index c4d99e840..9d7708dd8 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -342,6 +342,8 @@ consvar_t cv_selfpropelledbomb = {"selfpropelledbomb", "On", CV_NETVAR|CV_CHEAT consvar_t cv_grow = {"grow", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_shrink = {"shrink", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_thundershield = {"thundershield", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_bubbleshield = {"bubbleshield", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_flameshield = {"flameshield", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_hyudoro = {"hyudoro", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_pogospring = {"pogospring", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_kitchensink = {"kitchensink", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 73930c172..1d360a254 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -104,7 +104,8 @@ extern consvar_t cv_recycler;*/ extern consvar_t cv_superring, cv_sneaker, cv_rocketsneaker, cv_invincibility, cv_banana; extern consvar_t cv_eggmanmonitor, cv_orbinaut, cv_jawz, cv_mine; extern consvar_t cv_ballhog, cv_selfpropelledbomb, cv_grow, cv_shrink; -extern consvar_t cv_thundershield, cv_hyudoro, cv_pogospring, cv_kitchensink; +extern consvar_t cv_thundershield, cv_bubbleshield, cv_flameshield; +extern consvar_t cv_hyudoro, cv_pogospring, cv_kitchensink; extern consvar_t cv_triplesneaker, cv_triplebanana, cv_decabanana; extern consvar_t cv_tripleorbinaut, cv_quadorbinaut, cv_dualjawz; diff --git a/src/k_kart.c b/src/k_kart.c index da3ad8c7b..c23d45d11 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -556,6 +556,8 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_grow); CV_RegisterVar(&cv_shrink); CV_RegisterVar(&cv_thundershield); + CV_RegisterVar(&cv_bubbleshield); + CV_RegisterVar(&cv_flameshield); CV_RegisterVar(&cv_hyudoro); CV_RegisterVar(&cv_pogospring); CV_RegisterVar(&cv_superring); @@ -808,6 +810,8 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean sp cv_grow.value, cv_shrink.value, cv_thundershield.value, + cv_bubbleshield.value, + cv_flameshield.value, cv_hyudoro.value, cv_pogospring.value, cv_superring.value, diff --git a/src/m_menu.c b/src/m_menu.c index b367fc9a4..258c149eb 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -10622,6 +10622,8 @@ static consvar_t *kartitemcvs[NUMKARTRESULTS-1] = { &cv_grow, &cv_shrink, &cv_thundershield, + &cv_bubbleshield, + &cv_flameshield, &cv_hyudoro, &cv_pogospring, &cv_superring,