From 9874a36f91c5bbd01c17b2efbb295790477b1243 Mon Sep 17 00:00:00 2001 From: Wumbo <58399748+WumboSpasm@users.noreply.github.com> Date: Wed, 10 Sep 2025 16:09:59 -0400 Subject: [PATCH] Add kartbot_cap cvar --- src/d_netcmd.c | 2 ++ src/d_netcmd.h | 1 + src/k_bot.cpp | 6 +++--- src/k_kart.c | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index e9012eafb..651fc0b0f 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -444,7 +444,9 @@ static CV_PossibleValue_t kartbot_cons_t[] = { {13,"Lv.MAX"}, {0, NULL} }; +static CV_PossibleValue_t kartbot_cap_cons_t[] = {{0, "MIN"}, {MAXPLAYERS, "MAX"}, {0, NULL}}; consvar_t cv_kartbot = CVAR_INIT ("kartbot", "0", CV_NETVAR, kartbot_cons_t, NULL); +consvar_t cv_kartbot_cap = CVAR_INIT ("kartbot_cap", "0", CV_NETVAR, kartbot_cap_cons_t, NULL); consvar_t cv_kartbot_modifiermax = CVAR_INIT ("kartbot_modifiermax", "1.0", CV_NETVAR|CV_FLOAT, CV_Unsigned, NULL); consvar_t cv_kartbot_basetrackcomplexity = CVAR_INIT ("kartbot_basetrackcomplexity", "-7000", CV_NETVAR, CV_Signed, NULL); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index af0d652b3..448b60a00 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -117,6 +117,7 @@ extern consvar_t cv_kartgametypepreference; extern consvar_t cv_kartspeedometer; extern consvar_t cv_kartvoices; extern consvar_t cv_kartbot; +extern consvar_t cv_kartbot_cap; extern consvar_t cv_kartbot_modifiermax; extern consvar_t cv_kartbot_basetrackcomplexity; extern consvar_t cv_karteliminatelast; diff --git a/src/k_bot.cpp b/src/k_bot.cpp index 6e50bc152..c3ef26c3a 100644 --- a/src/k_bot.cpp +++ b/src/k_bot.cpp @@ -261,9 +261,9 @@ void K_UpdateMatchRaceBots(void) { pmax = std::min(pmax, static_cast(cv_maxplayers.value)); } - if (cv_ingamecap.value > 0) + if (cv_kartbot_cap.value > 0) { - pmax = std::min(pmax, static_cast(cv_ingamecap.value)); + pmax = std::min(pmax, static_cast(cv_kartbot_cap.value)); } } @@ -362,7 +362,7 @@ void K_UpdateMatchRaceBots(void) { UINT16 index = P_RandomKey(usableskins); skinnum = grabskins[index]; - if (((cv_ingamecap.value > 0) && (usableskins+1 >= cv_ingamecap.value)) || (usableskins+1 >= cv_maxplayers.value)) + if (((cv_kartbot_cap.value > 0) && (usableskins+1 >= cv_kartbot_cap.value)) || (usableskins+1 >= cv_maxplayers.value)) { grabskins[index] = grabskins[--usableskins]; } diff --git a/src/k_kart.c b/src/k_kart.c index 0c6ef0ab6..ea10ed098 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -263,6 +263,7 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_kartvoices); CV_RegisterVar(&cv_karthitemdialog); CV_RegisterVar(&cv_kartbot); + CV_RegisterVar(&cv_kartbot_cap); CV_RegisterVar(&cv_kartbot_modifiermax); CV_RegisterVar(&cv_kartbot_basetrackcomplexity); CV_RegisterVar(&cv_forcebots);