Fixed type names for some functions

Fixed type names for some functions

Author: Cleverson

addons/amxmodx/scripting/PugAdmin.sma

@@ -14,7 +14,7 @@ new g_iAdminCount;
 #define ADMIN_IPADDR	(1<<3)
 #define ADMIN_NAME	(1<<4)
 
-new bool:g_bCaseSensitiveName[33];
+new bool:g_bCaseSensitiveName[MAX_PLAYERS+1];
 
 new g_pMode;
 new g_pPasswordField;
@@ -73,7 +73,7 @@ public plugin_cfg()
 	return g_iAdminCount;
 }
 
-PugGetAccess(id,sName[],sAuth[],sIP[],sPassword[])
+fnGetAccess(id,sName[],sAuth[],sIP[],sPassword[])
 {
 	new index = -1;
 	new iResult = 0;
@@ -227,7 +227,7 @@ PugGetAccess(id,sName[],sAuth[],sIP[],sPassword[])
 	return iResult;
 }
 
-PugAccessUser(id,sName[] = "")
+fnSetAccess(id,sName[] = "")
 {
 	remove_user_flags(id);
 	new sIP[32],sAuth[32],sPassword[32],sPwField[32],sUserName[32];
@@ -247,7 +247,7 @@ PugAccessUser(id,sName[] = "")
 	get_pcvar_string(g_pPasswordField,sPwField,charsmax(sPwField));
 	get_user_info(id,sPwField,sPassword,charsmax(sPassword));
 
-	new iResult = PugGetAccess(id,sUserName,sAuth,sIP,sPassword);
+	new iResult = fnGetAccess(id,sUserName,sAuth,sIP,sPassword);
 
 	if(iResult & 1)
 	{
@@ -286,14 +286,14 @@ public client_infochanged(id)
 		{
 			if(!equal(sName[0],sName[1]))
 			{
-				PugAccessUser(id,sName[1]);
+				fnSetAccess(id,sName[1]);
 			}
 		}
 		else
 		{
 			if(!equali(sName[0],sName[1]))
 			{
-				PugAccessUser(id,sName[1]);
+				fnSetAccess(id,sName[1]);
 			}
 		}
 	}
@@ -305,14 +305,14 @@ public client_authorized(id)
 {
 	g_bCaseSensitiveName[id] = false;
 
-	return get_pcvar_num(g_pMode) ? PugAccessUser(id) : PLUGIN_CONTINUE;
+	return get_pcvar_num(g_pMode) ? fnSetAccess(id) : PLUGIN_CONTINUE;
 }
 
 public client_putinserver(id)
 {
 	if(!is_dedicated_server() && (id == 1))
 	{
-		return get_pcvar_num(g_pMode) ? PugAccessUser(id) : PLUGIN_CONTINUE;
+		return get_pcvar_num(g_pMode) ? fnSetAccess(id) : PLUGIN_CONTINUE;
 	}
 
 	return PLUGIN_CONTINUE;

addons/amxmodx/scripting/PugAux.sma

@@ -11,8 +11,8 @@
 
 #pragma semicolon 1
 
-new g_iHits[MAX_PLAYERS][MAX_PLAYERS];
-new g_iDamage[MAX_PLAYERS][MAX_PLAYERS];
+new g_iHits[MAX_PLAYERS+1][MAX_PLAYERS+1];
+new g_iDamage[MAX_PLAYERS+1][MAX_PLAYERS+1];
 
 new bool:g_bRound;
 
@@ -23,16 +23,16 @@ public plugin_init()
 	register_dictionary("PugCore.txt");
 	register_dictionary("PugAux.txt");
 
-	PugRegisterCommand("hp","CommandHP",ADMIN_ALL,"PUG_DESC_HP");
-	PugRegisterCommand("dmg","CommandDamage",ADMIN_ALL,"PUG_DESC_DMG");
-	PugRegisterCommand("rdmg","CommandRecivedDamage",ADMIN_ALL,"PUG_DESC_RDMG");
-	PugRegisterCommand("sum","CommandSummary",ADMIN_ALL,"PUG_DESC_SUM");
+	PugRegisterCommand("hp","fnHP",ADMIN_ALL,"PUG_DESC_HP");
+	PugRegisterCommand("dmg","fnDamage",ADMIN_ALL,"PUG_DESC_DMG");
+	PugRegisterCommand("rdmg","fnRecivedDamage",ADMIN_ALL,"PUG_DESC_RDMG");
+	PugRegisterCommand("sum","fnSummary",ADMIN_ALL,"PUG_DESC_SUM");
 
-	PugRegisterAdminCommand("kick","CommandKick",PUG_CMD_LVL,"PUG_DESC_KICK");
-	PugRegisterAdminCommand("map","CommandMap",PUG_CMD_LVL,"PUG_DESC_MAP");
-	PugRegisterAdminCommand("msg","CommandMessage",PUG_CMD_LVL,"PUG_DESC_MSG");
-	PugRegisterAdminCommand("kill","CommandKill",PUG_CMD_LVL,"PUG_DESC_KILL");
-	PugRegisterAdminCommand("rcon","CommandRcon",PUG_CMD_LVL,"PUG_DESC_RCON");
+	PugRegisterAdminCommand("kick","fnKick",PUG_CMD_LVL,"PUG_DESC_KICK");
+	PugRegisterAdminCommand("map","fnMap",PUG_CMD_LVL,"PUG_DESC_MAP");
+	PugRegisterAdminCommand("msg","fnMessage",PUG_CMD_LVL,"PUG_DESC_MSG");
+	PugRegisterAdminCommand("kill","fnKill",PUG_CMD_LVL,"PUG_DESC_KILL");
+	PugRegisterAdminCommand("rcon","fnRcon",PUG_CMD_LVL,"PUG_DESC_RCON");
 }
 
 public client_disconnected(id,bool:bDrop,szMessage[],iLen)
@@ -66,7 +66,7 @@ public PugEventRoundEnd()
 	g_bRound = false;
 }
 
-public CommandHP(id)
+public fnHP(id)
 {
 	new iStage = GET_PUG_STAGE();
 
@@ -127,7 +127,7 @@ public CommandHP(id)
 	return PLUGIN_HANDLED;
 }
 
-public CommandDamage(id)
+public fnDamage(id)
 {
 	new iStage = GET_PUG_STAGE();
 
@@ -211,7 +211,7 @@ public CommandDamage(id)
 	return PLUGIN_HANDLED;
 }
 
-public CommandRecivedDamage(id)
+public fnRecivedDamage(id)
 {
 	new iStage = GET_PUG_STAGE();
 
@@ -295,7 +295,7 @@ public CommandRecivedDamage(id)
 	return PLUGIN_HANDLED;
 }
 
-public CommandSummary(id)
+public fnSummary(id)
 {
 	new iStage = GET_PUG_STAGE();
 
@@ -370,7 +370,7 @@ public CommandSummary(id)
 	return PLUGIN_HANDLED;
 }
 
-public CommandKick(id)
+public fnKick(id)
 {
 	if(!access(id,PUG_CMD_LVL) && (id != 0))
 	{
@@ -391,14 +391,7 @@ public CommandKick(id)
 			read_argv(2,sReason,charsmax(sReason));
 			remove_quotes(sReason);
 
-			if(sReason[0])
-			{
-				PugDisconnect(iPlayer,sReason);
-			}
-			else
-			{
-				PugDisconnect(iPlayer);
-			}
+			server_cmd("kick #%i %s",get_user_userid(iPlayer),sReason);
 		}
 		else
 		{
@@ -409,7 +402,7 @@ public CommandKick(id)
 	return PLUGIN_HANDLED;
 }
 
-public CommandMap(id)
+public fnMap(id)
 {
 	if(!access(id,PUG_CMD_LVL) && (id != 0))
 	{
@@ -434,7 +427,7 @@ public CommandMap(id)
 	return PLUGIN_HANDLED;
 }
 
-public CommandMessage(id)
+public fnMessage(id)
 {
 	if(!access(id,PUG_CMD_LVL) && (id != 0))
 	{
@@ -459,7 +452,7 @@ public CommandMessage(id)
 	return PLUGIN_HANDLED;
 }
 
-public CommandKill(id)
+public fnKill(id)
 {
 	if(!access(id,PUG_CMD_LVL) && (id != 0))
 	{
@@ -485,7 +478,7 @@ public CommandKill(id)
 	return PLUGIN_HANDLED;
 }
 
-public CommandRcon(id)
+public fnRcon(id)
 {
 	if(!access(id,PUG_CMD_LVL) && (id != 0))
 	{

addons/amxmodx/scripting/PugConfigs.sma

@@ -14,11 +14,6 @@ new g_pHalfTime;
 new g_pOvertime;
 new g_pFinished;
 
-new g_pPlayersMax;
-new g_pVisibleMaxPlayers;
-
-new bool:g_bLive;
-
 public plugin_init()
 {
 	register_plugin("Pug Mod (Configs)",PUG_MOD_VERSION,PUG_MOD_AUTHOR);
@@ -30,88 +25,49 @@ public plugin_init()
 	g_pHalfTime	= create_cvar("pug_config_halftime","halftime.rc",FCVAR_NONE,"Used at half-time session");
 	g_pOvertime	= create_cvar("pug_config_overtime","esl-ot.rc",FCVAR_NONE,"Used at Overtime session");
 	g_pFinished	= create_cvar("pug_config_end","end.rc",FCVAR_NONE,"Executed when the match ends");
-	
-	g_pPlayersMax		= get_cvar_pointer("pug_players_max");
-	g_pVisibleMaxPlayers	= get_cvar_pointer("sv_visiblemaxplayers");
 }
 
 public plugin_cfg()
 {
-	g_bLive = false;
-	
-	Exec(g_pPugMod);
-	
-	set_pcvar_num(g_pVisibleMaxPlayers,get_pcvar_num(g_pPlayersMax));
-}
-
-public client_authorized(id)
-{
-	if(g_bLive)
-	{
-		set_pcvar_num(g_pVisibleMaxPlayers,get_pcvar_num(g_pPlayersMax));
-	}
-}
-
-public client_disconnected(id,bool:bDrop,szMessage[],iLen)
-{
-	if(g_bLive)
-	{
-		set_pcvar_num(g_pVisibleMaxPlayers,get_pcvar_num(g_pPlayersMax) + 1);
-	}
+	fnExec(g_pPugMod);
 }
 
 public PugEventWarmup()
 {
-	g_bLive = false;
-	
-	Exec(g_pWarmup);
-	
-	set_pcvar_num(g_pVisibleMaxPlayers,get_pcvar_num(g_pPlayersMax));
+	fnExec(g_pWarmup);
 }
 
 public PugEventStart()
 {
-	g_bLive = false;
-	
-	Exec(g_pStart);
+	fnExec(g_pStart);
 }
 
 public PugEventFirstHalf()
 {
-	g_bLive = true;
-	
-	Exec(g_pLive);
+	fnExec(g_pLive);
 }
 
 public PugEventHalfTime()
 {
-	g_bLive = true;
-	
-	Exec(g_pHalfTime);
+	fnExec(g_pHalfTime);
 }
 
 public PugEventSecondHalf()
 {
-	g_bLive = true;
-	
-	Exec(g_pLive);
+	fnExec(g_pLive);
 }
 
 public PugEventOvertime()
 {
-	g_bLive = true;
-	
-	Exec(g_pOvertime);
+	fnExec(g_pOvertime);
 }
 
 public PugEventEnd()
 {
-	g_bLive = false;
-	
-	Exec(g_pFinished);
+	fnExec(g_pFinished);
 }
 
-Exec(hConvar)
+fnExec(hConvar)
 {
 	new sFile[32];
 	get_pcvar_string(hConvar,sFile,charsmax(sFile));
@@ -126,4 +82,4 @@ Exec(hConvar)
 		server_cmd("exec %s",sDir);
 		server_exec();
 	}
-}
+}