From e1b419c83d1dd2c8f0b1de438a658d681672d3a1 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Tue, 25 Mar 2025 11:51:11 -0400 Subject: [PATCH] Fix develop compile --- src/k_bot.cpp | 11 +++++------ src/k_bot.h | 5 ++--- src/k_kart.c | 2 ++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/k_bot.cpp b/src/k_bot.cpp index 5b14d08e1..c7f9d2105 100644 --- a/src/k_bot.cpp +++ b/src/k_bot.cpp @@ -42,7 +42,8 @@ #endif #include "i_net.h" // doomcom -//extern "C" consvar_t cv_forcebots; +consvar_t cv_forcebots = CVAR_INIT ("kartforcebots", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL); +consvar_t cv_botcontrol = CVAR_INIT ("kartbotcontrol", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL); /*-------------------------------------------------- void K_SetNameForBot(UINT8 playerNum, UINT8 skinnum) @@ -206,7 +207,7 @@ void K_UpdateMatchRaceBots(void) { difficulty = 0; } - else if ((gametyperules & GTR_BOTS) == 0 /*&& !cv_forcebots.value*/) + else if ((gametyperules & GTR_BOTS) == 0 && !cv_forcebots.value) { difficulty = 0; } @@ -1313,10 +1314,8 @@ static void K_BuildBotTiccmdNormal(player_t *player, ticcmd_t *cmd) } // Defanging bots for testing. - #ifdef DEVELOP - if (!cv_botcontrol.value) - return; - #endif + if (!cv_botcontrol.value) + return; // Actual gameplay behaviors below this block! const botcontroller_t *botController = K_GetBotController(player->mo); diff --git a/src/k_bot.h b/src/k_bot.h index 7a8691bba..6f68403e4 100644 --- a/src/k_bot.h +++ b/src/k_bot.h @@ -22,9 +22,8 @@ extern "C" { #endif -#ifdef DEVELOP - extern consvar_t cv_botcontrol; -#endif +extern consvar_t cv_forcebots; +extern consvar_t cv_botcontrol; // Maximum value of botvars.difficulty #define MAXBOTDIFFICULTY (13) diff --git a/src/k_kart.c b/src/k_kart.c index 70ea946f4..ff8fbaece 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -228,6 +228,8 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_kartspeedometer); CV_RegisterVar(&cv_kartvoices); CV_RegisterVar(&cv_kartbot); + CV_RegisterVar(&cv_forcebots); + CV_RegisterVar(&cv_botcontrol); CV_RegisterVar(&cv_karteliminatelast); CV_RegisterVar(&cv_kartusepwrlv); CV_RegisterVar(&cv_votetime);