Merge branch 'master' into Mario/ons_updates

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

diff --git a/qcsrc/server/mapvoting.qh b/qcsrc/server/mapvoting.qh
index 6875958bfe464aa54ce11fd6f6d3a9d12189fbd1..d2eff1cf08ec0422fef2292e25326ee96244ac65 100644 (file)
--- a/qcsrc/server/mapvoting.qh
+++ b/qcsrc/server/mapvoting.qh
@@ -1,3 +1,6 @@
+#ifndef MAPVOTING_H
+#define MAPVOTING_H
+
 // definitions for functions used outside mapvoting.qc
 void MapVote_Start();
 void MapVote_Spawn();
@@ -12,11 +15,10 @@ string getmapname_stored;
 float mapvote_initialized;
 
 float mapvote_nextthink;
-float mapvote_initialized;
 float mapvote_keeptwotime;
 float mapvote_timeout;
 string mapvote_message;
-#define MAPVOTE_SCREENSHOT_DIRS_COUNT 4
+const float MAPVOTE_SCREENSHOT_DIRS_COUNT = 4;
 string mapvote_screenshot_dirs[MAPVOTE_SCREENSHOT_DIRS_COUNT];
 float mapvote_screenshot_dirs_count;
 
@@ -37,3 +39,4 @@ float mapvote_abstain;
 .float mapvote;
 
 entity mapvote_ent;
+#endif