Merge branch 'master' into Juhu/strafehud

[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 16564cd39b7c7175187e659bcb119fc7ba27cca0..fa970f955e0d9fddf7f4af0b11c92dc46bd7047b 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,7 +1,9 @@
 #include "round_handler.qh"
 
+#include <server/world.qh>
 #include "campaign.qh"
 #include "command/vote.qh"
+#include <common/mapobjects/triggers.qh>
 #include "../common/util.qh"
 
 void round_handler_Think(entity this)
@@ -84,7 +86,7 @@ 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)
        {