Don't explode projectiles if they have the same owner

diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc
index 964877425420949fdcd06bcb1d1e7524c1efdadc..ce7bbc3f916786604ab972ae5c422f06fa3f805d 100644 (file)
--- 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 0237a75ad9c66668abe055948e8145c5a4f79e1e..efb24f4e0a2efda5530a2bc56e00b73cc8a50c4f 100644 (file)
--- 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")