From 0d2641eb6c0303c2ed88888abbe410acdf3f38f0 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 3 Oct 2016 23:43:02 +1000 Subject: [PATCH] Don't explode projectiles if they have the same owner --- qcsrc/common/weapons/weapon/hook.qc | 2 +- qcsrc/server/miscfunctions.qc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc index 964877425..ce7bbc3f9 100644 --- a/qcsrc/common/weapons/weapon/hook.qc +++ b/qcsrc/common/weapons/weapon/hook.qc @@ -379,7 +379,7 @@ void Draw_GrapplingHook(entity this) InterpolateOrigin_Do(this); - int s = viewmodels[this.cnt].m_gunalign - 1; //W_GunAlign(NULL, STAT(GUNALIGN)); + int s = W_GunAlign(viewmodels[this.cnt], STAT(GUNALIGN)) - 1; switch(this.HookType) { diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 0237a75ad..efb24f4e0 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -1077,6 +1077,8 @@ bool WarpZone_Projectile_Touch_ImpactFilter_Callback(entity this, entity toucher { if(SUB_OwnerCheck(this, toucher)) return true; + if(toucher.owner == this.owner) + return true; if(SUB_NoImpactCheck(this, toucher)) { if(this.classname == "nade") -- 2.39.2