Merge branch 'terencehill/v_deathtilt_fix' 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 7475c5a5463185f617a1913a4ea51959d55bdd29..616727c5d66b5ad1acb63b46b5eee79f1e69f2ae 100644 (file)
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -1,12 +1,13 @@
-#include "../../common/command/command.qh"
+#include "radarmap.qh"
+#include <common/command/command.qh>
 #include "radarmap.qh"
 
 #include "../g_world.qh"
 #include "../g_subs.qh"
 
-#include "../../common/util.qh"
+#include <common/util.qh>
 
-#include "../../lib/csqcmodel/sv_model.qh"
+#include <lib/csqcmodel/sv_model.qh>
 
 // ===============================================
 //     Generates radar map images for use in the HUD
@@ -209,9 +210,8 @@ void RadarMap_Next()
        remove(radarmapper);
        radarmapper = world;
 }
-void RadarMap_Think()
+void RadarMap_Think(entity this)
 {
-       SELFPARAM();
        // rough map entity
        //   cnt: current line
        //   size: pixel width/height
@@ -373,7 +373,7 @@ float RadarMap_Make(float argc)
        if (!radarmapper)
        {
                radarmapper = new(radarmapper);
-               radarmapper.think = RadarMap_Think;
+               setthink(radarmapper, RadarMap_Think);
                radarmapper.nextthink = time;
                radarmapper.count = 8;  // default to the --trace method, as it is faster now
                radarmapper.ltime = 1;