From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 23 Jun 2011 18:36:04 +0000 (+0200)
Subject: hit sounds for vehicles
X-Git-Tag: xonotic-v0.5.0~173^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=452e8a288f671cd096c42eb390943cfce9fc7e96;p=xonotic%2Fxonotic-data.pk3dir.git

hit sounds for vehicles
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 0bd7a8da8..0fdeb1354 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -782,15 +782,21 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 			if(deathtype & HITTYPE_HEADSHOT)
 				damage *= 1 + damage_headshotbonus;
 
-			if(targ.classname == "player")
+			entity victim;
+			if((targ.vehicle_flags & VHF_ISVEHICLE) && targ.owner)
+				victim = targ.owner;
+			else
+				victim = targ;
+
+			if(victim.classname == "player")
 			{
-				if(IsDifferentTeam(targ, attacker))
+				if(IsDifferentTeam(victim, attacker))
 				{
 					if(damage > 0)
 					{
 						if(deathtype != DEATH_FIRE)
 						{
-							if(targ.BUTTON_CHAT)
+							if(victim.BUTTON_CHAT)
 								attacker.typehitsound += 1;
 							else
 								attacker.hitsound += 1;
@@ -801,12 +807,13 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
 						if not(DEATH_ISSPECIAL(deathtype))
 						{
+							if(targ.classname == "player") // don't do this for vehicles
 							if(!g_minstagib)
-							if(IsFlying(targ))
+							if(IsFlying(victim))
 								yoda = 1;
 
 							if(g_minstagib)
-							if(targ.items & IT_STRENGTH)
+							if(victim.items & IT_STRENGTH)
 								yoda = 1;
 
 							if(deathtype & HITTYPE_HEADSHOT)