Delete g_instagib_items and g_overkill_items when their relative mutators are removed

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

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 786635af07e4b145383f91ea9d2d325b8670a3d1..93c3835271a049b796eaab6a2ff4911ebfe7b6fd 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,8 +1,10 @@
 #include "round_handler.qh"
 
-#include "campaign.qh"
-#include "command/vote.qh"
-#include "../common/util.qh"
+#include <common/mapobjects/triggers.qh>
+#include <common/util.qh>
+#include <server/campaign.qh>
+#include <server/command/vote.qh>
+#include <server/world.qh>
 
 void round_handler_Think(entity this)
 {
@@ -76,7 +78,7 @@ void round_handler_Init(float the_delay, float the_count, float the_round_timeli
 }
 
 // NOTE: this is only needed because if round_handler spawns at time 1
-// gamestarttime isn't initialized yet
+// game_starttime isn't initialized yet
 void round_handler_FirstThink(entity this)
 {
        round_starttime = max(time, game_starttime) + this.count;
@@ -84,14 +86,14 @@ void round_handler_FirstThink(entity this)
        this.nextthink = max(time, game_starttime);
 }
 
-void round_handler_Spawn(float() canRoundStart_func, float() canRoundEnd_func, void() roundStart_func)
+void round_handler_Spawn(bool() canRoundStart_func, bool() canRoundEnd_func, void() roundStart_func)
 {
        if (round_handler)
        {
                backtrace("Can't spawn round_handler again!");
                return;
        }
-       entity this = round_handler = new(round_handler);
+       entity this = round_handler = new_pure(round_handler);
 
        setthink(this, round_handler_FirstThink);
        this.canRoundStart = canRoundStart_func;