Merge remote branch 'origin/master' into samual/updatecommands

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / gamecommand.qc

diff --git a/qcsrc/server/gamecommand.qc b/qcsrc/server/gamecommand.qc
index 977b7b3348f6d7e2b8bcf406e826f80949365851..74dc541a6751dd35cb4e531ffe7b54502736a12c 100644 (file)
--- a/qcsrc/server/gamecommand.qc
+++ b/qcsrc/server/gamecommand.qc
@@ -1,6 +1,6 @@
 // =====================================================
 //  Server side game commands code, reworked by Samual
-//  Last updated: November 8th, 2011
+//  Last updated: November 30th, 2011
 // =====================================================
 
 #define GC_REQUEST_COMMAND 1
@@ -1927,6 +1927,7 @@ void GameCommand_(float request)
        SERVER_COMMAND("trace", GameCommand_trace(request, arguments), "Various debugging tools with tracing") \
        SERVER_COMMAND("unlockteams", GameCommand_unlockteams(request), "Enable the ability for players to switch or enter teams") \
        SERVER_COMMAND("warp", GameCommand_warp(request, arguments), "Choose different level in campaign") \
+       SERVER_COMMAND("vote", VoteCommand(world, arguments), "Server side control of voting") \
        /* nothing */
 
 void GameCommand_macro_help()
@@ -1978,7 +1979,7 @@ void GameCommand(string command)
                {
                        print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are:\n");
                        GameCommand_macro_help();
-                       GameCommand_Vote("help", world);
+                       
                        GameCommand_Ban("help");
                        GameCommand_Generic("help");
                        print("For help about specific commands, type sv_cmd help COMMAND\n");
@@ -1989,10 +1990,6 @@ void GameCommand(string command)
                        return;
                }
        } 
-       else if(GameCommand_Vote(command, world)) 
-       {
-               return; // handled by server/vote.qc 
-       }
        else if(GameCommand_Ban(command)) 
        {
                return; // handled by server/ipban.qc