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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-05 06:47:53 -0400 (Sat, 05 Sep 2009)
New Revision: 7639

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
Log:
r7623 | div0 | 2009-09-04 03:41:28 -0400 (Fri, 04 Sep 2009) | 2 lines
properly mark splash damage for electro


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-09-05 10:46:40 UTC (rev 7638)
+++ branches/nexuiz-2.0/.patchsets	2009-09-05 10:47:53 UTC (rev 7639)
@@ -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,7601-7602,7605-7610,7612-7615,7618-7620
+revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7601-7602,7605-7610,7612-7615,7618-7620,7623-7623

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc	2009-09-05 10:46:40 UTC (rev 7638)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc	2009-09-05 10:47:53 UTC (rev 7639)
@@ -23,7 +23,7 @@
 
 void W_Plasma_Explode_Combo (void) {
 	self.event_damage = SUB_Null;
-	RadiusDamage (self, self.owner, cvar("g_balance_electro_combo_damage"), cvar("g_balance_electro_combo_edgedamage"), cvar("g_balance_electro_combo_radius"), world, cvar("g_balance_electro_combo_force"), WEP_ELECTRO | HITTYPE_BOUNCE, other); // use THIS type for a combo because primary can't bounce
+	RadiusDamage (self, self.owner, cvar("g_balance_electro_combo_damage"), cvar("g_balance_electro_combo_edgedamage"), cvar("g_balance_electro_combo_radius"), world, cvar("g_balance_electro_combo_force"), WEP_ELECTRO | HITTYPE_BOUNCE, world); // use THIS type for a combo because primary can't bounce
 	remove (self);
 }