Skip to content

Fix bot_mimic not copying weapon swap to slot 1 #2099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunzenshen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bot_mimic not copying weapon swap to slot 1 #2099

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25875a8
Fix bot_mimic not copying weapon swap to slot 1
sunzenshen Aug 28, 2026
42344c8
Prefer swapping to exact utility type
sunzenshen Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/game/server/NextBot/Player/NextBotPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,33 @@ inline void NextBotPlayer< PlayerType >::PhysicsSimulate( void )
cmd = *pPlayerMimicked->GetLastUserCommand();
cmd.viewangles[YAW] += bot_mimic_yaw_offset.GetFloat();

if (cmd.weaponselect != 0) // mimicked player swapped weapon
{
CBaseEntity *pSrcEnt = CBaseEntity::Instance(cmd.weaponselect);
cmd.weaponselect = 0; // default to not swapping weapon

if (pSrcEnt && pSrcEnt->IsBaseCombatWeapon())
{
CBaseCombatWeapon *pSrcWeapon = static_cast<CBaseCombatWeapon *>(pSrcEnt);

CBaseCombatWeapon *pBotWeapon = pThisBot->Weapon_OwnsThisType(
pSrcWeapon->GetClassname(), cmd.weaponsubtype);

if (!pBotWeapon) // did not have exact weapon match
{
// fall back to swapping to any weapon in that slot if available
pBotWeapon = pThisBot->Weapon_GetSlot(pSrcWeapon->GetSlot());
}

if (pBotWeapon) // candidate weapon swap found
{
// queue bot weapon swap
cmd.weaponselect = pBotWeapon->entindex();
cmd.weaponsubtype = pBotWeapon->GetSubType();
}
}
}

// allocate a new command and add it to the player's list of command to process
this->ProcessUsercmds(&cmd, 1, 1, 0, false);

Expand Down