Merge branch 'master' into terencehill/itemstime

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

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 4e2d4732d234fb4f2a41938bad53a223ff0b567a..d33481dff7060d08c36ada545723dc5527c622b0 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -1,5 +1,6 @@
+#include "../../common/command/command.qh"
 #include "vote.qh"
-#include "../_.qh"
+#include "../_all.qh"
 
 #include "common.qh"
 
@@ -17,8 +18,6 @@
 #include "../../common/playerstats.qh"
 #include "../../common/util.qh"
 
-#include "../../common/command/shared_defs.qh"
-
 // =============================================
 //  Server side voting code, reworked by Samual
 //  Last updated: December 27th, 2011
@@ -454,6 +453,8 @@ void ReadyRestart_force()
        // disable the warmup global for the server
        warmup_stage = 0; // once the game is restarted the game is in match stage
 
+       Item_ItemsTime_Reset();
+
        // reset the .ready status of all players (also spectators)
        FOR_EACH_REALCLIENT(tmp_player) { tmp_player.ready = 0; }
        readycount = 0;