some more fixes

diff --git a/commands.cfg b/commands.cfg
index 6b82c32eab84e1bf70cc318c7ebb90f9d33f4b31..35d9e39b91947d5d17210434c6c047a6f8512131 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -261,16 +261,19 @@ set _isspace "$_isblank"
 // restriction is specified as <minargs> followed by <maxargs> instances of ';'
 // and the optional character class to verify the argument by (no checking if
 // empty)
+// set cvar to empty string to not check the command at all
+// if cvar is not set there will be a warning
 set sv_vote_command_restriction_restart "0"
 set sv_vote_command_restriction_fraglimit "1;$_isdigit"
 set sv_vote_command_restriction_chmap "1;$_isgraph"
 set sv_vote_command_restriction_gotomap "1;$_isgraph"
 set sv_vote_command_restriction_nextmap "1;$_isgraph"
 set sv_vote_command_restriction_endmatch "0"
-set sv_vote_command_restriction_reducematchtime "0;.$_isdigit"
-set sv_vote_command_restriction_extendmatchtime "0;.$_isdigit"
+set sv_vote_command_restriction_reducematchtime "0"
+set sv_vote_command_restriction_extendmatchtime "0"
 set sv_vote_command_restriction_allready "0"
-set sv_vote_command_restriction_kick "1;"
+set sv_vote_command_restriction_kick "1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;" // enough space for ban reason
+set sv_vote_command_restriction_kickban "1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;" // enough space for ban reason
 set sv_vote_command_restriction_cointoss "0"
 set sv_vote_command_restriction_movetoauto "1;"
 set sv_vote_command_restriction_movetored "1;"

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 3604f6fb189afdaffe1befb12d744e0ca25d3c89..d5828592d30feee4c451702c1c7bce34ba002669 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -510,7 +510,7 @@ string ValidateMap(string validated_map, entity caller)
 float VoteCommand_checkargs(float startpos, float argc)
 {
        float p, q, check;
-       string cvarname = strcat("sv_vote_command_cmdrestriction_", argv(startpos));
+       string cvarname = strcat("sv_vote_command_restriction_", argv(startpos));
        string cmdrestriction = cvar_string(cvarname); // note: this warns on undefined cvar. We want that.
        string charlist, arg;
        float checkmate;