From 7dab3ad29d6b258ccbb0162de0153e9b011f1c04 Mon Sep 17 00:00:00 2001 From: Samual Date: Thu, 5 Jan 2012 14:51:25 -0500 Subject: [PATCH] Allow master to actually do normal vote commands too (should've been like this before, accidentally was broken) --- commands.cfg | 2 +- qcsrc/server/command/vote.qc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/commands.cfg b/commands.cfg index 16ecbfb93..21f2da6e3 100644 --- a/commands.cfg +++ b/commands.cfg @@ -243,7 +243,7 @@ set sv_vote_call 1 "Allow users to call a vote for the commands in sv_vote_comma set sv_vote_change 1 "Allow voters to change their mind after already voting" set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto" "these commands can be voted" set sv_vote_only_commands "" -set sv_vote_master_commands "movetored movetoblue movetoyellow movetopink" "Commands which vote masters can execute by themselves" // maybe add kickban here (but then sv_vote_master 0) +set sv_vote_master_commands "movetored movetoblue movetoyellow movetopink" "Extra commands which vote masters can execute by themselves, along with the normal sv_vote_commands." // maybe add kickban here (but then sv_vote_master 0) set sv_vote_master 1 "Allows the use of the vote master system" set sv_vote_master_callable 1 "When set, users can use \"vmaster\" to call a vote to become master of voting commands" set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master" diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index f3e846110..8769629f9 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -696,7 +696,7 @@ void VoteCommand_master(float request, entity caller, float argc, string vote_co if not(caller.vote_master) { print_to(caller, "^1You do not have vote master privelages."); } else if not(VoteCommand_checknasty(vote_command)) { print_to(caller, "^1Syntax error in command, see 'vhelp' for more info."); } - else if not(VoteCommand_parse(caller, vote_command, autocvar_sv_vote_master_commands, 3, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); } + else if not(VoteCommand_parse(caller, vote_command, strcat(autocvar_sv_vote_commands, " ", autocvar_sv_vote_master_commands), 3, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); } else // everything went okay, proceed with command { -- 2.39.2