X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmapvoting.qc;h=ed17d86e8e2a26ddc97cf47bde011cbc65649766;hb=17e9fbaa18a08e3a84f67955da54527dbf2acee3;hp=8e7deae8fe94c09023baa3181c93ac96ff540c15;hpb=5b22584122d4354ab7819853d0fa5219d14d832e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc index 8e7deae8f..ed17d86e8 100644 --- 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" @@ -265,8 +264,7 @@ void MapVote_Init() void MapVote_SendPicture(float id) {SELFPARAM(); msg_entity = self; - WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_PICTURE); + WriteHeader(MSG_ONE, TE_CSQC_PICTURE); WriteByte(MSG_ONE, id); WritePicture(MSG_ONE, strcat(mapvote_screenshot_dirs[mapvote_maps_screenshot_dir[id]], "/", mapvote_maps[id]), 3072); } @@ -343,14 +341,14 @@ void GameTypeVote_SendOption(int i) } } -float MapVote_SendEntity(entity to, int sf) +bool MapVote_SendEntity(entity this, entity to, int sf) { float i; if(sf & 1) sf &= ~2; // if we send 1, we don't need to also send 2 - WriteByte(MSG_ENTITY, ENT_CLIENT_MAPVOTE); + WriteHeader(MSG_ENTITY, ENT_CLIENT_MAPVOTE); WriteByte(MSG_ENTITY, sf); if(sf & 1)