Merge remote branch 'origin/master' into samual/updatecommands

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

diff --git a/qcsrc/server/vote.qh b/qcsrc/server/vote.qh
index e5233b074e06b8f058bbe7db4404c658c9674bc1..1dc639d171da75070eda3f1ec67abdd580d2a349 100644 (file)
--- a/qcsrc/server/vote.qh
+++ b/qcsrc/server/vote.qh
@@ -25,7 +25,14 @@ void VoteStop(entity stopper);
 void VoteSpam(float notvoters, float mincount, string result);
 void VoteCount();
 
+// =========================
+//  warmup and nagger stuff
+// =========================
+
+#define RESTART_COUNTDOWN 10
 entity nagger;
+.float ready;
 float readycount;
 float readyrestart_happened;
+float restart_mapalreadyrestarted; // bool, indicates whether reset_map() was already executed
 void ReadyCount();
\ No newline at end of file