diff --git a/source/src/protos.h b/source/src/protos.h index e1061fd0..3bba6f5b 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -161,6 +161,16 @@ extern void serveropcommand(int cmd, int arg1); extern void refreshsopmenu(void *menu, bool init); extern char *colorname(playerent *d, int num = 0, char *name = NULL, char *prefix = ""); extern char *colorping(int ping); + +struct votedisplayinfo +{ + playerent *owner; + int type, stats[VOTE_NUM], result, millis; + string desc; + bool localplayervoted; + votedisplayinfo() : owner(NULL), result(VOTE_NEUTRAL), millis(0), localplayervoted(false) { loopi(VOTE_NUM) stats[i] = VOTE_NEUTRAL; } +}; + extern void callvotesuc(); extern void callvoteerr(int e); extern void displayvote(votedisplayinfo *v); @@ -383,4 +393,3 @@ extern char msgsizelookup(int msg); extern void serverms(int mode, int numplayers, int minremain, char *smapname, int millis, int serverport); extern void servermsinit(const char *master, char *ip, int serverport, char *sdesc, bool listen); extern bool serverpickup(int i, int sender); - diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index dda83f8f..46b9322b 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -341,13 +341,6 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat if(!hidevote) { extern votedisplayinfo *curvote; - - //fixme - curvote = new votedisplayinfo(); - curvote->owner = player1; - s_strcpy(curvote->desc, "lal"); - curvote->result = VOTE_YES; - curvote->millis = lastmillis+1; if(curvote && curvote->millis >= lastmillis) { diff --git a/source/src/vote.h b/source/src/vote.h index adac5c5b..e69de29b 100644 --- a/source/src/vote.h +++ b/source/src/vote.h @@ -1,9 +0,0 @@ -struct votedisplayinfo -{ - playerent *owner; - int type, stats[VOTE_NUM], result, millis; - string desc; - bool localplayervoted; - votedisplayinfo() : owner(NULL), result(VOTE_NEUTRAL), millis(0), localplayervoted(false) { loopi(VOTE_NUM) stats[i] = VOTE_NEUTRAL; } -}; -