We DO need to detect double-hits, due to the weird engine tracing that

[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 16f3212eda0cc1852569ac0de61a11d67b1ff470..f2205b68d5a5a8c8b26706c94364df72de9233b8 100644 (file)
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -28,7 +28,7 @@ float FullTraceFraction(vector a, vector mi, vector ma, vector b)
                        c = trace_endpos;
                }
 
-               n += tracebox_inverted(c, mi, ma, b, MOVE_WORLDONLY, world);
+               n += tracebox_inverted(c, mi, ma, b, MOVE_WORLDONLY, world, FALSE, world);
 
                white += vlen(trace_endpos - c);
                c = trace_endpos;
@@ -226,7 +226,7 @@ void RadarMap_Think()
        //   size: pixel width/height
        //   maxs: cell width/height
        //   frame: counter
-       
+
        float i, x, l;
        string si;
 
@@ -380,7 +380,7 @@ void RadarMap_Think()
 float RadarMap_Make(float argc)
 {
        float i;
-       
+
        if(!radarmapper)
        {
                radarmapper = spawn();
@@ -397,9 +397,9 @@ float RadarMap_Make(float argc)
                                case "--force": { radarmapper.count |= 1; break; }
                                case "--loop": { radarmapper.count |= 2; break; }
                                case "--quit": { radarmapper.count |= 4; break; }
-                               case "--block": { radarmapper.count &~= 24; break; }
-                               case "--trace": { radarmapper.count &~= 24; radarmapper.count |= 8; break; }
-                               case "--sample": { radarmapper.count &~= 24; radarmapper.count |= 16; break; }
+                               case "--block": { radarmapper.count &= ~24; break; }
+                               case "--trace": { radarmapper.count &= ~24; radarmapper.count |= 8; break; }
+                               case "--sample": { radarmapper.count &= ~24; radarmapper.count |= 16; break; }
                                case "--lineblock": { radarmapper.count |= 24; break; }
                                case "--flags": { ++i; radarmapper.count = stof(argv(i)); break; } // for the recursive call
                                case "--sharpen": { ++i; radarmapper.ltime = stof(argv(i)); break; } // for the recursive call
@@ -407,21 +407,21 @@ float RadarMap_Make(float argc)
                                case "--resolution": { ++i; radarmapper.size_x = stof(argv(i)); ++i; radarmapper.size_y = stof(argv(i)); break; }
                                case "--qual": // minor alias
                                case "--quality": { ++i; radarmapper.size_z = stof(argv(i)); break; }
-                               
-                               default: 
-                                       i = argc; 
+
+                               default:
+                                       i = argc;
                                        remove(radarmapper);
                                        radarmapper = world;
                                        break;
                        }
                }
-                               
-               if(radarmapper) // after doing the arguments, see if we successfully went forward. 
+
+               if(radarmapper) // after doing the arguments, see if we successfully went forward.
                {
                        print("Radarmap entity spawned.\n");
                        return TRUE; // if so, don't print usage.
                }
        }
-       
+
        return FALSE;
-}
\ No newline at end of file
+}