]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Apply player clip collision to observers
authorMario <zacjardine@y7mail.com>
Sat, 8 Sep 2018 10:04:46 +0000 (20:04 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 8 Sep 2018 10:04:46 +0000 (20:04 +1000)
qcsrc/server/client.qc

index 8e6a26961b02c6b845103254f56222496d24a10e..2418500efb121ebcd7ab57f0a633d4cc0a12c9c9 100644 (file)
@@ -332,7 +332,10 @@ void PutObserverInServer(entity this)
        this.strength_finished = 0;
        this.invincible_finished = 0;
        this.superweapons_finished = 0;
-       this.dphitcontentsmask = 0;
+       //this.dphitcontentsmask = 0;
+       this.dphitcontentsmask = DPCONTENTS_SOLID;
+       if (autocvar_g_playerclip_collisions)
+               this.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP;
        this.pushltime = 0;
        this.istypefrag = 0;
        setthink(this, func_null);