Merge branch 'TimePath/independent_offhand' into 'master'

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

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index 952ce5bd0595ff40273229587503bf58403717a3..5a9f7e0765c85e5a66e6d4ada2da8048b02fd597 100644 (file)
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -1,5 +1,4 @@
 #include "mapvoting.qh"
-#include "_all.qh"
 
 #include "g_world.qh"
 #include "command/cmd.qh"
@@ -123,7 +122,7 @@ void MapVote_UnzoneStrings()
 }
 
 string MapVote_Suggest(string m)
-{
+{SELFPARAM();
        float i;
        if(m == "")
                return "That's not how to use this command.";
@@ -263,7 +262,7 @@ void MapVote_Init()
 }
 
 void MapVote_SendPicture(float id)
-{
+{SELFPARAM();
        msg_entity = self;
        WriteByte(MSG_ONE, SVC_TEMPENTITY);
        WriteByte(MSG_ONE, TE_CSQC_PICTURE);
@@ -343,7 +342,7 @@ void GameTypeVote_SendOption(int i)
        }
 }
 
-float MapVote_SendEntity(entity to, int sf)
+bool MapVote_SendEntity(entity this, entity to, int sf)
 {
        float i;
 
@@ -748,7 +747,7 @@ float GameTypeVote_Finished(float pos)
 
        if ( !GameTypeVote_SetGametype(GameTypeVote_Type_FromString(mapvote_maps[pos])) )
        {
-               dprint("Selected gametype is not supported by any map");
+               LOG_TRACE("Selected gametype is not supported by any map");
        }
 
        localcmd("sv_vote_gametype_hook_all\n");