]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix sticky electro orbs and mines being unhittable on DP master
authorbones_was_here <bones_was_here@xonotic.au>
Fri, 15 Sep 2023 17:15:12 +0000 (03:15 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Fri, 15 Sep 2023 17:15:12 +0000 (03:15 +1000)
The moving projectiles are configured correctly but when they touch a
surface they're deleted and replaced with a sticky projectile.
Those weren't configured to be hittable directly, and weren't linked to
the area grid so findradius couldn't find them for splash damage.

qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/minelayer.qc

index 2c03871ce54580335fe95adff435d86d4a555818..280267a9ad3de6368294cb332cc34a829c261720 100644 (file)
@@ -305,6 +305,7 @@ void W_Electro_Orb_Stick(entity this, entity to)
 
        newproj.owner = this.owner;
        newproj.realowner = this.realowner;
+       PROJECTILE_MAKETRIGGER(newproj);
        setorigin(newproj, this.origin);
        setmodel(newproj, MDL_PROJECTILE_ELECTRO);
        setsize(newproj, this.mins, this.maxs);
index c73db2bc28f1d9e634d87b36fc4a21b5146b6e39..63c7b9e44395cb62e21a3930e21ffb18704e765f 100644 (file)
@@ -18,6 +18,7 @@ void W_MineLayer_Stick(entity this, entity to)
 
        newmine.owner = this.owner;
        newmine.realowner = this.realowner;
+       PROJECTILE_MAKETRIGGER(newmine);
        setorigin(newmine, this.origin);
        setmodel(newmine, MDL_MINELAYER_MINE);
        setsize(newmine, '-4 -4 -4', '4 4 4');