X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fcrylink.qc;h=db14a603068f47d3b9c267cad6369b2573359dd7;hp=3589146352e18d6fe74b3616147cc6233b3d7958;hb=d8e73f411f306e6d475bf385bfe5777692aee4a0;hpb=9e50112561ad6f4cefe6d13bd7185f5dfd1ada4b

diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc
index 358914635..db14a6030 100644
--- a/qcsrc/common/weapons/weapon/crylink.qc
+++ b/qcsrc/common/weapons/weapon/crylink.qc
@@ -43,9 +43,15 @@ void W_Crylink_Dequeue(entity e)
 	W_Crylink_Dequeue_Raw(e.crylink_owner, e.queueprev, e, e.queuenext);
 }
 
+void W_Crylink_DeleteLink(entity this)
+{
+	if(this.classname != "spike_oktoremove")
+		W_Crylink_Dequeue(this);
+	delete_fn(this);
+}
+
 void W_Crylink_Reset(entity this)
 {
-	W_Crylink_Dequeue(this);
 	delete(this);
 }
 
@@ -263,7 +269,6 @@ void W_Crylink_Touch(entity this, entity toucher)
 	else if(finalhit)
 	{
 		// just unlink
-		W_Crylink_Dequeue(this);
 		delete(this);
 		return;
 	}
@@ -278,7 +283,6 @@ void W_Crylink_Touch(entity this, entity toucher)
 
 void W_Crylink_Fadethink(entity this)
 {
-	W_Crylink_Dequeue(this);
 	delete(this);
 }
 
@@ -308,6 +312,7 @@ void W_Crylink_Attack(Weapon thiswep, entity actor, .entity weaponentity)
 	for(counter = 0; counter < shots; ++counter)
 	{
 		proj = new(spike);
+		proj.dtor = W_Crylink_DeleteLink;
 		proj.reset = W_Crylink_Reset;
 		proj.realowner = proj.owner = actor;
 		proj.crylink_owner = actor;
@@ -420,6 +425,7 @@ void W_Crylink_Attack2(Weapon thiswep, entity actor, .entity weaponentity)
 	for(counter = 0; counter < shots; ++counter)
 	{
 		proj = new(spike);
+		proj.dtor = W_Crylink_DeleteLink;
 		proj.weaponentity_fld = weaponentity;
 		proj.reset = W_Crylink_Reset;
 		proj.realowner = proj.owner = actor;