feat(superlogs-css): sourcemod 1.11 syntax support (#16)

Author: Rushaway

sourcemod/scripting/superlogs-css.sp

@@ -20,20 +20,21 @@
  */
 
 #pragma semicolon 1
+#pragma newdecls required
 
 #include <sourcemod>
 #include <sdktools>
 
 #define NAME "SuperLogs: CSS"
-#define VERSION "1.2.4"
+#define VERSION "1.2.5"
 
 #define MAX_LOG_WEAPONS 28
 #define IGNORE_SHOTS_START 25
 #define MAX_WEAPON_LEN 13
 
 
-new g_weapon_stats[MAXPLAYERS+1][MAX_LOG_WEAPONS][15];
-new const String:g_weapon_list[MAX_LOG_WEAPONS][MAX_WEAPON_LEN] = {
+int g_weapon_stats[MAXPLAYERS+1][MAX_LOG_WEAPONS][15];
+char g_weapon_list[MAX_LOG_WEAPONS][MAX_WEAPON_LEN] = {
 									"ak47", 
 									"m4a1",
 									"awp", 
@@ -64,62 +65,51 @@ new const String:g_weapon_list[MAX_LOG_WEAPONS][MAX_WEAPON_LEN] = {
 									"flashbang"
 								};
 
-new Handle:g_cvar_wstats = INVALID_HANDLE;
-new Handle:g_cvar_headshots = INVALID_HANDLE;
-new Handle:g_cvar_actions = INVALID_HANDLE;
-new Handle:g_cvar_locations = INVALID_HANDLE;
-new Handle:g_cvar_ktraj = INVALID_HANDLE;
-new Handle:g_cvar_version = INVALID_HANDLE;
+Handle g_cvar_wstats = INVALID_HANDLE;
+Handle g_cvar_headshots = INVALID_HANDLE;
+Handle g_cvar_actions = INVALID_HANDLE;
+Handle g_cvar_locations = INVALID_HANDLE;
+Handle g_cvar_ktraj = INVALID_HANDLE;
+Handle g_cvar_version = INVALID_HANDLE;
 
-new bool:g_logwstats = true;
-new bool:g_logheadshots = true;
-new bool:g_logactions = true;
-new bool:g_loglocations = true;
-new bool:g_logktraj = false;
+bool g_logwstats = true;
+bool g_logheadshots = true;
+bool g_logactions = true;
+bool g_loglocations = true;
+bool g_logktraj = false;
 
 #include <loghelper>
 #include <wstatshelper>
 
 
-public Plugin:myinfo = {
+public Plugin myinfo = {
 	name = NAME,
 	author = "psychonic",
 	description = "Advanced logging for CSS. Generates auxilary logging for use with log parsers such as HLstatsX and Psychostats",
 	version = VERSION,
 	url = "http://www.hlxcommunity.com"
 };
 
-#if SOURCEMOD_V_MAJOR >= 1 && SOURCEMOD_V_MINOR >= 3
-public APLRes:AskPluginLoad2(Handle:myself, bool:late, String:error[], err_max)
-#else
-public bool:AskPluginLoad(Handle:myself, bool:late, String:error[], err_max)
-#endif
+public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max)
 {
-	decl String:game_description[64];
+	char game_description[64];
 	GetGameDescription(game_description, sizeof(game_description), true);
 	if (StrContains(game_description, "Counter-Strike", false) == -1)
 	{
-		decl String:game_folder[64];
+		char game_folder[64];
 		GetGameFolderName(game_folder, sizeof(game_folder));
 		if (StrContains(game_folder, "cstrike", false) == -1)
 		{
 			strcopy(error, err_max, "This plugin is only supported on CS:S");
-			#if SOURCEMOD_V_MAJOR >= 1 && SOURCEMOD_V_MINOR >= 3
-				return APLRes_Failure;
-			#else
-				return false;
-			#endif
+			return APLRes_Failure;
 		}
 	}
-#if SOURCEMOD_V_MAJOR >= 1 && SOURCEMOD_V_MINOR >= 3
+
 	return APLRes_Success;
-#else
-	return true;
-#endif
 }
 
 
-public OnPluginStart()
+public void OnPluginStart()
 {
 	CreatePopulateWeaponTrie();
 
@@ -155,19 +145,19 @@ public OnPluginStart()
 }
 
 
-public OnMapStart()
+public void OnMapStart()
 {
 	GetTeams();
 }
 
-public OnConfigsExecuted()
+public void OnConfigsExecuted()
 {
-	decl String:version[255];
+	char version[255];
 	GetConVarString(g_cvar_version, version, sizeof(version));
 	SetConVarString(g_cvar_version, version);
 }
 
-hook_wstats()
+stock void hook_wstats()
 {
 	HookEvent("weapon_fire", Event_PlayerShoot);
 	HookEvent("player_hurt", Event_PlayerHurt);
@@ -176,7 +166,7 @@ hook_wstats()
 	HookEvent("player_disconnect", Event_PlayerDisconnect, EventHookMode_Pre);
 }
 
-unhook_wstats()
+stock void unhook_wstats()
 {
 	UnhookEvent("weapon_fire", Event_PlayerShoot);
 	UnhookEvent("player_hurt", Event_PlayerHurt);
@@ -185,33 +175,33 @@ unhook_wstats()
 	UnhookEvent("player_disconnect", Event_PlayerDisconnect, EventHookMode_Pre);
 }
 
-hook_actions()
+stock void hook_actions()
 {
 	HookEvent("round_mvp", Event_RoundMVP);
 }
 
-unhook_actions()
+stock void unhook_actions()
 {
 	UnhookEvent("round_mvp", Event_RoundMVP);
 }
 
-public OnClientPutInServer(client)
+public void OnClientPutInServer(int client)
 {
 	reset_player_stats(client);
 }
 
 
-public Event_PlayerShoot(Handle:event, const String:name[], bool:dontBroadcast)
+public void Event_PlayerShoot(Handle event, const char[] name, bool dontBroadcast)
 {
 	// "userid"        "short"
 	// "weapon"        "string"        // weapon name used
 
-	new attacker   = GetClientOfUserId(GetEventInt(event, "userid"));
+	int attacker   = GetClientOfUserId(GetEventInt(event, "userid"));
 	if (attacker > 0)
 	{
-		decl String: weapon[MAX_WEAPON_LEN];
+		char  weapon[MAX_WEAPON_LEN];
 		GetEventString(event, "weapon", weapon, sizeof(weapon));
-		new weapon_index = get_weapon_index(weapon);
+		int weapon_index = get_weapon_index(weapon);
 		if (weapon_index > -1 && weapon_index < IGNORE_SHOTS_START)
 		{
 			g_weapon_stats[attacker][weapon_index][LOG_HIT_SHOTS]++;
@@ -220,7 +210,7 @@ public Event_PlayerShoot(Handle:event, const String:name[], bool:dontBroadcast)
 }
 
 
-public Event_PlayerHurt(Handle:event, const String:name[], bool:dontBroadcast)
+public void Event_PlayerHurt(Handle event, const char[] name, bool dontBroadcast)
 {
 	//	"userid"        "short"         // player index who was hurt
 	//	"attacker"      "short"         // player index who attacked
@@ -231,17 +221,17 @@ public Event_PlayerHurt(Handle:event, const String:name[], bool:dontBroadcast)
 	//	"dmg_armor"     "byte"          // damage done to armor
 	//	"hitgroup"      "byte"          // hitgroup that was damaged
 
-	new attacker  = GetClientOfUserId(GetEventInt(event, "attacker"));
+	int attacker  = GetClientOfUserId(GetEventInt(event, "attacker"));
 
 	if (attacker > 0) {
-		decl String: weapon[MAX_WEAPON_LEN];
+		char  weapon[MAX_WEAPON_LEN];
 		GetEventString(event, "weapon", weapon, sizeof(weapon));
-		new weapon_index = get_weapon_index(weapon);
+		int weapon_index = get_weapon_index(weapon);
 		if (weapon_index > -1)
 		{
 			g_weapon_stats[attacker][weapon_index][LOG_HIT_HITS]++;
 			g_weapon_stats[attacker][weapon_index][LOG_HIT_DAMAGE] += GetEventInt(event, "dmg_health");
-			new hitgroup  = GetEventInt(event, "hitgroup");
+			int hitgroup  = GetEventInt(event, "hitgroup");
 			if (hitgroup < 8)
 			{
 				g_weapon_stats[attacker][weapon_index][hitgroup + LOG_HIT_OFFSET]++;
@@ -251,14 +241,14 @@ public Event_PlayerHurt(Handle:event, const String:name[], bool:dontBroadcast)
 }
 
 
-public Action:Event_PlayerDeathPre(Handle:event, const String:name[], bool:dontBroadcast)
+public Action Event_PlayerDeathPre(Handle event, const char[] name, bool dontBroadcast)
 {
 	// "userid"        "short"         // user ID who died                             
 	// "attacker"      "short"         // user ID who killed
 	// "weapon"        "string"        // weapon name killer used 
 	// "headshot"      "bool"          // signals a headshot
 
-	new attacker = GetEventInt(event, "attacker");
+	int attacker = GetEventInt(event, "attacker");
 	if (g_loglocations)
 	{
 		LogKillLoc(GetClientOfUserId(attacker), GetClientOfUserId(GetEventInt(event, "userid")));
@@ -272,7 +262,7 @@ public Action:Event_PlayerDeathPre(Handle:event, const String:name[], bool:dontB
 	return Plugin_Continue;
 }
 
-public Event_PlayerDeath(Handle:event, const String:name[], bool:dontBroadcast)
+public void Event_PlayerDeath(Handle event, const char[] name, bool dontBroadcast)
 {
 	// this extents the original player_death by a new fields
 	// "userid"        "short"         // user ID who died                             
@@ -282,9 +272,9 @@ public Event_PlayerDeath(Handle:event, const String:name[], bool:dontBroadcast)
 	// "dominated"    "short"        // did killer dominate victim with this kill
 	// "revenge"    "short"        // did killer get revenge on victim with this kill
 
-	new victim   = GetClientOfUserId(GetEventInt(event, "userid"));
-	new attacker = GetClientOfUserId(GetEventInt(event, "attacker"));
-	decl String: weapon[MAX_WEAPON_LEN];
+	int victim   = GetClientOfUserId(GetEventInt(event, "userid"));
+	int attacker = GetClientOfUserId(GetEventInt(event, "attacker"));
+	char  weapon[MAX_WEAPON_LEN];
 	GetEventString(event, "weapon", weapon, sizeof(weapon));
 
 	if (attacker <= 0 || victim <= 0)
@@ -294,7 +284,7 @@ public Event_PlayerDeath(Handle:event, const String:name[], bool:dontBroadcast)
 
 	if (g_logwstats)
 	{
-		new weapon_index = get_weapon_index(weapon);
+		int weapon_index = get_weapon_index(weapon);
 		if (weapon_index > -1)
 		{
 			g_weapon_stats[attacker][weapon_index][LOG_HIT_KILLS]++;
@@ -328,45 +318,46 @@ public Event_PlayerDeath(Handle:event, const String:name[], bool:dontBroadcast)
 	}
 }
 
-public Event_PlayerSpawn(Handle:event, const String:name[], bool:dontBroadcast)
+public void Event_PlayerSpawn(Handle event, const char[] name, bool dontBroadcast)
 {
 	// "userid"        "short"         // user ID on server          
 
-	new client = GetClientOfUserId(GetEventInt(event, "userid"));
+	int client = GetClientOfUserId(GetEventInt(event, "userid"));
 	if (client > 0)
 	{
 		reset_player_stats(client);
 	}
 }
 
-public Event_RoundEnd(Handle:event, const String:name[], bool:dontBroadcast)
+public void Event_RoundEnd(Handle event, const char[] name, bool dontBroadcast)
 {
 	WstatsDumpAll();
 }
 
-public Event_RoundMVP(Handle:event, const String:name[], bool:dontBroadcast)
+public void Event_RoundMVP(Handle event, const char[] name, bool dontBroadcast)
 {
 	LogPlayerEvent(GetClientOfUserId(GetEventInt(event, "userid")), "triggered", "round_mvp");
 }
 
-public Action:Event_PlayerDisconnect(Handle:event, const String:name[], bool:dontBroadcast)
+public Action Event_PlayerDisconnect(Handle event, const char[] name, bool dontBroadcast)
 {
-	new client = GetClientOfUserId(GetEventInt(event, "userid"));
+	int client = GetClientOfUserId(GetEventInt(event, "userid"));
 	OnPlayerDisconnect(client);
 	return Plugin_Continue;
 }
 
 
-public Action:LogMap(Handle:timer)
+public Action LogMap(Handle timer)
 {
 	// Called 1 second after OnPluginStart since srcds does not log the first map loaded. Idea from Stormtrooper's "mapfix.sp" for psychostats
 	LogMapLoad();
+	return Plugin_Stop;
 }
 
 
-public OnCvarWstatsChange(Handle:cvar, const String:oldVal[], const String:newVal[])
+public void OnCvarWstatsChange(Handle cvar, const char[] oldVal, const char[] newVal)
 {
-	new bool:old_value = g_logwstats;
+	bool old_value = g_logwstats;
 	g_logwstats = GetConVarBool(g_cvar_wstats);
 
 	if (old_value != g_logwstats)
@@ -390,9 +381,9 @@ public OnCvarWstatsChange(Handle:cvar, const String:oldVal[], const String:newVa
 	}
 }
 
-public OnCvarActionsChange(Handle:cvar, const String:oldVal[], const String:newVal[])
+public void OnCvarActionsChange(Handle cvar, const char[] oldVal, const char[] newVal)
 {
-	new bool:old_value = g_logactions;
+	bool old_value = g_logactions;
 	g_logactions = GetConVarBool(g_cvar_actions);
 
 	if (old_value != g_logactions)
@@ -416,9 +407,9 @@ public OnCvarActionsChange(Handle:cvar, const String:oldVal[], const String:newV
 	}
 }
 
-public OnCvarHeadshotsChange(Handle:cvar, const String:oldVal[], const String:newVal[])
+public void OnCvarHeadshotsChange(Handle cvar, const char[] oldVal, const char[] newVal)
 {
-	new bool:old_value = g_logheadshots;
+	bool old_value = g_logheadshots;
 	g_logheadshots = GetConVarBool(g_cvar_headshots);
 
 	if (old_value != g_logheadshots)
@@ -434,9 +425,9 @@ public OnCvarHeadshotsChange(Handle:cvar, const String:oldVal[], const String:ne
 	}
 }
 
-public OnCvarLocationsChange(Handle:cvar, const String:oldVal[], const String:newVal[])
+public void OnCvarLocationsChange(Handle cvar, const char[] oldVal, const char[] newVal)
 {
-	new bool:old_value = g_loglocations;
+	bool old_value = g_loglocations;
 	g_loglocations = GetConVarBool(g_cvar_locations);
 
 	if (old_value != g_loglocations)
@@ -452,9 +443,9 @@ public OnCvarLocationsChange(Handle:cvar, const String:oldVal[], const String:ne
 	}
 }
 
-public OnCvarKtrajChange(Handle:cvar, const String:oldVal[], const String:newVal[])
+public void OnCvarKtrajChange(Handle cvar, const char[] oldVal, const char[] newVal)
 {
-	new bool:old_value = g_logktraj;
+	bool old_value = g_logktraj;
 	g_logktraj = GetConVarBool(g_cvar_ktraj);
 
 	if (old_value != g_logktraj)
@@ -468,4 +459,4 @@ public OnCvarKtrajChange(Handle:cvar, const String:oldVal[], const String:newVal
 			UnhookEvent("player_death", Event_PlayerDeath);
 		}
 	}
-}
+}