From e74179ccd4e946e85956f5935ab0a8bfbe55b39a Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 13 Oct 2018 16:31:17 +1000 Subject: [PATCH] Allow electro orbs to stick to entities if touchexplode is off --- qcsrc/common/weapons/weapon/electro.qc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc index 9988e55b8a..e22b5e9412 100644 --- a/qcsrc/common/weapons/weapon/electro.qc +++ b/qcsrc/common/weapons/weapon/electro.qc @@ -285,8 +285,8 @@ void W_Electro_Orb_Stick(entity this, entity to) void W_Electro_Orb_Touch(entity this, entity toucher) { PROJECTILE_TOUCH(this, toucher); - if(toucher.takedamage == DAMAGE_AIM) - { if(WEP_CVAR_SEC(electro, touchexplode)) { W_Electro_Explode(this, toucher); } } + if(toucher.takedamage == DAMAGE_AIM && WEP_CVAR_SEC(electro, touchexplode)) + { W_Electro_Explode(this, toucher); } else if(toucher.owner != this.owner && toucher.classname != this.classname) // don't stick to player's other projectiles! { //UpdateCSQCProjectile(this); -- 2.39.2