X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fradarmap.qc;h=998de24cbc74550167873424458ba863f6d4d3f8;hb=5e813f65d212e2cfc5c32eae682c0a1b0c0f73da;hp=dd1d5deafdf16c95396ab63d448f358f858edbd8;hpb=df2fe9b28cb6210b671bec6d5ae834ff4eb2e2db;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc
index dd1d5deaf..998de24cb 100644
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -30,7 +30,7 @@ float FullTraceFraction(vector a, vector mi, vector ma, vector b)
 	{
 		++m;
 
-		tracebox(c, mi, ma, b, MOVE_WORLDONLY, world);
+		tracebox(c, mi, ma, b, MOVE_WORLDONLY, NULL);
 		++n;
 
 		if (!trace_startsolid)
@@ -39,7 +39,7 @@ float FullTraceFraction(vector a, vector mi, vector ma, vector b)
 			c = trace_endpos;
 		}
 
-		n += tracebox_inverted(c, mi, ma, b, MOVE_WORLDONLY, world, false, world);
+		n += tracebox_inverted(c, mi, ma, b, MOVE_WORLDONLY, NULL, false, NULL);
 
 		white += vlen(trace_endpos - c);
 		c = trace_endpos;
@@ -90,7 +90,7 @@ float RadarMapAtPoint_LineBlock(float x, float y, float w, float h, float zmin,
 		v2_x += random() * (ma.x - mi.x);
 		v2_y += random() * (ma.y - mi.y);
 		v2_z += random() * (ma.z - mi.z);
-		traceline(v1, v2, MOVE_WORLDONLY, world);
+		traceline(v1, v2, MOVE_WORLDONLY, NULL);
 		if (trace_startsolid || trace_fraction < 1) ++r;
 	}
 	return r / q;
@@ -117,7 +117,7 @@ float RadarMapAtPoint_Block(float x, float y, float w, float h, float zmin, floa
 	r = 0;
 	for (i = 0; i < q; ++i)
 	{
-		tracebox(o + dz * i, mi, ma, o + dz * i, MOVE_WORLDONLY, world);
+		tracebox(o + dz * i, mi, ma, o + dz * i, MOVE_WORLDONLY, NULL);
 		if (trace_startsolid) ++r;
 	}
 	return r / q;
@@ -145,7 +145,7 @@ float RadarMapAtPoint_Sample(float x, float y, float w, float h, float zmin, flo
 		v.x = a.x + random() * b.x;
 		v.y = a.y + random() * b.y;
 		v.z = a.z + random() * b.z;
-		traceline(v, v, MOVE_WORLDONLY, world);
+		traceline(v, v, MOVE_WORLDONLY, NULL);
 		if (trace_startsolid) ++c;
 	}
 
@@ -207,8 +207,8 @@ void RadarMap_Next()
 		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(0);
 	}
-	remove(radarmapper);
-	radarmapper = world;
+	delete(radarmapper);
+	radarmapper = NULL;
 }
 void RadarMap_Think(entity this)
 {
@@ -253,8 +253,8 @@ void RadarMap_Think(entity this)
 		if (this.cnt < 0)
 		{
 			LOG_INFO("Error writing ", this.netname, "\n");
-			remove(this);
-			radarmapper = world;
+			delete(this);
+			radarmapper = NULL;
 			return;
 		}
 		LOG_INFO("Writing to ", this.netname, "...\n");
@@ -439,8 +439,8 @@ float RadarMap_Make(float argc)
 
 				default:
 					i = argc;
-					remove(radarmapper);
-					radarmapper = world;
+					delete(radarmapper);
+					radarmapper = NULL;
 					break;
 			}
 		}