Fixed type names for functions

Cleverson · Cleverson · commit 82577cfd743d · 2016-11-11T01:50:20.000-02:00
diff --git a/addons/amxmodx/scripting/PugReady.sma b/addons/amxmodx/scripting/PugReady.sma
@@ -13,7 +13,7 @@
 #define TASK_AUTO 1901
 
 new bool:g_bReadySystem;
-new g_bReady[MAX_PLAYERS];
+new g_bReady[MAX_PLAYERS+1];
 
 new g_pAutoReadyTime;
 new g_pAutoReadyKick;
@@ -40,21 +40,15 @@ public plugin_init()
 	g_pRoundsMax	= get_cvar_pointer("pug_rounds_max");
 	g_pHandleTime	= get_cvar_pointer("pug_intermission_time");
 	
-	PugRegisterCommand("ready","ReadyUp",ADMIN_ALL,"PUG_DESC_READY");
-	PugRegisterCommand("notready","ReadyDown",ADMIN_ALL,"PUG_DESC_NOTREADY");
+	PugRegisterCommand("ready","fnReadyUp",ADMIN_ALL,"PUG_DESC_READY");
+	PugRegisterCommand("notready","fnReadyDown",ADMIN_ALL,"PUG_DESC_NOTREADY");
 	
-	PugRegisterAdminCommand("forceready","ForceReady",PUG_CMD_LVL,"PUG_DESC_FORCEREADY");
+	PugRegisterAdminCommand("forceready","fnForceReady",PUG_CMD_LVL,"PUG_DESC_FORCEREADY");
 	
-	register_event("ResetHUD","KeepMenu","b");
+	register_event("ResetHUD","fnKeepMenu","b");
 	
-	hook_cvar_change(g_pPlayersMin,"KeepMenu");
-	hook_cvar_change(get_cvar_pointer("amx_language"),"KeepMenu");
-}
-
-public client_putinserver(id)
-{
-	g_bReady[id] = false;
-	KeepMenu();
+	hook_cvar_change(g_pPlayersMin,"fnKeepMenu");
+	hook_cvar_change(get_cvar_pointer("amx_language"),"fnKeepMenu");
 }
 
 public client_disconnected(id,bool:bDrop,szMessage[],iLen)
@@ -64,42 +58,52 @@ public client_disconnected(id,bool:bDrop,szMessage[],iLen)
 		remove_task(id + TASK_AUTO);
 	}
 	
-	set_task(0.1,"KeepMenu");
+	if(g_bReadySystem)
+	{
+		set_task(0.1,"fnKeepMenu");
+	}
 }
 
 public client_infochanged(id)
 {
-	set_task(0.1,"KeepMenu");
+	if(g_bReadySystem)
+	{
+		set_task(0.1,"fnKeepMenu");
+	}
 }
 
 public PugPlayerJoined(id,CsTeams:iTeam)
 {
 	if(g_bReadySystem)
 	{
+		g_bReady[id] = false;
+		
 		new Float:fReadyTime = get_pcvar_float(g_pAutoReadyTime);
 		
 		if(fReadyTime && !is_user_bot(id))
 		{
-			set_task(fReadyTime,"ReadyTimeOut",id + TASK_AUTO);
+			set_task(fReadyTime,"fnReadyTimeOut",id + TASK_AUTO);
 			
 			new sTime[32];
 			get_time_length(id,floatround(fReadyTime),timeunit_seconds,sTime,charsmax(sTime));
 	
 			client_print_color(id,print_team_red,"%s %L",g_sHead,LANG_SERVER,get_pcvar_num(g_pAutoReadyKick) ? "PUG_SAY_READY_KICK" : "PUG_SAY_READY_AUTO",sTime);
 		}
+		
+		fnKeepMenu();
 	}
 }
 
 public PugEventWarmup()
 {
-	PugReadySystem(true);
+	fnReadySystem(true);
 }
 
 public PugEventStart()
 {
 	if(g_bReadySystem)
 	{
-		PugReadySystem(false);
+		fnReadySystem(false);
 	}
 }
 
@@ -108,106 +112,105 @@ public PugEventHalfTime()
 	if(get_pcvar_num(g_pAutoStartHalf) && (PugGetPlayers(1) >= get_pcvar_num(g_pPlayersMin)))
 	{
 		arrayset(g_bReady,true,sizeof(g_bReady));
-		set_task(get_pcvar_float(g_pHandleTime),"CheckReady",TASK_AUTO);
+		set_task(get_pcvar_float(g_pHandleTime),"fnCheckReady",TASK_AUTO);
 	}
 	else
 	{
-		PugReadySystem(true);
+		fnReadySystem(true);
 	}
 }
 
 public PugEventSecondHalf()
 {
 	if(g_bReadySystem)
 	{
-		PugReadySystem(false);
+		fnReadySystem(false);
 	}
 }
 
 public PugEventOvertime()
 {
 	if(g_bReadySystem)
 	{
-		PugReadySystem(false);
+		fnReadySystem(false);
 	}
 }
 
-PugReadySystem(bool:bActive)
+fnReadySystem(bool:bActive)
 {
-	switch(g_bReadySystem = bActive)
-	{
-		case true:
-		{
-			arrayset(g_bReady,0,sizeof(g_bReady));
-			KeepMenu();
+	g_bReadySystem = bActive;
 	
-			client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_SAY_READY");
-		}
-		case false:
-		{
-			PugReadyDisPlay(0.0);
-			arrayset(g_bReady,0,sizeof(g_bReady));
-			
-			client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_ALL_READY");
-		}
+	if(g_bReadySystem)
+	{
+		fnKeepMenu();
+		arrayset(g_bReady,0,sizeof(g_bReady));
+		client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_SAY_READY");
+	}
+	else
+	{
+		arrayset(g_bReady,0,sizeof(g_bReady));
+		client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_ALL_READY");
 	}
 }
 
-public KeepMenu()
+public fnKeepMenu()
 {
 	if(g_bReadySystem)
 	{
-		PugReadyDisPlay(9999.0);
+		fnDisplay(999.0);
 	}
 }
 
-PugReadyDisPlay(Float:fHoldTime)
+fnDisplay(Float:fHoldTime)
 {
-	new iPlayersNum,iReadys;
-	new sReady[256],sNotReady[256],sName[MAX_NAME_LENGTH];
-	
-	new iPlayers[MAX_PLAYERS],iNum,iPlayer;
-	get_players(iPlayers,iNum,"ch");
-	
-	for(new i;i < iNum;i++)
+	if(g_bReadySystem)
 	{
-		iPlayer = iPlayers[i];
+		new iPlayers[MAX_PLAYERS],iNum,iPlayer;
+		get_players(iPlayers,iNum,"ch");
 		
-		if(!PugIsTeam(iPlayer))
+		new iPlayersNum,iReadys;
+		new sList[2][512],sName[MAX_NAME_LENGTH];
+		
+		for(new i;i < iNum;i++)
 		{
-			continue;
-		}
+			iPlayer = iPlayers[i];
+			
+			if(!PugIsTeam(iPlayer))
+			{
+				continue;
+			}
+		
+			iPlayersNum++;
+			get_user_name(iPlayer,sName,charsmax(sName));
 	
-		iPlayersNum++;
-		get_user_name(iPlayer,sName,charsmax(sName));
-
-		if(g_bReady[iPlayer])
-		{
-			iReadys++;
-			format(sReady,charsmax(sReady),"%s%s^n",sReady,sName);
-		}
-		else
-		{
-			format(sNotReady,charsmax(sNotReady),"%s%s^n",sNotReady,sName);
+			if(g_bReady[iPlayer])
+			{
+				iReadys++;
+				formatex(sList[0],charsmax(sList[]),"%s%s^n",sList[0],sName);
+			}
+			else
+			{
+				formatex(sList[1],charsmax(sList[]),"%s%s^n",sList[1],sName);
+			}
 		}
-	}
+		
+		new iMinPlayers = get_pcvar_num(g_pPlayersMin);
 	
-	new iMinPlayers = get_pcvar_num(g_pPlayersMin);
-
-	set_hudmessage(0,255,0,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,1);
-	show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_UNREADY",(iPlayersNum - iReadys),iMinPlayers);
-
-	set_hudmessage(0,255,0,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,2);
-	show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_READY",iReadys,iMinPlayers);
-
-	set_hudmessage(255,255,225,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,3);
-	show_hudmessage(0,"^n%s",sReady);
-
-	set_hudmessage(255,255,225,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,4);
-	show_hudmessage(0,"^n%s",sNotReady);
+		set_hudmessage(0,255,0,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,1);
+		show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_UNREADY",(iPlayersNum - iReadys),iMinPlayers);
+	
+		set_hudmessage(0,255,0,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,2);
+		show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_READY",iReadys,iMinPlayers);
+	
+		set_hudmessage(255,255,225,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,3);
+		show_hudmessage(0,"^n%s",sList[0]);
+	
+		set_hudmessage(255,255,225,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,4);
+		show_hudmessage(0,"^n%s",sList[1]);
+	}
 }
 
-public ReadyUp(id)
+public fnReadyUp(id)
 {
 	new iStage = GET_PUG_STAGE();
 	
@@ -229,7 +232,7 @@ public ReadyUp(id)
 				
 				client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_PLAYER_READY",sName);
 				
-				CheckReady();
+				fnCheckReady();
 			}
 			else
 			{
@@ -249,7 +252,7 @@ public ReadyUp(id)
 	return PLUGIN_HANDLED;
 }
 
-public ReadyDown(id)
+public fnReadyDown(id)
 {
 	new iStage = GET_PUG_STAGE();
 	
@@ -265,15 +268,15 @@ public ReadyDown(id)
 				
 				if(fReadyTime && get_pcvar_num(g_pAutoReadyKick))
 				{
-					set_task(fReadyTime,"ReadyTimeOut",id + TASK_AUTO);
+					set_task(fReadyTime,"fnReadyTimeOut",id + TASK_AUTO);
 				}
 				
 				new sName[MAX_NAME_LENGTH];
 				get_user_name(id,sName,charsmax(sName));
 				
 				client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_PLAYER_UNREADY",sName);
 				
-				CheckReady();
+				fnCheckReady();
 			}
 			else
 			{
@@ -293,7 +296,7 @@ public ReadyDown(id)
 	return PLUGIN_HANDLED;
 }
 
-public ForceReady(id,iLevel)
+public fnForceReady(id,iLevel)
 {
 	if(!access(id,PUG_CMD_LVL) && (id != 0))
 	{
@@ -311,15 +314,15 @@ public ForceReady(id,iLevel)
 			return PLUGIN_HANDLED;
 		}
 		
-		PugAdminCommandClient(id,"Force .ready","PUG_FORCE_READY",iPlayer,ReadyUp(iPlayer));
+		PugAdminCommandClient(id,"Force .ready","PUG_FORCE_READY",iPlayer,fnReadyUp(iPlayer));
 	}
 	
 	return PLUGIN_HANDLED;
 }
 
-public CheckReady()
+public fnCheckReady()
 {
-	KeepMenu();
+	fnKeepMenu();
 	
 	new iReady = 0;
 	
@@ -333,7 +336,7 @@ public CheckReady()
 
 	if(iReady >= get_pcvar_num(g_pPlayersMin))
 	{
-		PugReadySystem(false);
+		fnReadySystem(false);
 		
 		switch(GET_PUG_STAGE())
 		{
@@ -356,19 +359,15 @@ public CheckReady()
 	}
 }
 
-public ReadyTimeOut(id)
+public fnReadyTimeOut(id)
 {
 	id -= TASK_AUTO;
 	
 	if(g_bReadySystem && is_user_connected(id))
 	{
 		if(PugIsTeam(id))
 		{
-			if(get_pcvar_num(g_pAutoReadyKick) <= 0)
-			{
-				ReadyUp(id);
-			}
-			else
+			if(get_pcvar_num(g_pAutoReadyKick) > 0)
 			{
 				new iReadyTime = get_pcvar_num(g_pAutoReadyTime);
 					
@@ -381,8 +380,12 @@ public ReadyTimeOut(id)
 					sTime,
 					charsmax(sTime)
 				);
-
-				PugDisconnect(id,"%L",LANG_SERVER,"PUG_FORCE_READY_KICK",sTime);
+				
+				server_cmd("kick #%i ^"%L^"",get_user_userid(id),LANG_SERVER,"PUG_FORCE_READY_KICK",sTime);
+			}
+			else
+			{
+				fnReadyUp(id);
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#define TASK_AUTO 1901`
`14`	`14`
`15`	`15`	`new bool:g_bReadySystem;`
`16`		`-new g_bReady[MAX_PLAYERS];`
	`16`	`+new g_bReady[MAX_PLAYERS+1];`
`17`	`17`
`18`	`18`	`new g_pAutoReadyTime;`
`19`	`19`	`new g_pAutoReadyKick;`
`@@ -40,21 +40,15 @@ public plugin_init()`
`40`	`40`	`g_pRoundsMax = get_cvar_pointer("pug_rounds_max");`
`41`	`41`	`g_pHandleTime = get_cvar_pointer("pug_intermission_time");`
`42`	`42`
`43`		`- PugRegisterCommand("ready","ReadyUp",ADMIN_ALL,"PUG_DESC_READY");`
`44`		`- PugRegisterCommand("notready","ReadyDown",ADMIN_ALL,"PUG_DESC_NOTREADY");`
	`43`	`+ PugRegisterCommand("ready","fnReadyUp",ADMIN_ALL,"PUG_DESC_READY");`
	`44`	`+ PugRegisterCommand("notready","fnReadyDown",ADMIN_ALL,"PUG_DESC_NOTREADY");`
`45`	`45`
`46`		`- PugRegisterAdminCommand("forceready","ForceReady",PUG_CMD_LVL,"PUG_DESC_FORCEREADY");`
	`46`	`+ PugRegisterAdminCommand("forceready","fnForceReady",PUG_CMD_LVL,"PUG_DESC_FORCEREADY");`
`47`	`47`
`48`		`- register_event("ResetHUD","KeepMenu","b");`
	`48`	`+ register_event("ResetHUD","fnKeepMenu","b");`
`49`	`49`
`50`		`- hook_cvar_change(g_pPlayersMin,"KeepMenu");`
`51`		`- hook_cvar_change(get_cvar_pointer("amx_language"),"KeepMenu");`
`52`		`-}`
`53`		`-`
`54`		`-public client_putinserver(id)`
`55`		`-{`
`56`		`- g_bReady[id] = false;`
`57`		`- KeepMenu();`
	`50`	`+ hook_cvar_change(g_pPlayersMin,"fnKeepMenu");`
	`51`	`+ hook_cvar_change(get_cvar_pointer("amx_language"),"fnKeepMenu");`
`58`	`52`	`}`
`59`	`53`
`60`	`54`	`public client_disconnected(id,bool:bDrop,szMessage[],iLen)`
`@@ -64,42 +58,52 @@ public client_disconnected(id,bool:bDrop,szMessage[],iLen)`
`64`	`58`	`remove_task(id + TASK_AUTO);`
`65`	`59`	`}`
`66`	`60`
`67`		`- set_task(0.1,"KeepMenu");`
	`61`	`+ if(g_bReadySystem)`
	`62`	`+ {`
	`63`	`+ set_task(0.1,"fnKeepMenu");`
	`64`	`+ }`
`68`	`65`	`}`
`69`	`66`
`70`	`67`	`public client_infochanged(id)`
`71`	`68`	`{`
`72`		`- set_task(0.1,"KeepMenu");`
	`69`	`+ if(g_bReadySystem)`
	`70`	`+ {`
	`71`	`+ set_task(0.1,"fnKeepMenu");`
	`72`	`+ }`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public PugPlayerJoined(id,CsTeams:iTeam)`
`76`	`76`	`{`
`77`	`77`	`if(g_bReadySystem)`
`78`	`78`	`{`
	`79`	`+ g_bReady[id] = false;`
	`80`	`+`
`79`	`81`	`new Float:fReadyTime = get_pcvar_float(g_pAutoReadyTime);`
`80`	`82`
`81`	`83`	`if(fReadyTime && !is_user_bot(id))`
`82`	`84`	`{`
`83`		`- set_task(fReadyTime,"ReadyTimeOut",id + TASK_AUTO);`
	`85`	`+ set_task(fReadyTime,"fnReadyTimeOut",id + TASK_AUTO);`
`84`	`86`
`85`	`87`	`new sTime[32];`
`86`	`88`	`get_time_length(id,floatround(fReadyTime),timeunit_seconds,sTime,charsmax(sTime));`
`87`	`89`
`88`	`90`	`client_print_color(id,print_team_red,"%s %L",g_sHead,LANG_SERVER,get_pcvar_num(g_pAutoReadyKick) ? "PUG_SAY_READY_KICK" : "PUG_SAY_READY_AUTO",sTime);`
`89`	`91`	`}`
	`92`	`+`
	`93`	`+ fnKeepMenu();`
`90`	`94`	`}`
`91`	`95`	`}`
`92`	`96`
`93`	`97`	`public PugEventWarmup()`
`94`	`98`	`{`
`95`		`- PugReadySystem(true);`
	`99`	`+ fnReadySystem(true);`
`96`	`100`	`}`
`97`	`101`
`98`	`102`	`public PugEventStart()`
`99`	`103`	`{`
`100`	`104`	`if(g_bReadySystem)`
`101`	`105`	`{`
`102`		`- PugReadySystem(false);`
	`106`	`+ fnReadySystem(false);`
`103`	`107`	`}`
`104`	`108`	`}`
`105`	`109`
`@@ -108,106 +112,105 @@ public PugEventHalfTime()`
`108`	`112`	`if(get_pcvar_num(g_pAutoStartHalf) && (PugGetPlayers(1) >= get_pcvar_num(g_pPlayersMin)))`
`109`	`113`	`{`
`110`	`114`	`arrayset(g_bReady,true,sizeof(g_bReady));`
`111`		`- set_task(get_pcvar_float(g_pHandleTime),"CheckReady",TASK_AUTO);`
	`115`	`+ set_task(get_pcvar_float(g_pHandleTime),"fnCheckReady",TASK_AUTO);`
`112`	`116`	`}`
`113`	`117`	`else`
`114`	`118`	`{`
`115`		`- PugReadySystem(true);`
	`119`	`+ fnReadySystem(true);`
`116`	`120`	`}`
`117`	`121`	`}`
`118`	`122`
`119`	`123`	`public PugEventSecondHalf()`
`120`	`124`	`{`
`121`	`125`	`if(g_bReadySystem)`
`122`	`126`	`{`
`123`		`- PugReadySystem(false);`
	`127`	`+ fnReadySystem(false);`
`124`	`128`	`}`
`125`	`129`	`}`
`126`	`130`
`127`	`131`	`public PugEventOvertime()`
`128`	`132`	`{`
`129`	`133`	`if(g_bReadySystem)`
`130`	`134`	`{`
`131`		`- PugReadySystem(false);`
	`135`	`+ fnReadySystem(false);`
`132`	`136`	`}`
`133`	`137`	`}`
`134`	`138`
`135`		`-PugReadySystem(bool:bActive)`
	`139`	`+fnReadySystem(bool:bActive)`
`136`	`140`	`{`
`137`		`- switch(g_bReadySystem = bActive)`
`138`		`- {`
`139`		`- case true:`
`140`		`- {`
`141`		`- arrayset(g_bReady,0,sizeof(g_bReady));`
`142`		`- KeepMenu();`
	`141`	`+ g_bReadySystem = bActive;`
`143`	`142`
`144`		`- client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_SAY_READY");`
`145`		`- }`
`146`		`- case false:`
`147`		`- {`
`148`		`- PugReadyDisPlay(0.0);`
`149`		`- arrayset(g_bReady,0,sizeof(g_bReady));`
`150`		`-`
`151`		`- client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_ALL_READY");`
`152`		`- }`
	`143`	`+ if(g_bReadySystem)`
	`144`	`+ {`
	`145`	`+ fnKeepMenu();`
	`146`	`+ arrayset(g_bReady,0,sizeof(g_bReady));`
	`147`	`+ client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_SAY_READY");`
	`148`	`+ }`
	`149`	`+ else`
	`150`	`+ {`
	`151`	`+ arrayset(g_bReady,0,sizeof(g_bReady));`
	`152`	`+ client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_ALL_READY");`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`		`-public KeepMenu()`
	`156`	`+public fnKeepMenu()`
`157`	`157`	`{`
`158`	`158`	`if(g_bReadySystem)`
`159`	`159`	`{`
`160`		`- PugReadyDisPlay(9999.0);`
	`160`	`+ fnDisplay(999.0);`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
`164`		`-PugReadyDisPlay(Float:fHoldTime)`
	`164`	`+fnDisplay(Float:fHoldTime)`
`165`	`165`	`{`
`166`		`- new iPlayersNum,iReadys;`
`167`		`- new sReady[256],sNotReady[256],sName[MAX_NAME_LENGTH];`
`168`		`-`
`169`		`- new iPlayers[MAX_PLAYERS],iNum,iPlayer;`
`170`		`- get_players(iPlayers,iNum,"ch");`
`171`		`-`
`172`		`- for(new i;i < iNum;i++)`
	`166`	`+ if(g_bReadySystem)`
`173`	`167`	`{`
`174`		`- iPlayer = iPlayers[i];`
	`168`	`+ new iPlayers[MAX_PLAYERS],iNum,iPlayer;`
	`169`	`+ get_players(iPlayers,iNum,"ch");`
`175`	`170`
`176`		`- if(!PugIsTeam(iPlayer))`
	`171`	`+ new iPlayersNum,iReadys;`
	`172`	`+ new sList[2][512],sName[MAX_NAME_LENGTH];`
	`173`	`+`
	`174`	`+ for(new i;i < iNum;i++)`
`177`	`175`	`{`
`178`		`- continue;`
`179`		`- }`
	`176`	`+ iPlayer = iPlayers[i];`
	`177`	`+`
	`178`	`+ if(!PugIsTeam(iPlayer))`
	`179`	`+ {`
	`180`	`+ continue;`
	`181`	`+ }`
	`182`	`+`
	`183`	`+ iPlayersNum++;`
	`184`	`+ get_user_name(iPlayer,sName,charsmax(sName));`
`180`	`185`
`181`		`- iPlayersNum++;`
`182`		`- get_user_name(iPlayer,sName,charsmax(sName));`
`183`		`-`
`184`		`- if(g_bReady[iPlayer])`
`185`		`- {`
`186`		`- iReadys++;`
`187`		`- format(sReady,charsmax(sReady),"%s%s^n",sReady,sName);`
`188`		`- }`
`189`		`- else`
`190`		`- {`
`191`		`- format(sNotReady,charsmax(sNotReady),"%s%s^n",sNotReady,sName);`
	`186`	`+ if(g_bReady[iPlayer])`
	`187`	`+ {`
	`188`	`+ iReadys++;`
	`189`	`+ formatex(sList[0],charsmax(sList[]),"%s%s^n",sList[0],sName);`
	`190`	`+ }`
	`191`	`+ else`
	`192`	`+ {`
	`193`	`+ formatex(sList[1],charsmax(sList[]),"%s%s^n",sList[1],sName);`
	`194`	`+ }`
`192`	`195`	`}`
`193`		`- }`
	`196`	`+`
	`197`	`+ new iMinPlayers = get_pcvar_num(g_pPlayersMin);`
`194`	`198`
`195`		`- new iMinPlayers = get_pcvar_num(g_pPlayersMin);`
`196`		`-`
`197`		`- set_hudmessage(0,255,0,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,1);`
`198`		`- show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_UNREADY",(iPlayersNum - iReadys),iMinPlayers);`
`199`		`-`
`200`		`- set_hudmessage(0,255,0,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,2);`
`201`		`- show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_READY",iReadys,iMinPlayers);`
`202`		`-`
`203`		`- set_hudmessage(255,255,225,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,3);`
`204`		`- show_hudmessage(0,"^n%s",sReady);`
`205`		`-`
`206`		`- set_hudmessage(255,255,225,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,4);`
`207`		`- show_hudmessage(0,"^n%s",sNotReady);`
	`199`	`+ set_hudmessage(0,255,0,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,1);`
	`200`	`+ show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_UNREADY",(iPlayersNum - iReadys),iMinPlayers);`
	`201`	`+`
	`202`	`+ set_hudmessage(0,255,0,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,2);`
	`203`	`+ show_hudmessage(0,"%L",LANG_SERVER,"PUG_HUD_READY",iReadys,iMinPlayers);`
	`204`	`+`
	`205`	`+ set_hudmessage(255,255,225,0.58,0.02,0,0.0,fHoldTime,0.0,0.0,3);`
	`206`	`+ show_hudmessage(0,"^n%s",sList[0]);`
	`207`	`+`
	`208`	`+ set_hudmessage(255,255,225,0.23,0.02,0,0.0,fHoldTime,0.0,0.0,4);`
	`209`	`+ show_hudmessage(0,"^n%s",sList[1]);`
	`210`	`+ }`
`208`	`211`	`}`
`209`	`212`
`210`		`-public ReadyUp(id)`
	`213`	`+public fnReadyUp(id)`
`211`	`214`	`{`
`212`	`215`	`new iStage = GET_PUG_STAGE();`
`213`	`216`
`@@ -229,7 +232,7 @@ public ReadyUp(id)`
`229`	`232`
`230`	`233`	`client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_PLAYER_READY",sName);`
`231`	`234`
`232`		`- CheckReady();`
	`235`	`+ fnCheckReady();`
`233`	`236`	`}`
`234`	`237`	`else`
`235`	`238`	`{`
`@@ -249,7 +252,7 @@ public ReadyUp(id)`
`249`	`252`	`return PLUGIN_HANDLED;`
`250`	`253`	`}`
`251`	`254`
`252`		`-public ReadyDown(id)`
	`255`	`+public fnReadyDown(id)`
`253`	`256`	`{`
`254`	`257`	`new iStage = GET_PUG_STAGE();`
`255`	`258`
`@@ -265,15 +268,15 @@ public ReadyDown(id)`
`265`	`268`
`266`	`269`	`if(fReadyTime && get_pcvar_num(g_pAutoReadyKick))`
`267`	`270`	`{`
`268`		`- set_task(fReadyTime,"ReadyTimeOut",id + TASK_AUTO);`
	`271`	`+ set_task(fReadyTime,"fnReadyTimeOut",id + TASK_AUTO);`
`269`	`272`	`}`
`270`	`273`
`271`	`274`	`new sName[MAX_NAME_LENGTH];`
`272`	`275`	`get_user_name(id,sName,charsmax(sName));`
`273`	`276`
`274`	`277`	`client_print_color(0,print_team_red,"%s %L",g_sHead,LANG_SERVER,"PUG_PLAYER_UNREADY",sName);`
`275`	`278`
`276`		`- CheckReady();`
	`279`	`+ fnCheckReady();`
`277`	`280`	`}`
`278`	`281`	`else`
`279`	`282`	`{`
`@@ -293,7 +296,7 @@ public ReadyDown(id)`
`293`	`296`	`return PLUGIN_HANDLED;`
`294`	`297`	`}`
`295`	`298`
`296`		`-public ForceReady(id,iLevel)`
	`299`	`+public fnForceReady(id,iLevel)`
`297`	`300`	`{`
`298`	`301`	`if(!access(id,PUG_CMD_LVL) && (id != 0))`
`299`	`302`	`{`
`@@ -311,15 +314,15 @@ public ForceReady(id,iLevel)`
`311`	`314`	`return PLUGIN_HANDLED;`
`312`	`315`	`}`
`313`	`316`
`314`		`- PugAdminCommandClient(id,"Force .ready","PUG_FORCE_READY",iPlayer,ReadyUp(iPlayer));`
	`317`	`+ PugAdminCommandClient(id,"Force .ready","PUG_FORCE_READY",iPlayer,fnReadyUp(iPlayer));`
`315`	`318`	`}`
`316`	`319`
`317`	`320`	`return PLUGIN_HANDLED;`
`318`	`321`	`}`
`319`	`322`
`320`		`-public CheckReady()`
	`323`	`+public fnCheckReady()`
`321`	`324`	`{`
`322`		`- KeepMenu();`
	`325`	`+ fnKeepMenu();`
`323`	`326`
`324`	`327`	`new iReady = 0;`
`325`	`328`
`@@ -333,7 +336,7 @@ public CheckReady()`
`333`	`336`
`334`	`337`	`if(iReady >= get_pcvar_num(g_pPlayersMin))`
`335`	`338`	`{`
`336`		`- PugReadySystem(false);`
	`339`	`+ fnReadySystem(false);`
`337`	`340`
`338`	`341`	`switch(GET_PUG_STAGE())`
`339`	`342`	`{`
`@@ -356,19 +359,15 @@ public CheckReady()`
`356`	`359`	`}`
`357`	`360`	`}`
`358`	`361`
`359`		`-public ReadyTimeOut(id)`
	`362`	`+public fnReadyTimeOut(id)`
`360`	`363`	`{`
`361`	`364`	`id -= TASK_AUTO;`
`362`	`365`
`363`	`366`	`if(g_bReadySystem && is_user_connected(id))`
`364`	`367`	`{`
`365`	`368`	`if(PugIsTeam(id))`
`366`	`369`	`{`
`367`		`- if(get_pcvar_num(g_pAutoReadyKick) <= 0)`
`368`		`- {`
`369`		`- ReadyUp(id);`
`370`		`- }`
`371`		`- else`
	`370`	`+ if(get_pcvar_num(g_pAutoReadyKick) > 0)`
`372`	`371`	`{`
`373`	`372`	`new iReadyTime = get_pcvar_num(g_pAutoReadyTime);`
`374`	`373`
`@@ -381,8 +380,12 @@ public ReadyTimeOut(id)`
`381`	`380`	`sTime,`
`382`	`381`	`charsmax(sTime)`
`383`	`382`	`);`
`384`		`-`
`385`		`- PugDisconnect(id,"%L",LANG_SERVER,"PUG_FORCE_READY_KICK",sTime);`
	`383`	`+`
	`384`	`+ server_cmd("kick #%i ^"%L^"",get_user_userid(id),LANG_SERVER,"PUG_FORCE_READY_KICK",sTime);`
	`385`	`+ }`
	`386`	`+ else`
	`387`	`+ {`
	`388`	`+ fnReadyUp(id);`
`386`	`389`	`}`
`387`	`390`	`}`
`388`	`391`	`}`