Merge branch 'master' into terencehill/lms_updates

[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 fa970f955e0d9fddf7f4af0b11c92dc46bd7047b..93c3835271a049b796eaab6a2ff4911ebfe7b6fd 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,10 +1,10 @@
 #include "round_handler.qh"
 
-#include <server/world.qh>
-#include "campaign.qh"
-#include "command/vote.qh"
 #include <common/mapobjects/triggers.qh>
-#include "../common/util.qh"
+#include <common/util.qh>
+#include <server/campaign.qh>
+#include <server/command/vote.qh>
+#include <server/world.qh>
 
 void round_handler_Think(entity this)
 {
@@ -93,7 +93,7 @@ void round_handler_Spawn(bool() canRoundStart_func, bool() canRoundEnd_func, voi
                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;