From 9edf78ee720d6d5522f18456a02f7f39229220cd Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Fri, 1 Dec 2023 06:39:35 +0300 Subject: [PATCH 1/2] fix: don't show `G` notify in `/guns` menu if not enabled fix #69 --- .../scripting/ReDeathmatch/ReDM_equip_manager.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc index 596f395..331442d 100644 --- a/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc +++ b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc @@ -263,13 +263,13 @@ static bool: Player_CallEquipMenu(const player) { static Menu_ChooseEquip(const player, const EquipType_e: section) { SetGlobalTransTarget(player) - new menu = menu_create( - fmt("%l^n%l", - section == et_Primary ? "PrimaryEquip" : "SecondaryEquip", - "ToClosePressG" - ), - "MenuHandler_ChooseEquip" - ) + new menuTitle[128] + formatex(menuTitle, charsmax(menuTitle), "%l", section == et_Primary ? "PrimaryEquip" : "SecondaryEquip") + + if (get_cvar_num("redm_open_equip_menu_by_g")) + strcat(menuTitle, fmt("^n%l", "ToClosePressG"), charsmax(menuTitle)) + + new menu = menu_create(menuTitle, "MenuHandler_ChooseEquip") static callback if(!callback) From 40c0f861644e2300390b0c0c54b1036791e55a18 Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Fri, 1 Dec 2023 06:45:17 +0300 Subject: [PATCH 2/2] change chat message about `/guns` --- cstrike/addons/amxmodx/data/lang/redm/redm.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cstrike/addons/amxmodx/data/lang/redm/redm.txt b/cstrike/addons/amxmodx/data/lang/redm/redm.txt index 033bec2..4d3e004 100644 --- a/cstrike/addons/amxmodx/data/lang/redm/redm.txt +++ b/cstrike/addons/amxmodx/data/lang/redm/redm.txt @@ -10,7 +10,7 @@ SecondaryEquip = Secondary equip ToClosePressG = \wTo close the menu - press `\yG\w` CurrentMode = Current mode: NextMode = Next Mode - -YouCanChooseEquip = You can select equipment by pressing `^3G^1` (or ^3/guns^1). +YouCanChooseEquip = You can select equipment, type ^3/guns^1. ModeChanges = The game mode changes. Modes = Game modes DisableForceMode = Disable forced mode @@ -32,7 +32,7 @@ SecondaryEquip = Дополнительное оружие ToClosePressG = \wЧтобы закрыть меню - нажмите `\yG\w` CurrentMode = Текущий режим: NextMode = Следующий режим - -YouCanChooseEquip = Вы можете выбрать экипировку нажав `^3G^1` (или ^3/guns^1). +YouCanChooseEquip = Вы можете выбрать экипировку, напишите ^3/guns^1. ModeChanges = Смена режима игры. Modes = Режимы игры DisableForceMode = Отключить фиксированный режим @@ -53,7 +53,7 @@ SecondaryEquip = 次要武器 ToClosePressG = \w关闭菜单 - 请按 `\yG\w` CurrentMode = 当前模式： NextMode = 下一个模式 - -YouCanChooseEquip = 你可以选择装备，通过按 `^3G^1` (或输入 \3/guns^1). +YouCanChooseEquip = 您可以通过输入 \3/guns^1 来选择装备. ModeChanges = 游戏模式改变。 Modes = 游戏模式 DisableForceMode = 禁用强制模式