Skip to content

Commit 8784c1e

Browse files
Refactor enum usage in command functions (#341)
* Fix amx_gag command argument handling - Added arg_cmd to enum and marked as unused - Changed argument count comparison from >= to > to fix validation * Refactor enum usage in command functions
1 parent ee93409 commit 8784c1e

File tree

1 file changed

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

1 file changed

+13
-9
lines changed

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,24 +1154,26 @@ 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 = 1, 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 }
1159+
#pragma unused arg_cmd
11581160

11591161
if (!cmd_access(id, level, cid, 1)) {
11601162
return PLUGIN_HANDLED
11611163
}
11621164

11631165
new argc = read_argc()
11641166

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

11691171
return PLUGIN_HANDLED
11701172
}
11711173

1172-
new args[amx_gag_s][255]
1174+
new args[AMX_GAG_ARG_COUNT][255]
11731175
for (new i; i < argc; i++) {
1174-
read_argv(i, args[amx_gag_s: i], charsmax(args[]))
1176+
read_argv(i, args[i], charsmax(args[]))
11751177
}
11761178

11771179
new target = FindPlayerByTarget(args[arg_player])
@@ -1219,17 +1221,18 @@ public ConCmd_amx_gag(const id, const level, const cid) {
12191221
}
12201222

12211223
public SrvCmd_AddReason() {
1222-
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 }
12231226

12241227
new argCount = read_argc()
1225-
if (argCount < 2 || argCount > 4) {
1228+
if (argCount < 2 || argCount > ARGS_COUNT) {
12261229
server_print("^tUsage: ca_gag_add_reason <reason> [flags] [time]")
12271230
return
12281231
}
12291232

1230-
new args[args_s][256]
1233+
new args[ARGS_COUNT][256]
12311234

1232-
for(new arg = arg_cmd; arg < sizeof(args); arg++) {
1235+
for(new arg = arg_cmd; arg < ARGS_COUNT; arg++) {
12331236
read_argv(arg, args[arg], charsmax(args[]))
12341237
}
12351238

@@ -1252,10 +1255,11 @@ public SrvCmd_AddReason() {
12521255
}
12531256

12541257
public SrvCmd_AddWhitelistCmd() {
1258+
const ARGS_COUNT = 2
12551259
enum { arg_chat_cmd = 1 }
12561260

12571261
new argCount = read_argc()
1258-
if (argCount != 2) {
1262+
if (argCount != ARGS_COUNT) {
12591263
server_print("^tUsage: ca_gag_add_chat_whitelist_cmd <cmd>")
12601264
return
12611265
}

0 commit comments

Comments
 (0)