no message
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1318 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
+10
-1
@@ -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);
|
||||
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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; }
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user