X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fdamage.qc;h=0cbcfbd085d49af7814bf5af04897c1c39fd6549;hp=cd7ac7bfa468a1e8422ddb7c131bc9784a0e6436;hb=7f6f6ddf5a60125f13cbc906c5e29faf61310d80;hpb=94cd32389004162a325b9e08cfb39bbae156eb0e

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index cd7ac7bfa..0cbcfbd08 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -22,11 +22,7 @@ void DamageEffect_Think()
 		return;
 	}
 	self.state = self.owner.csqcmodel_isdead;
-#ifdef COMPAT_XON050_ENGINE
-	if(self.owner.isplayermodel && (self.owner.entnum == player_localentnum || self.owner.entnum == spectatee_status) && !autocvar_chase_active)
-#else
 	if(self.owner.isplayermodel && (self.owner.entnum == player_localentnum) && !autocvar_chase_active)
-#endif
 		return; // if we aren't using a third person camera, hide our own effects
 
 	// now generate the particles
@@ -80,27 +76,22 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
 	}
 
 	life = bound(autocvar_cl_damageeffect_lifetime_min, dmg * autocvar_cl_damageeffect_lifetime, autocvar_cl_damageeffect_lifetime_max);
-	specstr = species_prefix(specnum);
-	type = DEATH_WEAPONOF(type);
-	e = get_weaponinfo(type);
-
-	effectname = strcat("damage_", e.netname);
-	
-	// if damage was dealt with a bullet weapon, our effect is blood
-	// since blood is species dependent, include the species tag
-	if(type == WEP_SHOTGUN || type == WEP_UZI || type == WEP_RIFLE)
+
+	effectname = get_weaponinfo(DEATH_WEAPONOF(type)).netname;
+
+	if(substring(effectname, strlen(effectname) - 5, 5) == "BLOOD")
 	{
 		if(self.isplayermodel)
 		{
-			effectname = strcat(effectname, "_", specstr);
-			effectname = substring(effectname, 0, strlen(effectname) - 1); // remove the _ symbol at the end of the species tag
+			specstr = species_prefix(specnum);
+			specstr = substring(specstr, 0, strlen(specstr) - 1);
+			effectname = strreplace("BLOOD", specstr, effectname); 
 		}
-		else
-			return; // objects don't bleed
+		else { return; } // objects don't bleed
 	}
 
 	e = spawn();
-	setmodel(e, "null"); // necessary to attach and read origin // samual: FIXME: this is weird, is there some better way to do this?
+	setmodel(e, "null"); // necessary to attach and read origin
 	setattachment(e, self, gettaginfo_name); // attach to the given bone
 	e.classname = "damage";
 	e.owner = self;
@@ -133,7 +124,7 @@ void Ent_DamageInfo(float isNew)
 	force = decompressShortVector(ReadShort());
 	species = ReadByte();
 
-	if not(isNew)
+	if (!isNew)
 		return;
 
 	if(rad < 0)
@@ -143,7 +134,7 @@ void Ent_DamageInfo(float isNew)
 	}
 	else
 		forcemul = 1;
-	
+
 	for(self = findradius(w_org, rad + MAX_DAMAGEEXTRARADIUS); self; self = self.chain)
 	{
 		// attached ents suck
@@ -198,7 +189,7 @@ void Ent_DamageInfo(float isNew)
 	}
 
 	self = oldself;
-	
+
 	if(DEATH_ISVEHICLE(w_deathtype))
 	{
 		traceline(w_org - normalize(force) * 16, w_org + normalize(force) * 16, MOVE_NOMONSTERS, world);
@@ -206,14 +197,14 @@ void Ent_DamageInfo(float isNew)
 			w_backoff = trace_plane_normal;
 		else
 			w_backoff = -1 * normalize(w_org - (w_org + normalize(force) * 16));
-		
+
 		setorigin(self, w_org + w_backoff * 2); // for sound() calls
-		
+
 		switch(w_deathtype)
 		{
 			case DEATH_VH_CRUSH:
 				break;
-				
+
 			// spiderbot
 			case DEATH_VH_SPID_MINIGUN:
 				string _snd;
@@ -229,7 +220,7 @@ void Ent_DamageInfo(float isNew)
 				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_MIN);
 				pointparticles(particleeffectnum("explosion_big"), self.origin, w_backoff * 1000, 1);
 				break;
-            
+
 			case DEATH_VH_WAKI_GUN:
 				sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTEN_NORM);
 				pointparticles(particleeffectnum("wakizashi_gun_impact"), self.origin, w_backoff * 1000, 1);
@@ -242,7 +233,7 @@ void Ent_DamageInfo(float isNew)
 				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_MIN);
 				pointparticles(particleeffectnum("explosion_big"), self.origin, w_backoff * 1000, 1);
 				break;
-				
+
 			case DEATH_VH_RAPT_CANNON:
 				sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTEN_NORM);
 				pointparticles(particleeffectnum("raptor_cannon_impact"), self.origin, w_backoff * 1000, 1);
@@ -273,8 +264,8 @@ void Ent_DamageInfo(float isNew)
 				break;
 		}
 	}
-	
-	
+
+
 	if(DEATH_ISTURRET(w_deathtype))
 	{
 		string _snd;
@@ -283,22 +274,22 @@ void Ent_DamageInfo(float isNew)
 			w_backoff = trace_plane_normal;
 		else
 			w_backoff = -1 * normalize(w_org - (w_org + normalize(force) * 16));
-		
+
 		setorigin(self, w_org + w_backoff * 2); // for sound() calls
-		
+
 		switch(w_deathtype)
-		{   
+		{
 			 case DEATH_TURRET_EWHEEL:
 				sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTEN_MIN);
 				pointparticles(particleeffectnum("laser_impact"), self.origin, w_backoff * 1000, 1);
 				break;
-			 
+
 			 case DEATH_TURRET_FLAC:
 				pointparticles(particleeffectnum("hagar_explode"), w_org, '0 0 0', 1);
 				_snd = strcat("weapons/hagexp", ftos(1 + rint(random() * 2)), ".waw");
 				sound(self, CH_SHOTS, _snd, VOL_BASE, ATTEN_NORM);
 				break;
-				
+
 			 case DEATH_TURRET_MLRS:
 			 case DEATH_TURRET_HK:
 			 case DEATH_TURRET_WALK_ROCKET:
@@ -306,37 +297,37 @@ void Ent_DamageInfo(float isNew)
 				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_MIN);
 				pointparticles(particleeffectnum("rocket_explode"), self.origin, w_backoff * 1000, 1);
 				break;
-			 
+
 			 case DEATH_TURRET_MACHINEGUN:
 			 case DEATH_TURRET_WALK_GUN:
 				_snd = strcat("weapons/ric", ftos(1 + rint(random() * 2)), ".waw");
 				sound(self, CH_SHOTS, _snd, VOL_BASE, ATTEN_NORM);
 				pointparticles(particleeffectnum("machinegun_impact"), self.origin, w_backoff * 1000, 1);
 				break;
-						  
+
 			 case DEATH_TURRET_PLASMA:
 				sound(self, CH_SHOTS, "weapons/electro_impact.wav", VOL_BASE, ATTEN_MIN);
 				pointparticles(particleeffectnum("electro_impact"), self.origin, w_backoff * 1000, 1);
 				break;
-						  
-			 case DEATH_TURRET_WALK_MEELE:
+
+			 case DEATH_TURRET_WALK_MELEE:
 				sound(self, CH_SHOTS, "weapons/ric1.wav", VOL_BASE, ATTEN_MIN);
 				pointparticles(particleeffectnum("TE_SPARK"), self.origin, w_backoff * 1000, 1);
 				break;
 
 			 case DEATH_TURRET_PHASER:
 				break;
-				
+
 			 case DEATH_TURRET_TESLA:
 				te_smallflash(self.origin);
 				break;
 
 		}
 	}
-	
+
 	// TODO spawn particle effects and sounds based on w_deathtype
 	if(!DEATH_ISSPECIAL(w_deathtype))
-	if not(hitplayer && !rad) // don't show ground impacts for hitscan weapons if a player was hit
+	if(!hitplayer || rad) // don't show ground impacts for hitscan weapons if a player was hit
 	{
 		float hitwep;
 
@@ -344,19 +335,12 @@ void Ent_DamageInfo(float isNew)
 		w_random = prandom();
 
 		traceline(w_org - normalize(force) * 16, w_org + normalize(force) * 16, MOVE_NOMONSTERS, world);
-		if(trace_fraction < 1 && hitwep != WEP_NEX && hitwep != WEP_MINSTANEX)
+		if(trace_fraction < 1 && hitwep != WEP_VORTEX && hitwep != WEP_VAPORIZER)
 			w_backoff = trace_plane_normal;
 		else
 			w_backoff = -1 * normalize(force);
 		setorigin(self, w_org + w_backoff * 2); // for sound() calls
 
-		(get_weaponinfo(hitwep)).weapon_func(WR_IMPACTEFFECT);
+		if(!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)) { WEP_ACTION(hitwep, WR_IMPACTEFFECT); }
 	}
 }
-
-void DamageInfo_Precache()
-{
-	float i;
-	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-		(get_weaponinfo(i)).weapon_func(WR_PRECACHE);
-}