diff --git a/game/addons/sourcemod/scripting/include/sourcebanspp.inc b/game/addons/sourcemod/scripting/include/sourcebanspp.inc index f85758127..afb448455 100644 --- a/game/addons/sourcemod/scripting/include/sourcebanspp.inc +++ b/game/addons/sourcemod/scripting/include/sourcebanspp.inc @@ -29,6 +29,12 @@ #endif #define _sourcebanspp_included +#define SB_VERSION_MAJOR "1" +#define SB_VERSION_MINOR "8" +#define SB_VERSION_PATCH "4" + +#define SB_VERSION SB_VERSION_MAJOR..."."...SB_VERSION_MINOR..."."...SB_VERSION_PATCH + public SharedPlugin __pl_sourcebanspp = { name = "sourcebans++", diff --git a/game/addons/sourcemod/scripting/include/sourcecomms.inc b/game/addons/sourcemod/scripting/include/sourcecomms.inc index 905cbdd99..4038c25e2 100644 --- a/game/addons/sourcemod/scripting/include/sourcecomms.inc +++ b/game/addons/sourcemod/scripting/include/sourcecomms.inc @@ -29,6 +29,12 @@ #endif #define _sourcecomms_included +#define SBPPComms_VERSION_MAJOR "1" +#define SBPPComms_VERSION_MINOR "8" +#define SBPPComms_VERSION_PATCH "3" + +#define SBPPComms_VERSION SBPPComms_VERSION_MAJOR..."."...SBPPComms_VERSION_MINOR..."."...SBPPComms_VERSION_PATCH + /** * @section Int definitions for punishments types. */ @@ -134,5 +140,4 @@ public void __pl_sourcecomms_SetNTVOptional() MarkNativeAsOptional("SourceComms_SetClientGag"); MarkNativeAsOptional("SourceComms_GetClientMuteType"); MarkNativeAsOptional("SourceComms_GetClientGagType"); - } diff --git a/game/addons/sourcemod/scripting/sbpp_comms.sp b/game/addons/sourcemod/scripting/sbpp_comms.sp index 29dfef095..d12d49aed 100644 --- a/game/addons/sourcemod/scripting/sbpp_comms.sp +++ b/game/addons/sourcemod/scripting/sbpp_comms.sp @@ -43,7 +43,6 @@ // Do not edit below this line // //-----------------------------// -#define PLUGIN_VERSION "1.8.1" #define PREFIX "\x04[SourceComms++]\x01 " //GLOBAL DEFINES @@ -134,10 +133,10 @@ int SMCParser ConfigParser; -Handle - g_hFwd_OnPlayerPunished - , g_hFwd_OnPlayerUnpunished - , g_hGagExpireTimer[MAXPLAYERS + 1] = { null, ... } +GlobalForward g_hFwd_OnPlayerPunished + , g_hFwd_OnPlayerUnpunished; + +Handle g_hGagExpireTimer[MAXPLAYERS + 1] = { null, ... } , g_hMuteExpireTimer[MAXPLAYERS + 1] = { null, ... }; bType g_MuteType[MAXPLAYERS + 1]; @@ -170,7 +169,7 @@ public Plugin myinfo = name = "SourceBans++: SourceComms", author = "Alex, SourceBans++ Dev Team", description = "Advanced punishments management for the Source engine in SourceBans style", - version = PLUGIN_VERSION, + version = SBPPComms_VERSION, url = "https://sbpp.github.io" }; @@ -203,7 +202,7 @@ public void OnPluginStart() CvarPort = FindConVar("hostport"); g_hServersWhiteList = new ArrayList(); - CreateConVar("sourcecomms_version", PLUGIN_VERSION, _, FCVAR_SPONLY | FCVAR_REPLICATED | FCVAR_NOTIFY); + CreateConVar("sourcecomms_version", SBPPComms_VERSION, _, FCVAR_SPONLY | FCVAR_REPLICATED | FCVAR_NOTIFY); AddCommandListener(CommandCallback, "sm_gag"); AddCommandListener(CommandCallback, "sm_mute"); AddCommandListener(CommandCallback, "sm_silence"); @@ -222,7 +221,7 @@ public void OnPluginStart() #endif #if defined DEBUG - PrintToServer("Sourcecomms plugin loading. Version %s", PLUGIN_VERSION); + PrintToServer("Sourcecomms plugin loading. Version %s", SBPPComms_VERSION); #endif // Catch config error @@ -660,7 +659,7 @@ public Action CommandCallback(int client, const char[] command, int args) if (type <= TYPE_SILENCE) CreateBlock(client, _, _, type, _, sBuffer); else - ProcessUnBlock(client, _, type, _, sBuffer); + ProcessUnBlock(client, _, type, sBuffer); return Plugin_Stop; } @@ -2430,10 +2429,10 @@ stock void CreateBlock(int client, int targetId = 0, int length = -1, int type, return; } -stock void ProcessUnBlock(int client, int targetId = 0, int type, char[] sReason = "", const char[] sArgs = "") +stock void ProcessUnBlock(int client, int targetId = 0, int type, char[] sReason = "") { #if defined DEBUG - PrintToServer("ProcessUnBlock(admin: %d, target: %d, type: %d, reason: %s, args: %s)", client, targetId, type, sReason, sArgs); + PrintToServer("ProcessUnBlock(admin: %d, target: %d, type: %d, reason: %s)", client, targetId, type, sReason); #endif int target_list[MAXPLAYERS], target_count; diff --git a/game/addons/sourcemod/scripting/sbpp_main.sp b/game/addons/sourcemod/scripting/sbpp_main.sp index 5bc16abcd..74286a8c4 100644 --- a/game/addons/sourcemod/scripting/sbpp_main.sp +++ b/game/addons/sourcemod/scripting/sbpp_main.sp @@ -35,8 +35,6 @@ #pragma newdecls required -#define SB_VERSION "1.8.2" - #if defined _updater_included #define UPDATE_URL "https://sbpp.github.io/updater/updatefile.txt" #endif @@ -120,11 +118,11 @@ int SMCParser ConfigParser; -Handle - g_hFwd_OnBanAdded - , g_hFwd_OnReportAdded - , g_hFwd_OnClientPreAdminCheck - , PlayerRecheck[MAXPLAYERS + 1] = { INVALID_HANDLE, ... }; /* Timer handle */ +GlobalForward g_hFwd_OnBanAdded + , g_hFwd_OnReportAdded + , g_hFwd_OnClientPreAdminCheck; + +Handle PlayerRecheck[MAXPLAYERS + 1] = { INVALID_HANDLE, ... }; /* Timer handle */ DataPack PlayerDataPack[MAXPLAYERS + 1] = { null, ... }; @@ -433,7 +431,7 @@ public Action ChatHook(int client, int args) } // ban him! - PrepareBan(client, g_BanTarget[client], g_BanTime[client], reason, sizeof(reason)); + PrepareBan(client, g_BanTarget[client], g_BanTime[client], reason); // block the reason to be sent in chat return Plugin_Handled; @@ -863,7 +861,7 @@ public int ReasonSelected(Menu menu, MenuAction action, int param1, int param2) } else if (g_BanTarget[param1] != -1 && g_BanTime[param1] != -1) - PrepareBan(param1, g_BanTarget[param1], g_BanTime[param1], info, sizeof(info)); + PrepareBan(param1, g_BanTarget[param1], g_BanTime[param1], info); } case MenuAction_Cancel: @@ -896,7 +894,7 @@ public int HackingSelected(Menu menu, MenuAction action, int param1, int param2) menu.GetItem(param2, key, sizeof(key), _, info, sizeof(info)); if (g_BanTarget[param1] != -1 && g_BanTime[param1] != -1) - PrepareBan(param1, g_BanTarget[param1], g_BanTime[param1], info, sizeof(info)); + PrepareBan(param1, g_BanTarget[param1], g_BanTime[param1], info); } case MenuAction_Cancel: @@ -2387,7 +2385,7 @@ public int Native_SBBanPlayer(Handle plugin, int numParams) } } - PrepareBan(client, target, time, reason, sizeof(reason)); + PrepareBan(client, target, time, reason); return true; } @@ -2662,7 +2660,7 @@ stock void InsertServerInfo() } } -stock void PrepareBan(int client, int target, int time, char[] reason, int size) +stock void PrepareBan(int client, int target, int time, char[] reason) { #if defined DEBUG LogToFile(logFile, "PrepareBan()");