Skip to content

Commit fbbff7f

Browse files
committed
Refactor enum usage in command functions
1 parent f9c6564 commit fbbff7f

File tree

1 file changed

+12
-9
lines changed
  • cstrike/addons/amxmodx/scripting/ChatAdditions

1 file changed

+12
-9
lines changed

cstrike/addons/amxmodx/scripting/ChatAdditions/CA_Gag.sma

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,8 @@ public ClCmd_EnterGagTime(const id, const level, const cid) {
11541154
}
11551155

11561156
public ConCmd_amx_gag(const id, const level, const cid) {
1157-
enum amx_gag_s { arg_cmd, arg_player, arg_reason, arg_time, arg_flags }
1157+
const AMX_GAG_ARG_COUNT = 5
1158+
enum { arg_cmd, arg_player, arg_reason, arg_time, arg_flags }
11581159
#pragma unused arg_cmd
11591160

11601161
if (!cmd_access(id, level, cid, 1)) {
@@ -1163,16 +1164,16 @@ public ConCmd_amx_gag(const id, const level, const cid) {
11631164

11641165
new argc = read_argc()
11651166

1166-
if (argc == 1 || argc > _: amx_gag_s) {
1167+
if (argc < 2 || argc > AMX_GAG_ARG_COUNT) {
11671168
console_print(id, "^t Wrong arguments count: `%i`", argc)
11681169
console_print(id, "^t Usage: amx_gag ^"[nickname | STEAM_ID | userID | IP]^" ^"<reason>^" <time> <flags>^n")
11691170

11701171
return PLUGIN_HANDLED
11711172
}
11721173

1173-
new args[amx_gag_s][255]
1174+
new args[AMX_GAG_ARG_COUNT][255]
11741175
for (new i; i < argc; i++) {
1175-
read_argv(i, args[amx_gag_s: i], charsmax(args[]))
1176+
read_argv(i, args[i], charsmax(args[]))
11761177
}
11771178

11781179
new target = FindPlayerByTarget(args[arg_player])
@@ -1220,17 +1221,18 @@ public ConCmd_amx_gag(const id, const level, const cid) {
12201221
}
12211222

12221223
public SrvCmd_AddReason() {
1223-
enum any: args_s { arg_cmd, arg_reason, arg_flags, arg_time }
1224+
const ARGS_COUNT = 4
1225+
enum { arg_cmd, arg_reason, arg_flags, arg_time }
12241226

12251227
new argCount = read_argc()
1226-
if (argCount < 2 || argCount > 4) {
1228+
if (argCount < 2 || argCount > ARGS_COUNT) {
12271229
server_print("^tUsage: ca_gag_add_reason <reason> [flags] [time]")
12281230
return
12291231
}
12301232

1231-
new args[args_s][256]
1233+
new args[ARGS_COUNT][256]
12321234

1233-
for(new arg = arg_cmd; arg < sizeof(args); arg++) {
1235+
for(new arg = arg_cmd; arg < ARGS_COUNT; arg++) {
12341236
read_argv(arg, args[arg], charsmax(args[]))
12351237
}
12361238

@@ -1253,10 +1255,11 @@ public SrvCmd_AddReason() {
12531255
}
12541256

12551257
public SrvCmd_AddWhitelistCmd() {
1258+
const ARGS_COUNT = 2
12561259
enum { arg_chat_cmd = 1 }
12571260

12581261
new argCount = read_argc()
1259-
if (argCount != 2) {
1262+
if (argCount != ARGS_COUNT) {
12601263
server_print("^tUsage: ca_gag_add_chat_whitelist_cmd <cmd>")
12611264
return
12621265
}

0 commit comments

Comments
 (0)