Fix bots with switchtoweapon and setspawnweapon built-ins

callofduty4x · Nov 29, 2023 · 3d11e8f · 3d11e8f
1 parent 4f07800
commit 3d11e8f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/asmsource/_g_weapon.asm b/src/asmsource/_g_weapon.asm
@@ -53,6 +53,7 @@
 	extern G_FireRocket
 	extern G_AntiLagRewindClientPos
 	extern G_AntiLag_RestoreClientPos
+	extern Bot_SetBotWeapon
 
 ;Exports of g_weapon:
 	global _ZZ11Melee_TraceP9gentity_sP11weaponParmsifffP7trace_tPfE12traceOffsets
@@ -1090,6 +1091,11 @@ G_SelectWeaponIndex:
 	mov eax, [ebp+0x8]
 	mov [esp], eax
 	call SV_GameSendServerCommand
+	mov eax, [ebp+0xc]
+	push eax
+	mov eax, [ebp+0x8]
+	push eax
+	call Bot_SetBotWeapon
 	leave
 	ret
 

diff --git a/src/sv_bots.cpp b/src/sv_bots.cpp
@@ -393,4 +393,13 @@ qboolean shouldSpamUseButton(gentity_t *bot)
     return is_alive == qfalse && ai->useSpamDelay == 0 ? qtrue : qfalse;
 }
 
+void Bot_SetBotWeapon(int clientNum, unsigned int weaponIdx)
+{
+    ::byte weapInt;
+
+    weapInt = static_cast<::byte>(weaponIdx);
+
+    g_botai[clientNum].weapon = weapInt;
+}
+
 }
diff --git a/src/sv_bots.h b/src/sv_bots.h
@@ -37,6 +37,7 @@ extern "C"
 
 void Scr_AddBotsMovement();
 qboolean shouldSpamUseButton(gentity_t *bot);
+void Bot_SetBotWeapon(int, unsigned int);
 
 
 #ifdef __cplusplus