thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

No Ring Shooter in disable controls bot controller

Browse source
This commit is contained in:
Sally Coolatta 2024-01-03 00:08:51 -05:00
parent 2971149080
commit 05cbd90e4e
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/k_bot.cpp
View file

@ -1066,17 +1066,18 @@ static UINT8 K_TrySpindash(const player_t *player, ticcmd_t *cmd)
} }
/*-------------------------------------------------- /*--------------------------------------------------
static boolean K_TryRingShooter(const player_t *player) static boolean K_TryRingShooter(const player_t *player, const botcontroller_t *botController)
Determines conditions where the bot should attempt to respawn. Determines conditions where the bot should attempt to respawn.
Input Arguments:- Input Arguments:-
player - Bot player to check. player - Bot player to check.
botController - Bot controller struct, if it exists.
Return:- Return:-
true if we want to hold the respawn button, otherwise false. true if we want to hold the respawn button, otherwise false.
--------------------------------------------------*/ --------------------------------------------------*/
static boolean K_TryRingShooter(const player_t *player) static boolean K_TryRingShooter(const player_t *player, const botcontroller_t *botController)
{ {
ZoneScoped; ZoneScoped;
@ -1098,6 +1099,12 @@ static boolean K_TryRingShooter(const player_t *player)
return false; return false;
} }
if (botController != nullptr && (botController->flags & TMBOT_NOCONTROL) == TMBOT_NOCONTROL)
{
// Bot controls are disabled, so WANT to sit still.
return false;
}
return true; return true;
} }
@ -1618,7 +1625,7 @@ static void K_BuildBotTiccmdNormal(const player_t *player, ticcmd_t *cmd)
return; return;
} }
if (K_TryRingShooter(player) == true && player->botvars.respawnconfirm >= BOTRESPAWNCONFIRM) if (K_TryRingShooter(player, botController) == true && player->botvars.respawnconfirm >= BOTRESPAWNCONFIRM)
{ {
// We want to respawn. Simply hold Y and stop here! // We want to respawn. Simply hold Y and stop here!
cmd->buttons |= (BT_RESPAWN | BT_EBRAKEMASK); cmd->buttons |= (BT_RESPAWN | BT_EBRAKEMASK);
@ -1934,7 +1941,8 @@ void K_UpdateBotGameplayVars(player_t *player)
player->botvars.spindashconfirm += player->cmd.bot.spindashconfirm; player->botvars.spindashconfirm += player->cmd.bot.spindashconfirm;
} }
if (K_TryRingShooter(player) == true) const botcontroller_t *botController = K_GetBotController(player->mo);
if (K_TryRingShooter(player, botController) == true)
{ {
// Our anti-grief system is already a perfect system // Our anti-grief system is already a perfect system
// for determining if we're not making progress, so // for determining if we're not making progress, so