X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_electro.qc;h=45168cdacf66fcf60d685f5521ec16f64e2a25aa;hb=1f5d48dd87aaf7d479958202f3960de01ac877d2;hp=974626cca0b92fa3066f2144b3506e06c98b04c1;hpb=079c02f9a7c398d6c433f8ead73a244a6833b77b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 974626cca..45168cdac 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -321,6 +321,38 @@ float w_electro(float req)
 #ifdef CSQC
 float w_electro(float req)
 {
+	if(req == WR_IMPACTEFFECT)
+	{
+		vector org2;
+		org2 = w_org + w_backoff * 6;
+		if(w_deathtype & HITTYPE_SECONDARY)
+		{
+			pointparticles(particleeffectnum("electro_ballexplode"), org2, '0 0 0', 1);
+			if(!w_issilent)
+				sound(self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM);
+		}
+		else
+		{
+			if(w_deathtype & HITTYPE_BOUNCE)
+			{
+				// this is sent as "primary (w_deathtype & HITTYPE_BOUNCE)" to distinguish it from (w_deathtype & HITTYPE_SECONDARY) bounced balls
+				pointparticles(particleeffectnum("electro_combo"), org2, '0 0 0', 1);
+				if(!w_issilent)
+					sound(self, CHAN_PROJECTILE, "weapons/electro_impact_combo.wav", VOL_BASE, ATTN_NORM);
+			}
+			else
+			{
+				pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1);
+				if(!w_issilent)
+					sound(self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM);
+			}
+		}
+	}
+	else if(req == WR_PRECACHE)
+	{
+		precache_sound("weapons/electro_impact.wav");
+		precache_sound("weapons/electro_impact_combo.wav");
+	}
 	return TRUE;
 }
 #endif