Skip to content
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

FIX: don't show G notify in /guns menu if not enabled #70

Merged
merged 2 commits into from
Dec 1, 2023
Merged

FIX: don't show G notify in /guns menu if not enabled #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9edf78e
fix: don't show `G` notify in `/guns` menu if not enabled
SergeyShorokhov Dec 1, 2023
40c0f86
change chat message about `/guns`
SergeyShorokhov Dec 1, 2023
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
6 changes: 3 additions & 3 deletions cstrike/addons/amxmodx/data/lang/redm/redm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,7 +32,7 @@ SecondaryEquip = Дополнительное оружие
ToClosePressG = \wЧтобы закрыть меню - нажмите `\yG\w`
CurrentMode = Текущий режим:
NextMode = Следующий режим -
YouCanChooseEquip = Вы можете выбрать экипировку нажав `^3G^1` (или ^3/guns^1).
YouCanChooseEquip = Вы можете выбрать экипировку, напишите ^3/guns^1.
ModeChanges = Смена режима игры.
Modes = Режимы игры
DisableForceMode = Отключить фиксированный режим
Expand All @@ -53,7 +53,7 @@ SecondaryEquip = 次要武器
ToClosePressG = \w关闭菜单 - 请按 `\yG\w`
CurrentMode = 当前模式：
NextMode = 下一个模式 -
YouCanChooseEquip = 你可以选择装备，通过按 `^3G^1` (或输入 \3/guns^1).
YouCanChooseEquip = 您可以通过输入 \3/guns^1 来选择装备.
ModeChanges = 游戏模式改变。
Modes = 游戏模式
DisableForceMode = 禁用强制模式
Expand Down
14 changes: 7 additions & 7 deletions cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_equip_manager.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading