Skip to content

Commit c15383e

Browse files
authored
Add gag flags for reasons list (#136)
* 🔥 add gag flags for reasons list
1 parent a7b0862 commit c15383e

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

cstrike/addons/amxmodx/data/lang/CA_Gag.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[ru]
22
Gag_MenuTitle_PlayersList = Заглушить игрока
3-
Gag_MenuTitle_SelectReason = Выберите причину для заглушки:
3+
Gag_MenuTitle_SelectReason = Выберите причину:
44
Gag_MenuTitle_SelectTime = Выберите время для заглушки:
55
Gag_MenuItem_RemoveGag = \rСнять\w
66
Gag_MenuItem_EditGag = Редактировать
@@ -19,7 +19,7 @@ Gag_MenuItem_Expire = Истекает:
1919
Gag_MenuItem_Left = Осталось:
2020

2121
Gag_SelectFlags = Параметры заглушки игрока: [ \r%n\y ]
22-
Gag_EnterReason = Ввести причину ->\n
22+
Gag_EnterReason = Ввести свою ->\n
2323
Gag_EnterTime = Указать время ->
2424

2525
Gag_Immunity = Иммунитет
@@ -48,7 +48,7 @@ Gag_NotifyPlayer_BlockedChat = ^3Вам заблокировали ^1чат^3.
4848

4949
[en]
5050
Gag_MenuTitle_PlayersList = Gag player
51-
Gag_MenuTitle_SelectReason = Choose gag reason:
51+
Gag_MenuTitle_SelectReason = Choose reason:
5252
Gag_MenuTitle_SelectTime = Choose gag time:
5353
Gag_MenuItem_RemoveGag = \rRemove\w
5454
Gag_MenuItem_EditGag = Edit

cstrike/addons/amxmodx/scripting/CA_Gag.sma

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -339,16 +339,19 @@ static MenuShow_SelectReason(const id) {
339339
new reason[reason_s]
340340
ArrayGetArray(g_gagReasonsTemplates, i, reason)
341341

342+
new buffer[2048]
343+
formatex(buffer, charsmax(buffer), reason[r_name])
344+
342345
if(reason[r_time] > 0) {
343-
menu_additem(menu,
344-
fmt("%s (\\y%s\\w)", reason[r_name], Get_TimeString_seconds(id, reason[r_time])),
345-
fmt("%i", i)
346-
)
347-
} else {
348-
menu_additem(menu,
349-
fmt("%s", reason[r_name]), fmt("%i", i)
350-
)
346+
strcat(buffer, fmt(" (\\y%s", Get_TimeString_seconds(id, reason[r_time])), charsmax(buffer))
351347
}
348+
349+
if(reason[r_flags] != gagFlag_Removed) {
350+
strcat(buffer, fmt(", %s", bits_to_flags(reason[r_flags])), charsmax(buffer))
351+
}
352+
353+
strcat(buffer, "\\w)", charsmax(buffer))
354+
menu_additem(menu, buffer, fmt("%i", i))
352355
}
353356
} else {
354357
menu_addtext(menu, fmt("\\d %L", id, "Gag_NoTemplatesAvailable_Reasons"), .slot = false)
@@ -657,7 +660,7 @@ static MenuShow_ShowGag(const id) {
657660
)
658661
)
659662
menu_addtext(menu, fmt(" \\d%L \\w%s", id, "Gag_MenuItem_Type",
660-
Get_GagFlags_Names(gagFlags_s: g_adminTempData[id][gd_reason][r_flags])
663+
Get_GagFlags_Names(gag_flags_s: g_adminTempData[id][gd_reason][r_flags])
661664
)
662665
)
663666

@@ -1218,7 +1221,7 @@ public CA_Storage_Saved(const name[], const authID[], const IP[], const reason[]
12181221
client_print(0, print_chat, "%l %s, %l %s (%s)",
12191222
"Gag_MenuItem_Reason", reason,
12201223
"Gag_MenuItem_Time", gagTimeStr,
1221-
Get_GagFlags_Names(gagFlags_s: flags)
1224+
Get_GagFlags_Names(gag_flags_s: flags)
12221225
)
12231226

12241227
CA_Log(logLevel_Info, "Gag: \"%s\" add gag to \"%s\" (type:\"%s\") (time:\"%s\") (reason:\"%s\")", \
@@ -1371,7 +1374,7 @@ static bool: IsTargetHasImmunity(const id, const target) {
13711374
return false
13721375
}
13731376

1374-
static Get_GagFlags_Names(const gagFlags_s: flags) {
1377+
static Get_GagFlags_Names(const gag_flags_s: flags) {
13751378
// TODO: ML this
13761379

13771380
new buffer[64]
@@ -1380,7 +1383,7 @@ static Get_GagFlags_Names(const gagFlags_s: flags) {
13801383
}
13811384

13821385
for(new i = 0; i < sizeof(GAG_FLAGS_STR); i++) {
1383-
if(flags & gagFlags_s: (1 << i)) {
1386+
if(flags & gag_flags_s: (1 << i)) {
13841387
strcat(buffer, fmt("%s + ", GAG_FLAGS_STR[i]), charsmax(buffer));
13851388
}
13861389
}

0 commit comments

Comments
 (0)