Merge branch 'drjaska/crylink-waitrelease' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / crylink.qc

diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc
index 074a99abab9887a7271d4ff78cd1ddfbbd3a9ae6..a9504919a94342997d5f12538f948bd7d6ba756a 100644 (file)
--- a/qcsrc/common/weapons/weapon/crylink.qc
+++ b/qcsrc/common/weapons/weapon/crylink.qc
@@ -392,7 +392,7 @@ void W_Crylink_Attack(Weapon thiswep, entity actor, .entity weaponentity)
 
                MUTATOR_CALLHOOK(EditProjectile, actor, proj);
        }
-       if(WEP_CVAR_PRI(crylink, joinspread) != 0)
+       if(WEP_CVAR_PRI(crylink, joinspread) != 0 && WEP_CVAR_PRI(crylink, shots) > 1)
        {
                actor.(weaponentity).crylink_lastgroup = proj;
                W_Crylink_CheckLinks(proj);
@@ -513,7 +513,7 @@ void W_Crylink_Attack2(Weapon thiswep, entity actor, .entity weaponentity)
 
                MUTATOR_CALLHOOK(EditProjectile, actor, proj);
        }
-       if(WEP_CVAR_SEC(crylink, joinspread) != 0)
+       if(WEP_CVAR_SEC(crylink, joinspread) != 0 && WEP_CVAR_SEC(crylink, shots) > 1)
        {
                actor.(weaponentity).crylink_lastgroup = proj;
                W_Crylink_CheckLinks(proj);