Merge pull request #113 from kiapwnz/silentswitch

Added Silent Transfer Option in Team Menu.

plugins/lang/plmenu.txt

@@ -1,4 +1,4 @@
-[en]
+[en]
 ADMIN_BAN_1 = ADMIN: ban %s
 ADMIN_BAN_2 = ADMIN %s: ban %s
 BAN_MENU = Ban Menu
@@ -12,6 +12,7 @@ ADMIN_TRANSF_1 = ADMIN: transfer %s to %s
 ADMIN_TRANSF_2 = ADMIN %s: transfer %s to %s
 TEAM_MENU = Team Menu
 TRANSF_TO = Transfer to %s
+TRANSF_SILENT = Silent Transfer
 CL_CMD_MENU = Client Cmds Menu
 NO_CMDS = No cmds available
 CANT_PERF_PLAYER = That action can't be performed on player "%s"
@@ -30,6 +31,7 @@ ADMIN_TRANSF_1 = ADMIN: verschiebt %s zu den %s
 ADMIN_TRANSF_2 = ADMIN %s: verschiebt %s zu den %s
 TEAM_MENU = Menu > Team
 TRANSF_TO = zu den %s geschoben
+TRANSF_SILENT = Stiller Transfer
 CL_CMD_MENU = Menu > Spielerbefehle
 NO_CMDS = keine Befehle verfuegbar
 CANT_PERF_PLAYER = Diese Aktion kann nicht am spieler "%s" ausgefuehrt werden.
@@ -48,6 +50,7 @@ ADMIN_TRANSF_1 = ADMIN: transfer %s u %s
 ADMIN_TRANSF_2 = ADMIN %s: transfer %s u %s
 TEAM_MENU = Tim Meni
 TRANSF_TO = Transfer u %s
+TRANSF_SILENT = Силент Пренос
 CL_CMD_MENU = Klijent Komande Meni
 NO_CMDS = Nema dostupnih komandi
 CANT_PERF_PLAYER = Komanda ne moze biti izvrsena na igrac "%s"
@@ -66,6 +69,7 @@ ADMIN_TRANSF_1 = ADMIN: takim %s goc %s
 ADMIN_TRANSF_2 = ADMIN %s: takim %s goc %s
 TEAM_MENU = Takim menu
 TRANSF_TO = %s takima goc
+TRANSF_SILENT = sessiz Transferi
 CL_CMD_MENU = Oyuncu Emir Menusu
 NO_CMDS = Emir mevcud degildir
 CANT_PERF_PLAYER = Oyuncu uzerinde bunu yapamazsiniz "%s"
@@ -84,6 +88,7 @@ ADMIN_TRANSF_1 = ADMIN: transfere %s en %s
 ADMIN_TRANSF_2 = ADMIN %s: transfere %s en %s
 TEAM_MENU = Menu Equipe
 TRANSF_TO = Transferer en %s
+TRANSF_SILENT = transfert discret
 CL_CMD_MENU = Menu Cmds Client 
 NO_CMDS = Aucune commande disponible
 CANT_PERF_PLAYER = Cette action ne peut pas etre faite sur le joueur "%s"
@@ -102,6 +107,7 @@ ADMIN_TRANSF_1 = ADMIN: skicka %s till %s
 ADMIN_TRANSF_2 = ADMIN %s: skicka %s till %s
 TEAM_MENU = Lagmeny
 TRANSF_TO = Skicka till %s
+TRANSF_SILENT = Överföring
 CL_CMD_MENU = Klientkommandomeny
 NO_CMDS = Det finns inga kommandon
 CANT_PERF_PLAYER = Den handlingen kan inte utf'o'ras pa spelare "%s"
@@ -120,6 +126,7 @@ ADMIN_TRANSF_1 = ADMIN: Overflyt %s to %s
 ADMIN_TRANSF_2 = ADMIN %s: Overflyt %s to %s
 TEAM_MENU = Hold Menu
 TRANSF_TO = Overflyt til %s
+TRANSF_SILENT = Stiller overførsel
 CL_CMD_MENU = Klient Kommando Menu
 NO_CMDS = Ingen kommandoer til raadighed
 CANT_PERF_PLAYER = Den handling kan ikke udfoeres paa spiller "%s"
@@ -156,6 +163,7 @@ ADMIN_TRANSF_1 = ADMIN: zet %s over naar %s
 ADMIN_TRANSF_2 = ADMIN %s: zet %s over naar %s
 TEAM_MENU = Teammenu
 TRANSF_TO = Zet over naar %s
+TRANSF_SILENT = Stiller overdracht
 CL_CMD_MENU = Gebruikerscommandomenu
 NO_CMDS = Geen cmds beschikbaar
 CANT_PERF_PLAYER = Die actie kan niet worden uitgevoerd op speler "%s"
@@ -174,6 +182,7 @@ ADMIN_TRANSF_1 = ADMIN: %s transferido al equipo de los %s
 ADMIN_TRANSF_2 = ADMIN %s: %s transferido al equipo de los %s
 TEAM_MENU = Menu de Equipos
 TRANSF_TO = Transferir a los %s
+TRANSF_SILENT = Transferencia silenciosa
 CL_CMD_MENU = Menu de Comandos de Cliente
 NO_CMDS = No hay comandos disponibles
 CANT_PERF_PLAYER = Esta accion no se puede aplicar a jugador "%s"
@@ -192,6 +201,7 @@ ADMIN_TRANSF_1 = ADMIN: transferiu %s para %s
 ADMIN_TRANSF_2 = ADMIN %s: transferiu %s para %s
 TEAM_MENU = Menu de Controle de Time
 TRANSF_TO = Transferir para %s
+TRANSF_SILENT = transferência Stiller
 CL_CMD_MENU = Menu de Comandos no Cliente
 NO_CMDS = Sem comandos disponiveis
 CANT_PERF_PLAYER = Aquela acao nao pode ser executada com jogador "%s"
@@ -210,6 +220,7 @@ ADMIN_TRANSF_1 = ADMIN: premistil %s k %s
 ADMIN_TRANSF_2 = ADMIN %s: premistili %s k %s
 TEAM_MENU = Menu Tymu
 TRANSF_TO = Premistit k %s
+TRANSF_SILENT = Silent Převod
 CL_CMD_MENU = Menu klientskych prikazu
 NO_CMDS = Zadny cmds
 CANT_PERF_PLAYER = Tato operace nelze provest na hrac "%s"
@@ -228,6 +239,7 @@ ADMIN_TRANSF_1 = ADMIN: siirsi pelaajan%s %s:ksi
 ADMIN_TRANSF_2 = ADMIN %s: siirsi pelaajan %s %s:ksi
 TEAM_MENU = Joukkuevalikko
 TRANSF_TO = Siirra %s.ksi
+TRANSF_SILENT = äänetön siirto
 CL_CMD_MENU = Clientkomentovalikko
 NO_CMDS = Ei komentoja kaytettavissa
 CANT_PERF_PLAYER = Tuota toimintoa ei voida suorittaa pelaaja "%s"
@@ -246,6 +258,7 @@ ADMIN_TRANSF_1 = ADMINISTRATOR: transferira %s kam %s
 ADMIN_TRANSF_2 = ADMINISTRATOR %s: transferira %s kam %s
 TEAM_MENU = Otborno Menu
 TRANSF_TO = Transferirai kam %s
+TRANSF_SILENT = Стилър трансфер
 CL_CMD_MENU = Klient Comandno Menu
 NO_CMDS = Nqma nikakvi pozvoleni comandi
 CANT_PERF_PLAYER = Tazi comanda nemoje da se izpolzva na igra4 "%s"
@@ -264,6 +277,7 @@ ADMIN_TRANSF_1 = ADMIN: transfera %s la %s
 ADMIN_TRANSF_2 = ADMIN %s: transfera %s la %s
 TEAM_MENU = Menu Echipe
 TRANSF_TO = Transfera la %s
+TRANSF_SILENT = tăcut transfer
 CL_CMD_MENU = Menu Comenzi Jucator
 NO_CMDS = Nici o comanda valabila
 CANT_PERF_PLAYER = Aceasta comanda nu poate fi executata pe jucatorul "%s"
@@ -282,6 +296,7 @@ ADMIN_TRANSF_1 = ADMIN: %s atallitva %s-nak
 ADMIN_TRANSF_2 = ADMIN %s: %s atallitva %s-nak
 TEAM_MENU = CSapat Menu
 TRANSF_TO = Atallitva %s-nek
+TRANSF_SILENT = transfer átutalás
 CL_CMD_MENU = Client Cmds Menu
 NO_CMDS = Nincs elerheto parancs
 CANT_PERF_PLAYER = Ezt az akciot nem hajthatod vegre "%s"-on jatekos
@@ -318,6 +333,7 @@ ADMIN_TRANSF_1 = ADMIN: premiestnil %s k %s
 ADMIN_TRANSF_2 = ADMIN %s: premiestnili %s k %s
 TEAM_MENU = MENU: Tym
 TRANSF_TO = Premiestnit k %s
+TRANSF_SILENT = Tichý prevod
 CL_CMD_MENU = MENU: klientske prikazy
 NO_CMDS = Ziadny cmds
 CANT_PERF_PLAYER = Tato operacia nejde previest na hrac "%s"
@@ -390,6 +406,7 @@ ADMIN_TRANSF_1 = АДМИНИСТРАТОР: перевел %s за %s
 ADMIN_TRANSF_2 = АДМИНИСТРАТОР %s: перевел %s за %s
 TEAM_MENU = Меню команды игрока
 TRANSF_TO = Переместить за %s
+TRANSF_SILENT = Смена команды без смерти
 CL_CMD_MENU = Клиентское меню
 NO_CMDS = Нет доступных переменных
 CANT_PERF_PLAYER = Неприменимо к игроку "%s"

plugins/plmenu.sma

@@ -66,6 +66,8 @@ new allow_spectators, mp_limitteams
 new p_amx_tempban_maxtime;
 new Trie:g_tempBans;
 
+new g_silent[33]
+
 public plugin_natives()
 {
 	set_module_filter("module_filter")
@@ -663,6 +665,7 @@ public cmdKickMenu(id, level, cid)
 public client_putinserver(id)
 {
 	g_CSPlayerCanSwitchFromSpec[id] = false
+	g_silent[id] = false
 }
 
 public Event_TeamInfo()
@@ -688,6 +691,11 @@ public actionTeamMenu(id, key)
 {
 	switch (key)
 	{
+		case 6: 
+		{
+			g_silent[id] = !g_silent[id]
+			displayTeamMenu(id, g_menuPosition[id])
+		}
 		case 7:
 		{
 			g_menuOption[id] = (g_menuOption[id] + 1) % 3;
@@ -697,7 +705,7 @@ public actionTeamMenu(id, key)
 		case 9: displayTeamMenu(id, --g_menuPosition[id])
 		default:
 		{
-			new player = g_menuPlayers[id][g_menuPosition[id] * 7 + key]
+			new player = g_menuPlayers[id][g_menuPosition[id] * 6 + key]
 			if( !is_user_connected(player) ) // dunno why this check hasn't be implemented in the past
 			{
 				displayTeamMenu(id, g_menuPosition[id])
@@ -738,7 +746,7 @@ public actionTeamMenu(id, key)
 
 			if ( g_CSPlayerCanSwitchFromSpec[player] && g_cstrike && (CS_TEAM_T <= cs_get_user_team(player) <= CS_TEAM_CT))
 			{
-				if (is_user_alive(player))
+				if (is_user_alive(player) && !g_silent[id])
 				{
 					new deaths = cs_get_user_deaths(player)
 					user_kill(player, 1)
@@ -748,7 +756,7 @@ public actionTeamMenu(id, key)
 				cs_set_user_team(player, destTeamSlot + 1)
 
 			} else {
-				if (is_user_alive(player))
+				if (is_user_alive(player) && !g_silent[id])
 				{
 					user_kill(player, 1)
 				}
@@ -815,14 +823,14 @@ displayTeamMenu(id, pos)
 	new b = 0
 	new i, iteam
 	new name[MAX_NAME_LENGTH], team[4]
-	new start = pos * 7
+	new start = pos * 6
 
 	if (start >= g_menuPlayersNum[id])
 		start = pos = g_menuPosition[id] = 0
 
-	new len = format(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "TEAM_MENU", pos + 1, (g_menuPlayersNum[id] / 7 + ((g_menuPlayersNum[id] % 7) ? 1 : 0)))
+	new len = format(menuBody, charsmax(menuBody), g_coloredMenus ? "\y%L\R%d/%d^n\w^n" : "%L %d/%d^n^n", id, "TEAM_MENU", pos + 1, (g_menuPlayersNum[id] / 6 + ((g_menuPlayersNum[id] % 6) ? 1 : 0)))
-	new end = start + 7
+	new end = start + 6
-	new keys = MENU_KEY_0|MENU_KEY_8
+	new keys = MENU_KEY_0|MENU_KEY_7|MENU_KEY_8
 
 	if (end > g_menuPlayersNum[id])
 		end = g_menuPlayersNum[id]
@@ -876,7 +884,8 @@ displayTeamMenu(id, pos)
 				len += format(menuBody[len], charsmax(menuBody) - len, g_coloredMenus ? "%d. %s\y\R%s^n\w" : "%d. %s   %s^n", ++b, name, team)
 		}
 	}
-
+	
+	len += format(menuBody[len], charsmax(menuBody) - len, "^n7. %L: %L", id, "TRANSF_SILENT", id, g_silent[id] ? "YES" : "NO")
 	len += format(menuBody[len], charsmax(menuBody) - len, "^n8. %L^n", id, "TRANSF_TO", g_CSTeamNames[g_menuOption[id] % 3])
 
 	if (end != g_menuPlayersNum[id])