Merge branch 'TimePath/mutator_cleanup' into 'master'

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

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 089e80a894087b901204644dd96261ba9c08542b..bc191f74f46be02808a00148036e1e6ef5e92641 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,20 +1,13 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../common/constants.qh"
-    #include "../common/teams.qh"
-       #include "../common/triggers/subs.qh"
-    #include "../common/util.qh"
-    #include "autocvars.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "mutators/mutators_include.qh"
-    #include "spawnpoints.qh"
-    #include "race.qh"
-#endif
+#include "spawnpoints.qh"
+#include "_all.qh"
+
+#include "mutators/mutators_include.qh"
+#include "g_world.qh"
+#include "race.qh"
+#include "../common/constants.qh"
+#include "../common/teams.qh"
+#include "../common/util.qh"
+#include "../warpzonelib/util_server.qh"
 
 float SpawnPoint_Send(entity to, int sf)
 {
@@ -235,7 +228,7 @@ vector Spawn_Score(entity spot, float mindist, float teamcheck)
                }
        }
 
-       MUTATOR_CALLHOOK(Spawn_Score);
+       MUTATOR_CALLHOOK(Spawn_Score, self, spawn_spot, spawn_score);
        return spawn_score;
 }