X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_crylink.qc;h=7cfc6c3850fbd5723fdd038f3b44c7b7d93cd3c0;hb=9d9cf783d3ac428fbbe95553c8f5c7e113d888bb;hp=b2472df2ae0fa5798f7cc3e80de744210cf88827;hpb=6fdab86857d5334d84a3720ec28d863d9da1544a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index b2472df2a..7cfc6c385 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -1,5 +1,15 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(CRYLINK, w_crylink, IT_CELLS, 6, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "crylink", "crylink", _("Crylink"));
+REGISTER_WEAPON(
+/* WEP_##id  */ CRYLINK,
+/* function  */ w_crylink,
+/* ammotype  */ IT_CELLS,
+/* impulse   */ 6,
+/* flags     */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH,
+/* rating    */ BOT_PICKUP_RATING_MID,
+/* model     */ "crylink",
+/* shortname */ "crylink",
+/* fullname  */ _("Crylink")
+);
 #else
 #ifdef SVQC
 .float gravity;
@@ -69,9 +79,9 @@ void W_Crylink_LinkExplode (entity e, entity e2)
 		e.realowner.crylink_lastgroup = world;
 
 	if(e.projectiledeathtype & HITTYPE_SECONDARY)
-		RadiusDamage (e, e.realowner, autocvar_g_balance_crylink_secondary_damage * a, autocvar_g_balance_crylink_secondary_edgedamage * a, autocvar_g_balance_crylink_secondary_radius, world, autocvar_g_balance_crylink_secondary_force * a, e.projectiledeathtype, other);
+		RadiusDamage (e, e.realowner, autocvar_g_balance_crylink_secondary_damage * a, autocvar_g_balance_crylink_secondary_edgedamage * a, autocvar_g_balance_crylink_secondary_radius, world, world, autocvar_g_balance_crylink_secondary_force * a, e.projectiledeathtype, other);
 	else
-		RadiusDamage (e, e.realowner, autocvar_g_balance_crylink_primary_damage * a, autocvar_g_balance_crylink_primary_edgedamage * a, autocvar_g_balance_crylink_primary_radius, world, autocvar_g_balance_crylink_primary_force * a, e.projectiledeathtype, other);
+		RadiusDamage (e, e.realowner, autocvar_g_balance_crylink_primary_damage * a, autocvar_g_balance_crylink_primary_edgedamage * a, autocvar_g_balance_crylink_primary_radius, world, world, autocvar_g_balance_crylink_primary_force * a, e.projectiledeathtype, other);
 
 	W_Crylink_LinkExplode(e.queuenext, e2);
 
@@ -201,7 +211,7 @@ void W_Crylink_LinkJoinEffect_Think()
 					n = n / autocvar_g_balance_crylink_secondary_shots;
 					RadiusDamage (e, e.realowner, autocvar_g_balance_crylink_secondary_joinexplode_damage * n,
 									autocvar_g_balance_crylink_secondary_joinexplode_edgedamage * n,
-									autocvar_g_balance_crylink_secondary_joinexplode_radius * n, e.realowner,
+									autocvar_g_balance_crylink_secondary_joinexplode_radius * n, e.realowner, world,
 									autocvar_g_balance_crylink_secondary_joinexplode_force * n, e.projectiledeathtype, other);
 
 					pointparticles(particleeffectnum("crylink_joinexplode"), self.origin, '0 0 0', n);
@@ -214,7 +224,7 @@ void W_Crylink_LinkJoinEffect_Think()
 					n = n / autocvar_g_balance_crylink_primary_shots;
 					RadiusDamage (e, e.realowner, autocvar_g_balance_crylink_primary_joinexplode_damage * n,
 									autocvar_g_balance_crylink_primary_joinexplode_edgedamage * n,
-									autocvar_g_balance_crylink_primary_joinexplode_radius * n, e.realowner,
+									autocvar_g_balance_crylink_primary_joinexplode_radius * n, e.realowner, world,
 									autocvar_g_balance_crylink_primary_joinexplode_force * n, e.projectiledeathtype, other);
 
 					pointparticles(particleeffectnum("crylink_joinexplode"), self.origin, '0 0 0', n);
@@ -265,7 +275,7 @@ void W_Crylink_Touch (void)
 	if(a)
 		f *= a;
 
-	float totaldamage = RadiusDamage(self, self.realowner, autocvar_g_balance_crylink_primary_damage * f, autocvar_g_balance_crylink_primary_edgedamage * f, autocvar_g_balance_crylink_primary_radius, world, autocvar_g_balance_crylink_primary_force * f, self.projectiledeathtype, other);
+	float totaldamage = RadiusDamage(self, self.realowner, autocvar_g_balance_crylink_primary_damage * f, autocvar_g_balance_crylink_primary_edgedamage * f, autocvar_g_balance_crylink_primary_radius, world, world, autocvar_g_balance_crylink_primary_force * f, self.projectiledeathtype, other);
 	
 	if(totaldamage && ((autocvar_g_balance_crylink_primary_linkexplode == 2) || ((autocvar_g_balance_crylink_primary_linkexplode == 1) && !W_Crylink_Touch_WouldHitFriendly(self, autocvar_g_balance_crylink_primary_radius))))
 	{
@@ -309,7 +319,7 @@ void W_Crylink_Touch2 (void)
 	if(a)
 		f *= a;
 
-	float totaldamage = RadiusDamage(self, self.realowner, autocvar_g_balance_crylink_secondary_damage * f, autocvar_g_balance_crylink_secondary_edgedamage * f, autocvar_g_balance_crylink_secondary_radius, world, autocvar_g_balance_crylink_secondary_force * f, self.projectiledeathtype, other);
+	float totaldamage = RadiusDamage(self, self.realowner, autocvar_g_balance_crylink_secondary_damage * f, autocvar_g_balance_crylink_secondary_edgedamage * f, autocvar_g_balance_crylink_secondary_radius, world, world, autocvar_g_balance_crylink_secondary_force * f, self.projectiledeathtype, other);
 		
 	if(totaldamage && ((autocvar_g_balance_crylink_secondary_linkexplode == 2) || ((autocvar_g_balance_crylink_secondary_linkexplode == 1) && !W_Crylink_Touch_WouldHitFriendly(self, autocvar_g_balance_crylink_secondary_radius))))
 	{