X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fdamage.qc;h=cd7ac7bfa468a1e8422ddb7c131bc9784a0e6436;hb=4dd4d777cd18675c212af922d4d19ad2a40dbb9c;hp=fc8b83b5b6c8666a11efe0961ebe8af011cfcbfb;hpb=a285cb5478e1034f42cf9cb29d205864183129aa;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index fc8b83b5b..cd7ac7bfa 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -39,7 +39,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
 {
 	// particle effects for players and objects damaged by weapons (eg: flames coming out of victims shot with rockets)
 
-	float life, nearestbone;
+	float life, nearestbone = 0;
 	string specstr, effectname;
 	entity e;
 
@@ -61,7 +61,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
 			continue; // player model bone blacklist
 
 		// now choose the bone closest to impact origin
-		if(vlen(hitorg - gettaginfo(self, tagnum)) <= vlen(hitorg - gettaginfo(self, nearestbone)))
+		if(nearestbone == 0 || vlen(hitorg - gettaginfo(self, tagnum)) <= vlen(hitorg - gettaginfo(self, nearestbone)))
 			nearestbone = tagnum;
 	}
 	gettaginfo(self, nearestbone); // set gettaginfo_name
@@ -113,7 +113,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
 
 void Ent_DamageInfo(float isNew)
 {
-	float dmg, rad, edge, thisdmg, forcemul, species, hitplayer;
+	float dmg, rad, edge, thisdmg, forcemul, species, hitplayer = FALSE;
 	vector force, thisforce;
 	entity oldself;
 
@@ -182,7 +182,7 @@ void Ent_DamageInfo(float isNew)
 			if(vlen(thisforce))
 			{
 				self.move_velocity = self.move_velocity + damage_explosion_calcpush(self.damageforcescale * thisforce, self.move_velocity, autocvar_g_balance_damagepush_speedfactor);
-				self.move_flags &~= FL_ONGROUND;
+				self.move_flags &= ~FL_ONGROUND;
 			}
 
 		if(w_issilent)
@@ -211,43 +211,43 @@ void Ent_DamageInfo(float isNew)
 		
 		switch(w_deathtype)
 		{
-			case DEATH_VHCRUSH:
+			case DEATH_VH_CRUSH:
 				break;
 				
 			// spiderbot
-			case DEATH_SBMINIGUN:
+			case DEATH_VH_SPID_MINIGUN:
 				string _snd;
 				_snd = strcat("weapons/ric", ftos(1 + rint(random() * 2)), ".waw");
-				sound(self, CH_SHOTS, _snd, VOL_BASE, ATTN_NORM);
+				sound(self, CH_SHOTS, _snd, VOL_BASE, ATTEN_NORM);
 				pointparticles(particleeffectnum("spiderbot_minigun_impact"), self.origin, w_backoff * 1000, 1);
 				break;
-			case DEATH_SBROCKET:
-				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+			case DEATH_VH_SPID_ROCKET:
+				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
 				pointparticles(particleeffectnum("spiderbot_rocket_explode"), self.origin, w_backoff * 1000, 1);
 				break;
-			case DEATH_SBBLOWUP:
-				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_MIN);
+			case DEATH_VH_SPID_DEATH:
+				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_WAKIGUN:
-				sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
+            
+			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);
 				break;
-			case DEATH_WAKIROCKET:
-				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+			case DEATH_VH_WAKI_ROCKET:
+				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
 				pointparticles(particleeffectnum("wakizashi_rocket_explode"), self.origin, w_backoff * 1000, 1);
 				break;
-			case DEATH_WAKIBLOWUP:
-				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_MIN);
+			case DEATH_VH_WAKI_DEATH:
+				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_RAPTOR_CANNON:
-				sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
+			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);
 				break;
-			case DEATH_RAPTOR_BOMB_SPLIT:
+			case DEATH_VH_RAPT_FRAGMENT:
 				float i;
 				vector ang, vel;
 				for(i = 1; i < 4; ++i)
@@ -256,17 +256,21 @@ void Ent_DamageInfo(float isNew)
 					ang = vectoangles(vel);
 					RaptorCBShellfragToss(w_org, vel, ang + '0 0 1' * (120 * i));
 				}
-				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
 				pointparticles(particleeffectnum("raptor_bomb_spread"), self.origin, w_backoff * 1000, 1);
 				break;
-			case DEATH_RAPTOR_BOMB:
-				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+			case DEATH_VH_RAPT_BOMB:
+				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
 				pointparticles(particleeffectnum("raptor_bomb_impact"), self.origin, w_backoff * 1000, 1);
 				break;
-			case DEATH_RAPTOR_DEATH:
-				sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_MIN);
+			case DEATH_VH_RAPT_DEATH:
+				sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTEN_MIN);
 				pointparticles(particleeffectnum("explosion_big"), self.origin, w_backoff * 1000, 1);
 				break;
+			case DEATH_VH_BUMB_GUN:
+				sound(self, CH_SHOTS, "weapons/fireball_impact2.wav", VOL_BASE, ATTEN_NORM);
+				pointparticles(particleeffectnum("bigplasma_impact"), self.origin, w_backoff * 1000, 1);
+				break;
 		}
 	}
 	
@@ -285,38 +289,38 @@ void Ent_DamageInfo(float isNew)
 		switch(w_deathtype)
 		{   
 			 case DEATH_TURRET_EWHEEL:
-				sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_MIN);
+				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, ATTN_NORM);
+				sound(self, CH_SHOTS, _snd, VOL_BASE, ATTEN_NORM);
 				break;
 				
 			 case DEATH_TURRET_MLRS:
 			 case DEATH_TURRET_HK:
-			 case DEATH_TURRET_WALKER_ROCKET:
+			 case DEATH_TURRET_WALK_ROCKET:
 			 case DEATH_TURRET_HELLION:
-				sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_MIN);
+				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_WALKER_GUN:
+			 case DEATH_TURRET_WALK_GUN:
 				_snd = strcat("weapons/ric", ftos(1 + rint(random() * 2)), ".waw");
-				sound(self, CH_SHOTS, _snd, VOL_BASE, ATTN_NORM);
+				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, ATTN_MIN);
+				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_WALKER_MEELE:
-				sound(self, CH_SHOTS, "weapons/ric1.wav", VOL_BASE, ATTN_MIN);
+			 case DEATH_TURRET_WALK_MEELE:
+				sound(self, CH_SHOTS, "weapons/ric1.wav", VOL_BASE, ATTEN_MIN);
 				pointparticles(particleeffectnum("TE_SPARK"), self.origin, w_backoff * 1000, 1);
 				break;