diff --git a/addons/amxmodx/scripting/include/mm_incs/cvars.inc b/addons/amxmodx/scripting/include/mm_incs/cvars.inc index 3cbc701..d0efd2a 100644 --- a/addons/amxmodx/scripting/include/mm_incs/cvars.inc +++ b/addons/amxmodx/scripting/include/mm_incs/cvars.inc @@ -17,6 +17,7 @@ Cvars_Init() bind_pcvar_num(create_cvar("amx_vote_delay_mm", "5"), g_bCvar_amx_vote_delay_mm); bind_pcvar_float((g_pCvar_mp_chattime = get_cvar_pointer("mp_chattime")), g_bCvar_mp_chattime); bind_pcvar_num(get_cvar_pointer("mp_timelimit"), g_bCvar_mp_timelimit); + bind_pcvar_num(create_cvar("amx_multimod_voice", "1"), g_bCvar_amx_multimod_voice); set_pcvar_string(g_pCvar_amx_nextmap, fmt("%L", LANG_SERVER, "MM_NO_MAP_CHOOSED_CVAR")); set_pcvar_num(g_pCvar_amx_last_voting, 0); diff --git a/addons/amxmodx/scripting/include/mm_incs/global.inc b/addons/amxmodx/scripting/include/mm_incs/global.inc index 42c2af0..505ced9 100644 --- a/addons/amxmodx/scripting/include/mm_incs/global.inc +++ b/addons/amxmodx/scripting/include/mm_incs/global.inc @@ -58,6 +58,7 @@ new g_bCvar_amx_last_voting, g_pCvar_amx_last_voting; new g_bCvar_amx_vote_delay_mm; new Float:g_bCvar_mp_chattime, g_pCvar_mp_chattime; new g_bCvar_mp_timelimit; +new g_bCvar_amx_multimod_voice; /* =========================================================================== diff --git a/addons/amxmodx/scripting/include/mm_incs/mapchooser.inc b/addons/amxmodx/scripting/include/mm_incs/mapchooser.inc index c098e40..6e0d5e4 100644 --- a/addons/amxmodx/scripting/include/mm_incs/mapchooser.inc +++ b/addons/amxmodx/scripting/include/mm_incs/mapchooser.inc @@ -242,7 +242,8 @@ public OnTask_CheckVoteMap() client_print_color(0, print_team_blue, "%s^1 %L", g_GlobalConfigs[ChatPrefix], LANG_PLAYER, "MM_MAPCHOO_NEED_SECOND_VOTE", j, iResult); - client_cmd(0, "spk ^"run officer(e40) voltage(e30) accelerating(s70) is required^""); + if(g_bCvar_amx_multimod_voice) + client_cmd(0, "spk ^"run officer(e40) voltage(e30) accelerating(s70) is required^""); set_task(10.0, "OnTask_VoteNextMap__FIX"); @@ -506,7 +507,9 @@ public OnTask_ChangeTimeLeft() { case CHANGEMAP_END_OF_ROUND: { - client_cmd(0, "spk ^"%s^"", g_SOUND_ExtendTime); + if(g_bCvar_amx_multimod_voice) + client_cmd(0, "spk ^"%s^"", g_SOUND_ExtendTime); + client_print_color(0, print_team_default, "%s^1 %L", g_GlobalConfigs[ChatPrefix], LANG_PLAYER, "MM_MAP_CHANGE_END_ROUND"); } case CHANGEMAP_ONE_MORE_ROUND: @@ -546,7 +549,8 @@ public OnTask_AlertChangeMap() set_hudmessage(255, 255, 255, -1.0, 0.35, 0, 0.0, 1.1, 0.0, 0.0, -1); ShowSyncHudMsg(0, g_Hud_Alert, "%L", g_iChangeMapTime, LANG_PLAYER, "MM_NEXT_MAP_CHANGE_WILL_BE_IN"); - client_cmd(0, "spk ^"fvox/%s^"", g_SOUND_CountDown[g_iChangeMapTime]); + if(g_bCvar_amx_multimod_voice) + client_cmd(0, "spk ^"fvox/%s^"", g_SOUND_CountDown[g_iChangeMapTime]); --g_iChangeMapTime; diff --git a/addons/amxmodx/scripting/include/mm_incs/modchooser.inc b/addons/amxmodx/scripting/include/mm_incs/modchooser.inc index 0556c87..7c9edfe 100644 --- a/addons/amxmodx/scripting/include/mm_incs/modchooser.inc +++ b/addons/amxmodx/scripting/include/mm_incs/modchooser.inc @@ -245,7 +245,8 @@ public OnTaskCheckVoteMod() client_print_color(0, print_team_blue, "%s^1 %L", g_GlobalConfigs[ChatPrefix], LANG_PLAYER, "MM_MODCHOO_NEED_SECOND_VOTE", j, iResult); - client_cmd(0, "spk ^"run officer(e40) voltage(e30) accelerating(s70) is required^""); + if(g_bCvar_amx_multimod_voice) + client_cmd(0, "spk ^"run officer(e40) voltage(e30) accelerating(s70) is required^""); set_task(10.0, "OnTask_VoteNextMod__FIX"); diff --git a/addons/amxmodx/scripting/include/mm_incs/rockthevote.inc b/addons/amxmodx/scripting/include/mm_incs/rockthevote.inc index 4e16365..d1dce77 100644 --- a/addons/amxmodx/scripting/include/mm_incs/rockthevote.inc +++ b/addons/amxmodx/scripting/include/mm_incs/rockthevote.inc @@ -101,7 +101,8 @@ public ClientCommand_RockTheVote(const id) { g_bIsVotingRtv = true; - client_cmd(0, "spk ^"get red(e80) ninety(s45) to check(e20) use bay(s18) mass(e42) cap(s50)^""); + if(g_bCvar_amx_multimod_voice) + client_cmd(0, "spk ^"get red(e80) ninety(s45) to check(e20) use bay(s18) mass(e42) cap(s50)^""); client_print_color(0, print_team_default, "%s^1 %L", g_GlobalConfigs[ChatPrefix], LANG_PLAYER, "MM_RTV_VOTING_START"); diff --git a/addons/amxmodx/scripting/multimod_manager.sma b/addons/amxmodx/scripting/multimod_manager.sma index 04338ae..d28620e 100644 --- a/addons/amxmodx/scripting/multimod_manager.sma +++ b/addons/amxmodx/scripting/multimod_manager.sma @@ -366,7 +366,9 @@ public OnEvent_HLTV() { g_bChangeMapOneMoreRound = false; - client_cmd(0, "spk ^"%s^"", g_SOUND_ExtendTime); + if(g_bCvar_amx_multimod_voice) + client_cmd(0, "spk ^"%s^"", g_SOUND_ExtendTime); + client_print_color(0, print_team_default, "%s^1 %L", LANG_PLAYER, "MM_MAP_CHANGE_END_ROUND", g_GlobalConfigs[ChatPrefix]); } } @@ -656,15 +658,18 @@ public OnTask_AlertStartNextVote() return; } - if(g_iCountdownTime == 10) - client_cmd(0, "spk ^"get red(e80) ninety(s45) to check(e20) use bay(s18) mass(e42) cap(s50)^""); + if(g_bCvar_amx_multimod_voice) + { + if(g_iCountdownTime == 10) + client_cmd(0, "spk ^"get red(e80) ninety(s45) to check(e20) use bay(s18) mass(e42) cap(s50)^""); + + if(g_iCountdownTime <= 5) + client_cmd(0, "spk ^"fvox/%s^"", g_SOUND_CountDown[g_iCountdownTime]); + } set_hudmessage(255, 255, 255, -1.0, 0.35, 0, 0.0, 1.1, 0.0, 0.0, -1); ShowSyncHudMsg(0, g_Hud_Alert, "%L", LANG_PLAYER, "MM_NEXT_VOTE_WILL_START_IN", g_iCountdownTime); - if(g_iCountdownTime <= 5) - client_cmd(0, "spk ^"fvox/%s^"", g_SOUND_CountDown[g_iCountdownTime]); - --g_iCountdownTime; remove_task(TASK_SHOWTIME);