Merge remote-tracking branch 'origin/divVerent/merged-translations'

[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 99543cfa80753917acba92782e1c966561a8d93f..7fd707813570331d9d20f4d63a958138f70cc01b 100644 (file)
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -2,15 +2,6 @@
 //     Generates radar map images for use in the HUD
 // ===============================================
 
-entity radarmapper;
-
-float RADAR_WIDTH_MAX = 512;
-float RADAR_HEIGHT_MAX = 512;
-float sharpen_buffer[RADAR_WIDTH_MAX * 3];
-string doublehex = "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFFFF";
-// FF is contained twice, to map 256 to FF too
-// removes the need to bound()
-
 float FullTraceFraction(vector a, vector mi, vector ma, vector b)
 {
        vector c;
@@ -37,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);
 
                white += vlen(trace_endpos - c);
                c = trace_endpos;
@@ -223,7 +214,7 @@ void RadarMap_Next()
        else if(radarmapper.count & 2)
        {
                localcmd(strcat("defer 1 \"sv_cmd radarmap --flags ", ftos(radarmapper.count), strcat(" --res ", ftos(radarmapper.size_x), " ", ftos(radarmapper.size_y), " --sharpen ", ftos(radarmapper.ltime), " --qual ", ftos(radarmapper.size_z)), "\"\n"));
-               GotoNextMap();
+               GotoNextMap(0);
        }
        remove(radarmapper);
        radarmapper = world;
@@ -406,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
@@ -433,4 +424,4 @@ float RadarMap_Make(float argc)
        }
        
        return FALSE;
-}
\ No newline at end of file
+}