X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_violence.qc;h=fdff4a66f369bf8c9e8cf45709e146395ad0f2d7;hp=d863669bb0b79f11a045a33c7363516a807a6de5;hb=77f03e6ce033bef39ac19e0e7cb6e606ffcb26db;hpb=8ea3d89ce81755c729dfc3f69d4dc32dcabae31f

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index d863669bb..fdff4a66f 100644
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -1,13 +1,15 @@
+#include "g_violence.qh"
+
 float Violence_GibSplash_SendEntity(entity to, float sf)
 {
 	WriteByte(MSG_ENTITY, ENT_CLIENT_GIBSPLASH);
 	WriteByte(MSG_ENTITY, self.state); // actually type
 	WriteByte(MSG_ENTITY, bound(1, self.cnt * 16, 255)); // gibbage amount multiplier
-	WriteShort(MSG_ENTITY, floor(self.origin_x / 4)); // not using a coord here, as gibs don't need this accuracy
-	WriteShort(MSG_ENTITY, floor(self.origin_y / 4)); // not using a coord here, as gibs don't need this accuracy
-	WriteShort(MSG_ENTITY, floor(self.origin_z / 4)); // not using a coord here, as gibs don't need this accuracy
-	WriteShort(MSG_ENTITY, self.oldorigin_x); // acrually compressed velocity
-	return TRUE;
+	WriteShort(MSG_ENTITY, floor(self.origin.x / 4)); // not using a coord here, as gibs don't need this accuracy
+	WriteShort(MSG_ENTITY, floor(self.origin.y / 4)); // not using a coord here, as gibs don't need this accuracy
+	WriteShort(MSG_ENTITY, floor(self.origin.z / 4)); // not using a coord here, as gibs don't need this accuracy
+	WriteShort(MSG_ENTITY, self.oldorigin.x); // acrually compressed velocity
+	return true;
 }
 
 // TODO maybe convert this to a TE?
@@ -25,77 +27,23 @@ void Violence_GibSplash_At(vector org, vector dir, float type, float amount, ent
 	if(!sound_allowed(MSG_BROADCAST, gibowner) || !sound_allowed(MSG_BROADCAST, attacker))
 		e.state |= 0x40; // "silence" bit
 	e.state |= 8 * self.species; // gib type, ranges from 0 to 15
+
+	// if this is a copied dead body, send the num of its player instead
+	// TODO: remove this field, read from model txt files
+	if(self.classname == "body")
+		e.team = num_for_edict(self.enemy);
+	else
+		e.team = num_for_edict(self);
+
 	setorigin(e, org);
 	e.velocity = dir;
 
 	e.oldorigin_x = compressShortVector(e.velocity);
 
-	Net_LinkEntity(e, FALSE, 0.2, Violence_GibSplash_SendEntity);
+	Net_LinkEntity(e, false, 0.2, Violence_GibSplash_SendEntity);
 }
 
 void Violence_GibSplash(entity source, float type, float amount, entity attacker)
 {
 	Violence_GibSplash_At(source.origin + source.view_ofs, source.velocity, type, amount, source, attacker);
 }
-
-float Violence_DamageEffect_SendEntity(entity to, float sf)
-{
-	WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEEFFECT);
-	WriteByte(MSG_ENTITY, self.cnt); // the damage weapon
-	WriteByte(MSG_ENTITY, self.state); // species
-	WriteCoord(MSG_ENTITY, floor(self.origin_x));
-	WriteCoord(MSG_ENTITY, floor(self.origin_y));
-	WriteCoord(MSG_ENTITY, floor(self.origin_z));
-	return TRUE;
-}
-
-void Violence_DamageEffect(entity pl, float type)
-{
-	entity e;
-
-	e = spawn();
-	e.classname = "weapondamage";
-	e.cnt = type;
-	e.state |= 8 * pl.species; // gib type, ranges from 0 to 15
-	setorigin(e, pl.origin);
-
-	Net_LinkEntity(e, FALSE, 0.2, Violence_DamageEffect_SendEntity);
-}
-
-.float lifetime;
-.float player_damageeffect_active;
-
-void Violence_DamageEffect_DoRepeat()
-{
-	if(time > self.lifetime)
-	{
-		self.owner.player_damageeffect_active = FALSE;
-		self.nextthink = 0;
-		remove(self);
-		return;
-	}
-
-	Violence_DamageEffect(self.owner, self.cnt);
-	self.nextthink = time + autocvar_sv_damageeffect_tick;
-}
-
-void Violence_DamageEffect_SetRepeat(entity pl, float type)
-{
-	if(sv_gentle)
-		return;
-	// return if we already have a damage effect active, else too many damage effects get spammed
-	if(pl.player_damageeffect_active)
-		return;
-
-	entity repeater;
-	repeater = spawn();
-	repeater.classname = "weapondamage_repeater";
-	repeater.owner = pl;
-	repeater.origin = pl.origin;
-	repeater.cnt = type;
-	repeater.lifetime = time + autocvar_sv_damageeffect_lifetime;
-	repeater.think = Violence_DamageEffect_DoRepeat;
-	repeater.nextthink = time;
-
-	pl.player_damageeffect_active = TRUE;
-}