Merge branch 'bones_was_here/vidsettings' into 'master'

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

diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc
index 6c31af72c853d54cdef08fd5d723940efe6baecf..583916b3d40835ac1ef21c3cedfbc96ebd3863ac 100644 (file)
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -2,13 +2,11 @@
 #ifdef RADARMAP
 
 #include <common/command/_mod.qh>
-
-#include "../g_world.qh"
-#include "../g_subs.qh"
-
+#include <common/mapobjects/triggers.qh>
 #include <common/util.qh>
-
 #include <lib/csqcmodel/sv_model.qh>
+#include <server/intermission.qh>
+#include <server/world.qh>
 
 // ===============================================
 //     Generates radar map images for use in the HUD
@@ -367,7 +365,7 @@ void RadarMap_Think(entity this)
        }
 }
 
-bool RadarMap_Make(float argc)
+bool RadarMap_Make(int argc)
 {
        float i;