From 7f5e772bedce81803fb6640e4b94533e930e2d36 Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Thu, 15 Feb 2024 23:23:59 +0300 Subject: [PATCH] fix: disable random weapons when player choose weapon from menu (#93) --- .../scripting/ReDeathmatch/ReDM_equip_manager.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc index a2d6fed..1071509 100644 --- a/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc +++ b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc @@ -174,7 +174,7 @@ public ClCmd_cl_autobuy(const player) { if (!IsActive()) return PLUGIN_CONTINUE - Player_SwitchRandomWeapons(player) + Player_SwitchRandomWeapons(player, .newState = !g_playerRandomWeapons[player]) return PLUGIN_HANDLED } @@ -205,13 +205,13 @@ public ClCmd_Guns(const player) { * * @return Returns true if random weapons mode is enabled after toggling, false otherwise. */ -static bool: Player_SwitchRandomWeapons(const player) { +static bool: Player_SwitchRandomWeapons(const player, const bool: newState) { if (!IsActive()) return false SetGlobalTransTarget(player) - g_playerRandomWeapons[player] = !g_playerRandomWeapons[player] + g_playerRandomWeapons[player] = newState if (!g_playerRandomWeapons[player]) { EquipManager_Reset(player) @@ -341,6 +341,9 @@ public MenuHandler_ChooseEquip(const player, const menu, const item) { new EquipType_e: section = EquipType_e: strtol(info) g_playerWeapons[player][section] = item + if (g_playerRandomWeapons[player]) + Player_SwitchRandomWeapons(player, .newState = false) + Player_GiveWeapon(player, section) UTIL_PlaySoundEffect(player, "fvox/blip.wav", .pitch = 80)