From eb57991abf69fc4c37c65cefbb4d0991b9003ac8 Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sat, 5 Mar 2022 23:26:52 +0300 Subject: [PATCH] `EditGag` menu fixes (#257) * fix(gag): :bug: Gag menu don't react to switch Voice flag Doesn't account for behavior `ca_gag_common_chat_block` is 1, swtich case in handler close #254 issue * fix(gag): :bug: GagEdit: Fix EXIT item shift `ca_gag_common_chat_block 1` depends close #256 issue --- cstrike/addons/amxmodx/scripting/CA_Gag.sma | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cstrike/addons/amxmodx/scripting/CA_Gag.sma b/cstrike/addons/amxmodx/scripting/CA_Gag.sma index a5d7d2a1..10fd77d3 100644 --- a/cstrike/addons/amxmodx/scripting/CA_Gag.sma +++ b/cstrike/addons/amxmodx/scripting/CA_Gag.sma @@ -956,6 +956,9 @@ static MenuShow_EditGag(const id) { menu_addblank2(menu) menu_addblank2(menu) + if(ca_gag_common_chat_block) + menu_addblank2(menu) + menu_additem(menu, fmt("%L", id, "Gag_MenuItem_Confirm"), fmt("%i", ITEM_CONFIRM), .callback = callback) menu_setprop(menu, MPROP_PERPAGE, 0) @@ -1014,8 +1017,8 @@ public MenuHandler_EditGag(const id, const menu, const item) { switch(item) { case item_Say: g_adminTempData[id][gd_reason][r_flags] ^= gagFlag_Say - case item_SayTeam: g_adminTempData[id][gd_reason][r_flags] ^= gagFlag_SayTeam - case item_Voice: g_adminTempData[id][gd_reason][r_flags] ^= gagFlag_Voice + case item_SayTeam: g_adminTempData[id][gd_reason][r_flags] ^= (ca_gag_common_chat_block ? gagFlag_Voice : gagFlag_SayTeam) + case item_Voice: g_adminTempData[id][gd_reason][r_flags] ^= gagFlag_Voice // not used when `ca_gag_common_chat_block` is 1 case item_Reason: { MenuShow_SelectReason(id)