incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'blankart-dev' into mine-grid-css-2021

Browse source
This commit is contained in:
minenice55 2025-09-11 07:52:01 +02:00
commit 51a4be0a3f
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -54,7 +54,7 @@ git clone https://codeberg.org/NepDisk/blankart.git
cd blankart
mkdir build
cd build
cmake -G "MSYS Makefiles" ..
cmake -G "MSYS Makefiles" .. -DCMAKE_POLICY_VERSION_MINIMUM=3.5
make -j$(nproc)
```

2
src/d_netcmd.c
View file

@ -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);

1
src/d_netcmd.h
View file

@ -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;

6
src/k_bot.cpp
View file

@ -261,9 +261,9 @@ void K_UpdateMatchRaceBots(void)
{
pmax = std::min<UINT8>(pmax, static_cast<UINT8>(cv_maxplayers.value));
}
if (cv_ingamecap.value > 0)
if (cv_kartbot_cap.value > 0)
{
pmax = std::min<UINT8>(pmax, static_cast<UINT8>(cv_ingamecap.value));
pmax = std::min<UINT8>(pmax, static_cast<UINT8>(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];
}

1
src/k_kart.c
View file

@ -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);