Merge branch 'martin-t/AMMO' 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 1b4a1fc6765425a8e40fab81e5e65a81a973ffe4..a69f43fbd3f7afbdd01bca9d88707ee5255c5729 100644 (file)
--- a/qcsrc/common/weapons/weapon/crylink.qc
+++ b/qcsrc/common/weapons/weapon/crylink.qc
@@ -45,7 +45,8 @@ void W_Crylink_Dequeue(entity e)
 
 void W_Crylink_DeleteLink(entity this)
 {
-       W_Crylink_Dequeue(this);
+       if(this.classname != "spike_oktoremove")
+               W_Crylink_Dequeue(this);
        delete_fn(this);
 }
 
@@ -573,7 +574,7 @@ METHOD(Crylink, wr_think, void(entity thiswep, entity actor, .entity weaponentit
             }
             actor.(weaponentity).crylink_waitrelease = 0;
             if(!thiswep.wr_checkammo1(thiswep, actor, weaponentity) && !thiswep.wr_checkammo2(thiswep, actor, weaponentity))
-            if(!(actor.items & IT_UNLIMITED_WEAPON_AMMO))
+            if(!(actor.items & IT_UNLIMITED_AMMO))
             {
                 // ran out of ammo!
                 actor.cnt = thiswep.m_id;