]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Restore an updated version of the blacklist of entities that WarpZone_FindRadius...
authorterencehill <piuntn@gmail.com>
Sun, 7 Mar 2021 23:23:48 +0000 (00:23 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 7 Mar 2021 23:23:48 +0000 (00:23 +0100)
qcsrc/lib/warpzone/common.qc

index af0e7ef9454b1d325a6ad80866917bedab05a80e..38e0e37d9b63fa1e2a1d45fbc9911e10a5a14187 100644 (file)
@@ -571,13 +571,27 @@ 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 "gibsplash":
+               case "damageinfo":
+               case "spawnfunc":
+               case "weaponchild":
+               case "chatbubbleentity":
+               //case "net_linked": // actually some real entities are linked without classname, fail
+               case "":
+                       return true;
+       }
 
        if (startsWith(s, "target_")) return true;