From cbcf8d67144b2e9781e8b9b2921e5011fdfe4db9 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 30 Sep 2007 18:09:56 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1316 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/server.cpp | 3 ++- source/src/vote.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/src/server.cpp b/source/src/server.cpp index 1cd65d74..6e08dd27 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -1121,6 +1121,7 @@ struct serveraction { int type, role; bool dedicated; + virtual ~serveraction() {} virtual void perform() = 0; virtual bool isvalid() { return true; } }; @@ -1205,7 +1206,7 @@ struct voteinfo bool isalive() { return secs > lastsec; } }; -voteinfo *curvote = NULL; +static voteinfo *curvote = NULL; void checkvotes(bool forceend = false) { diff --git a/source/src/vote.h b/source/src/vote.h index 6b4fe355..adac5c5b 100644 --- a/source/src/vote.h +++ b/source/src/vote.h @@ -5,4 +5,5 @@ struct votedisplayinfo string desc; bool localplayervoted; votedisplayinfo() : owner(NULL), result(VOTE_NEUTRAL), millis(0), localplayervoted(false) { loopi(VOTE_NUM) stats[i] = VOTE_NEUTRAL; } -}; \ No newline at end of file +}; +