diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b3dc89029..4d90bc678 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -458,9 +458,13 @@ consvar_t cv_kartrings = CVAR_INIT ("kartrings", "No", CV_NETVAR|CV_CALL|CV_NOIN static CV_PossibleValue_t ringsmin_cons_t[] = {{INT8_MIN, "MIN"}, {0, "MAX"}, {0, NULL}}; static CV_PossibleValue_t ringsmax_cons_t[] = {{0, "MIN"}, {INT8_MAX, "MAX"}, {0, NULL}}; + consvar_t cv_kartringsmin = CVAR_INIT ("kartringsmin", "-20", CV_NETVAR, ringsmin_cons_t, NULL); consvar_t cv_kartringsmax = CVAR_INIT ("kartringsmax", "20", CV_NETVAR, ringsmax_cons_t, NULL); +static CV_PossibleValue_t ringsstart_cons_t[] = {{INT8_MIN, "MIN"}, {INT8_MAX, "MAX"}, {0, NULL}}; +consvar_t cv_kartringsstart = CVAR_INIT ("kartringsstart", "5", CV_NETVAR, ringsstart_cons_t, NULL); + // Stacking related consvar_t cv_kartstacking = CVAR_INIT ("kartstacking", "No", CV_NETVAR|CV_CALL|CV_NOINIT, CV_YesNo, KartStacking_OnChange); consvar_t cv_kartstacking_diminishparam = CVAR_INIT ("kartstacking_diminishparam", "0.32", CV_NETVAR|CV_CHEAT|CV_FLOAT, CV_Unsigned, NULL); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 56976e232..385f7a3eb 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -125,6 +125,7 @@ extern consvar_t cv_kartusepwrlv; extern consvar_t cv_kartrings; extern consvar_t cv_kartringsmin; extern consvar_t cv_kartringsmax; +extern consvar_t cv_kartringsstart; extern consvar_t cv_kartstacking; extern consvar_t cv_kartstacking_diminishparam; diff --git a/src/g_game.c b/src/g_game.c index b48b8b076..56a9c2f1c 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2538,7 +2538,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) bumper = ((gametyperules & GTR_BUMPERS) ? K_StartingBumperCount() : 0); karmapoints = 0; wanted = 0; - rings = 5; + rings = cv_kartringsstart.value; minrings = cv_kartringsmin.value; maxrings = cv_kartringsmax.value; kickstartaccel = 0; diff --git a/src/k_kart.c b/src/k_kart.c index bce64a793..4913d383d 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -299,6 +299,7 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_kartrings); CV_RegisterVar(&cv_kartringsmin); CV_RegisterVar(&cv_kartringsmax); + CV_RegisterVar(&cv_kartringsstart); // Stacking CV_RegisterVar(&cv_kartstacking);