[nexuiz-commits] r7806 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-15 05:47:15 -0400 (Tue, 15 Sep 2009)
New Revision: 7806

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/ctf.qc
Log:
r7786 | div0 | 2009-09-14 08:54:35 -0400 (Mon, 14 Sep 2009) | 2 lines
--typos


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-09-15 09:44:32 UTC (rev 7805)
+++ branches/nexuiz-2.0/.patchsets	2009-09-15 09:47:15 UTC (rev 7806)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7599-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7630-7630,7644-7651,7656-7656,7658-7660,7663-7665,7670-7670,7672-7676,7678-7680,7686-7687,7689-7698,7701-7701,7703-7714,7717-7723,7731-7731,7735-7741,7744-7745,7752-7754,7756-7758,7761-7764,7771-7773,7775-7775,7778-7778,7781-7785,7787-7788,7795-7799
+revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7599-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7630-7630,7644-7651,7656-7656,7658-7660,7663-7665,7670-7670,7672-7676,7678-7680,7686-7687,7689-7698,7701-7701,7703-7714,7717-7723,7731-7731,7735-7741,7744-7745,7752-7754,7756-7758,7761-7764,7771-7773,7775-7775,7778-7778,7781-7788,7795-7799

Modified: branches/nexuiz-2.0/data/qcsrc/server/ctf.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/ctf.qc	2009-09-15 09:44:32 UTC (rev 7805)
+++ branches/nexuiz-2.0/data/qcsrc/server/ctf.qc	2009-09-15 09:47:15 UTC (rev 7806)
@@ -620,7 +620,7 @@
 			setorigin(self, FLAG_CARRY_POS);
 			setattachment(self, other, "");
 			self.damageforcescale = 0;
-			e.takedamage = DAMAGE_NO;
+			self.takedamage = DAMAGE_NO;
 			WaypointSprite_AttachCarrier("flagcarrier", other);
 			WaypointSprite_UpdateTeamRadar(other.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, '1 1 0');
 		}