Skip to content

Commit c784ebd

Browse files
Nord1cWarr1orNord1cWarr1or
authored
Refactoring & cosmetic changes (#301)
* codestyle update * refactoring * Rank restrictions: get rid of hardcoded values
1 parent 1e71dad commit c784ebd

2 files changed

Lines changed: 49 additions & 44 deletions

File tree

‎cstrike/addons/amxmodx/scripting/CA_Addon_RankRestrictions.sma‎

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@
1010
native aes_get_player_level(const player);
1111
native ar_get_user_level(const player, rankName[] = "", len = 0);
1212
native crxranks_get_user_level(const player);
13-
native cmsranks_get_user_level(player, szLevel[] = "", len = 0);
13+
native cmsranks_get_user_level(player, level[] = "", len = 0);
1414
native csstats_get_user_stats(const player, const stats[22]);
1515
native Float:cmsstats_get_user_skill(player, skillname[] = "", namelen = 0, &skill_level = 0);
1616
native get_user_skill(player, &Float: skill);
1717
native get_user_stats(player, stats[STATSX_MAX_STATS], bodyhits[MAX_BODYHITS]);
1818
//
1919

20+
enum any: rankRestrictionsType {
21+
rr_type_none,
22+
rr_type_level,
23+
rr_type_frags
24+
}
2025

2126
new ca_rankrestrictions_type,
2227
ca_rankrestrictions_type_kills,
@@ -46,26 +51,33 @@ public plugin_natives() {
4651
}
4752

4853
public native_filter(const name[], index, trap) {
49-
if(strcmp(name, "aes_get_player_level"))
54+
if(strcmp(name, "aes_get_player_level")) {
5055
return PLUGIN_HANDLED
56+
}
5157

52-
if(strcmp(name, "ar_get_user_level"))
58+
if(strcmp(name, "ar_get_user_level")) {
5359
return PLUGIN_HANDLED
60+
}
5461

55-
if(strcmp(name, "crxranks_get_user_level"))
62+
if(strcmp(name, "crxranks_get_user_level")) {
5663
return PLUGIN_HANDLED
64+
}
5765

58-
if(strcmp(name, "csstats_get_user_stats"))
66+
if(strcmp(name, "csstats_get_user_stats")) {
5967
return PLUGIN_HANDLED
68+
}
6069

61-
if(strcmp(name, "cmsranks_get_user_level"))
70+
if(strcmp(name, "cmsranks_get_user_level")) {
6271
return PLUGIN_HANDLED
72+
}
6373

64-
if(strcmp(name, "cmsstats_get_user_skill"))
65-
return PLUGIN_HANDLED
74+
if(strcmp(name, "cmsstats_get_user_skill")) {
75+
return PLUGIN_HANDLED
76+
}
6677

67-
if(strcmp(name, "get_user_stats"))
68-
return PLUGIN_HANDLED
78+
if(strcmp(name, "get_user_stats")) {
79+
return PLUGIN_HANDLED
80+
}
6981

7082
return PLUGIN_CONTINUE
7183
}
@@ -144,18 +156,20 @@ public CA_Client_Voice(const listener, const sender) {
144156
}
145157

146158
bool: CanCommunicate(const player, const bool: print = true) {
147-
if(ca_rankrestrictions_type <= 0)
159+
if(ca_rankrestrictions_type <= rr_type_none) {
148160
return true
161+
}
149162

150163
// check is gagged?
151-
if(get_user_flags(player) & read_flags(ca_rankrestrictions_immunity_flag))
164+
if(get_user_flags(player) & read_flags(ca_rankrestrictions_immunity_flag)) {
152165
return true
166+
}
153167

154168
if(ca_rankrestrictions_steam_immunity && is_user_steam(player)) {
155169
return true
156170
}
157171

158-
if(ca_rankrestrictions_type == 1 && GetUserLevel(player) < ca_rankrestrictions_min_level) {
172+
if(ca_rankrestrictions_type == rr_type_level && GetUserLevel(player) < ca_rankrestrictions_min_level) {
159173
if(print) {
160174
client_print_color(player, print_team_red, "%L",
161175
player, "RankRestrictions_Warning_MinLevel", ca_rankrestrictions_min_level
@@ -165,7 +179,7 @@ bool: CanCommunicate(const player, const bool: print = true) {
165179
return false
166180
}
167181

168-
if(ca_rankrestrictions_type == 2 && GetUserFragsFromStats(player) < ca_rankrestrictions_min_kills) {
182+
if(ca_rankrestrictions_type == rr_type_frags && GetUserFragsFromStats(player) < ca_rankrestrictions_min_kills) {
169183
if(print) {
170184
client_print_color(player, print_team_red, "%L",
171185
player, "RankRestrictions_Warning_MinKills", ca_rankrestrictions_min_kills
@@ -184,23 +198,20 @@ GetUserLevel(const player) {
184198
case 1: return ar_get_user_level(player)
185199
case 2: return crxranks_get_user_level(player)
186200
case 3: return cmsranks_get_user_level(player)
187-
case 4:
188-
{
201+
case 4: {
189202
new iSkill
190203
cmsstats_get_user_skill(player, .skill_level = iSkill)
191204
return iSkill
192205
}
193-
case 5:
194-
{
206+
case 5: {
195207
new Float:iSkill
196208
get_user_skill(player, iSkill)
197209
return floatround(iSkill)
198210
}
199-
case 6:
200-
{
201-
new iStats[STATSX_MAX_STATS], iHits[MAX_BODYHITS]
202-
get_user_stats(player, iStats, iHits)
203-
return iStats[STATSX_RANK]
211+
case 6: {
212+
new stats[STATSX_MAX_STATS], hits[MAX_BODYHITS]
213+
get_user_stats(player, stats, hits)
214+
return stats[STATSX_RANK]
204215
}
205216
}
206217

@@ -210,19 +221,16 @@ GetUserLevel(const player) {
210221
GetUserFragsFromStats(const player) {
211222
enum { stats_Frags/* , stats_Deaths, stats_Rounds = 16 */ }
212223

213-
switch(ca_rankrestrictions_type_kills)
214-
{
215-
case 0:
216-
{
224+
switch(ca_rankrestrictions_type_kills) {
225+
case 0: {
217226
new stats[22]
218227
csstats_get_user_stats(player, stats)
219228
return stats[stats_Frags]
220229
}
221-
case 1:
222-
{
223-
new iStats[STATSX_MAX_STATS], iHits[MAX_BODYHITS]
224-
get_user_stats(player, iStats, iHits)
225-
return iStats[STATSX_KILLS]
230+
case 1: {
231+
new stats[STATSX_MAX_STATS], hits[MAX_BODYHITS]
232+
get_user_stats(player, stats, hits)
233+
return stats[STATSX_KILLS]
226234
}
227235
}
228236

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#pragma tabsize 2
1212

1313

14-
/* ----- START SETTINGS----- */
14+
/* ----- START SETTINGS ----- */
1515
const Float: GAG_THINKER_FREQ = 3.0
16-
/* ----- END OF SETTINGS----- */
16+
/* ----- END OF SETTINGS ----- */
1717

1818
static g_currentGags[MAX_PLAYERS + 1][gagData_s]
1919
static g_adminTempData[MAX_PLAYERS + 1][gagData_s]
@@ -956,8 +956,9 @@ static MenuShow_EditGag(const id) {
956956
menu_addblank2(menu)
957957
menu_addblank2(menu)
958958

959-
if(ca_gag_common_chat_block)
959+
if(ca_gag_common_chat_block) {
960960
menu_addblank2(menu)
961+
}
961962

962963
menu_additem(menu, fmt("%L", id, "Gag_MenuItem_Confirm"), fmt("%i", ITEM_CONFIRM), .callback = callback)
963964

@@ -1221,7 +1222,7 @@ public SrvCmd_AddReason() {
12211222
enum any: args_s { arg_cmd, arg_reason, arg_flags, arg_time }
12221223

12231224
new argCount = read_argc()
1224-
if(argCount < 2 || argCount > 4){
1225+
if(argCount < 2 || argCount > 4) {
12251226
server_print("\tUsage: ca_gag_add_reason <reason> [flags] [time]")
12261227
return
12271228
}
@@ -1254,7 +1255,7 @@ public SrvCmd_AddWhitelistCmd() {
12541255
enum { arg_chat_cmd = 1 }
12551256

12561257
new argCount = read_argc()
1257-
if(argCount < 2 || argCount > 2) {
1258+
if(argCount != 2) {
12581259
server_print("\tUsage: ca_gag_add_chat_whitelist_cmd <cmd>")
12591260
return
12601261
}
@@ -1307,7 +1308,7 @@ static Message_ChatBlocked(const target) {
13071308
}
13081309
}
13091310

1310-
static bool:IsWhitelistCmd(const message[]) {
1311+
static bool: IsWhitelistCmd(const message[]) {
13111312
new whitelistCmd[MAX_WHITELIST_CMD_LEN]
13121313

13131314
for(new i; i < g_chatWhitelistCmds_size; i++) {
@@ -1466,16 +1467,12 @@ public CA_Storage_Removed( ) {
14661467

14671468

14681469
static LoadConfig() {
1469-
if(!g_gagReasonsTemplates) {
1470-
g_gagReasonsTemplates = ArrayCreate(reason_s)
1471-
} else if(ArraySize(g_gagReasonsTemplates) > 0) {
1470+
if(ArraySize(g_gagReasonsTemplates) > 0) {
14721471
ArrayClear(g_gagReasonsTemplates)
14731472
g_gagReasonsTemplates_size = 0
14741473
}
14751474

1476-
if(!g_chatWhitelistCmds) {
1477-
g_chatWhitelistCmds = ArrayCreate(MAX_WHITELIST_CMD_LEN)
1478-
} else if(ArraySize(g_chatWhitelistCmds) > 0) {
1475+
if(ArraySize(g_chatWhitelistCmds) > 0) {
14791476
ArrayClear(g_chatWhitelistCmds)
14801477
g_chatWhitelistCmds_size = 0
14811478
}

0 commit comments

Comments
 (0)