Fix waypoints marked as pure but still linked to the world and with collision testing...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / warpzone / common.qc

diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc
index af0e7ef9454b1d325a6ad80866917bedab05a80e..0c85d4a088522cce87bbd09fa6b7a2f95ff4f60f 100644 (file)
--- a/qcsrc/lib/warpzone/common.qc
+++ b/qcsrc/lib/warpzone/common.qc
@@ -571,13 +571,26 @@ vector WarpZoneLib_NearestPointOnBox(vector mi, vector ma, vector org)
        return nearest;
 }
 
+// blacklist of entities that WarpZone_FindRadius doesn't care about
 bool WarpZoneLib_BadEntity(entity e)
 {
        if (is_pure(e)) return true;
        string s = e.classname;
 
-       //if (s == "net_linked") return true; // actually some real entities are linked without classname, fail
-       if (s == "") return true;
+       switch(s)
+       {
+               case "weaponentity":
+               case "exteriorweaponentity":
+               case "sprite_waypoint":
+               case "waypoint":
+               case "spawnfunc":
+               case "weaponchild":
+               case "chatbubbleentity":
+               case "buff_model":
+               //case "net_linked": // actually some real entities are linked without classname, fail
+               case "":
+                       return true;
+       }
 
        if (startsWith(s, "target_")) return true;
 
@@ -786,10 +799,13 @@ entity WarpZone_RefSys_SpawnSameRefSys(entity me)
 bool WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher)
 {
        vector emin = toucher.absmin, emax = toucher.absmax;
-       // the engine offsets absolute bounding boxes by a single quake unit
-       // we must undo that here to allow accurate touching
-       emin += '1 1 1';
-       emax -= '1 1 1';
+       if(STAT(Q3COMPAT))
+       {
+               // DP's tracebox enlarges absolute bounding boxes by a single quake unit
+               // we must undo that here to allow accurate touching
+               emin += '1 1 1';
+               emax -= '1 1 1';
+       }
        return !WarpZoneLib_BoxTouchesBrush(emin, emax, this, toucher);
 }