diff --git a/plugins/l4d2_feedthetrolls.smx b/plugins/l4d2_feedthetrolls.smx index 7487289..9a798d9 100644 Binary files a/plugins/l4d2_feedthetrolls.smx and b/plugins/l4d2_feedthetrolls.smx differ diff --git a/scripting/include/feedthetrolls/base.inc b/scripting/include/feedthetrolls/base.inc index 1e990f2..e54ee1b 100644 --- a/scripting/include/feedthetrolls/base.inc +++ b/scripting/include/feedthetrolls/base.inc @@ -4,7 +4,7 @@ //Allow MAX_TROLLS to be defined elsewhere #if defined MAX_TROLLS #else - #define MAX_TROLLS 29 + #define MAX_TROLLS 31 #endif enum trollModifier { @@ -128,6 +128,9 @@ enum struct Troll { Troll Trolls[MAX_TROLLS+1]; +ArrayList categories; +static int categoryID = -1; + void ResetClient(int victim, bool wipe = true) { if(wipe) { ActiveTrolls[victim] = 0; @@ -140,8 +143,6 @@ void ResetClient(int victim, bool wipe = true) { SDKUnhook(wpn, SDKHook_Reload, Event_WeaponReload); } -ArrayList categories; -static int categoryID = -1; int SetupTroll(const char[] name, const char description[128], int mods, bool flagsMultiselectable = false, int defaultFlags = 0) { if(mods == 0) { @@ -324,7 +325,6 @@ bool ApplyAffect(int victim, const Troll troll, int activator, trollModifier mod return true; } - bool IsTrollActive(int client, const char[] troll) { if(ActiveTrolls[client] == 0) return false; static int i = 0; diff --git a/scripting/include/feedthetrolls/misc.inc b/scripting/include/feedthetrolls/misc.inc index 968d3d8..71165f1 100644 --- a/scripting/include/feedthetrolls/misc.inc +++ b/scripting/include/feedthetrolls/misc.inc @@ -42,7 +42,7 @@ bool ToggleMarkPlayer(int client, int target) { Call_PushCell(target); Call_Finish(); g_PendingBanTroll[target] = true; - EnableTroll(target, "NoProfanity"); + EnableTroll(target, "No Profanity"); LogAction(client, target, "\"%L\" marked \"%L\" as troll", client, target); ShowActivityEx(client, "[FTT] ", "marked %N as troll", target); return true; diff --git a/scripting/include/feedthetrolls/trolls.inc b/scripting/include/feedthetrolls/trolls.inc index 48a4516..6a8e392 100644 --- a/scripting/include/feedthetrolls/trolls.inc +++ b/scripting/include/feedthetrolls/trolls.inc @@ -58,8 +58,8 @@ void SetupTrolls() { // Initialize the default flag values to -1 - for(int i = 0; i <= MAX_TROLLS; i++) { - for(int j = 1; j <= MAXPLAYERS+1; j++) { + for(int i = 0; i < MAX_TROLLS; i++) { + for(int j = 1; j <= MAXPLAYERS; j++) { Trolls[i].activeFlagClients[j] = -1; } }