r114 - trunk/progsqc

[DONOTREPLY at icculus.org]

Author: vermeulen
Date: 2008-03-26 13:59:16 -0400 (Wed, 26 Mar 2008)
New Revision: 114

Modified:
   trunk/progsqc/damage.qc
   trunk/progsqc/inventory.qc
Log:
Fixed an error with friendly fire

Modified: trunk/progsqc/damage.qc
===================================================================
--- trunk/progsqc/damage.qc	2008-03-26 17:32:01 UTC (rev 113)
+++ trunk/progsqc/damage.qc	2008-03-26 17:59:16 UTC (rev 114)
@@ -24,7 +24,7 @@
 	oldself = self;
 	self = targ;
 
-	if ((inflictor.team == attacker.team) && cvar("g_teams"))
+	if ((targ.team == attacker.team) && cvar("g_teams"))
 	{
 		damage = damage * cvar("g_teams_friendlyfire");
 	}

Modified: trunk/progsqc/inventory.qc
===================================================================
--- trunk/progsqc/inventory.qc	2008-03-26 17:32:01 UTC (rev 113)
+++ trunk/progsqc/inventory.qc	2008-03-26 17:59:16 UTC (rev 114)
@@ -277,6 +277,7 @@
 		iteminfo_weapon_viewmodel = cvar_string(wname,"_viewmodel");
 		iteminfo_pickupmodel = cvar_string(wname,"_pickupmodel");
 		iteminfo_viewmodeloffset = stov(cvar_string(wname,"_viewmodeloffset"));
+		iteminfo_modelcolormod = stov(cvar_string(wname,"_modelcolormod"));
 
 		iteminfo_removewhennoammo = cvar(wname,"_removewhennoammo");