r4112 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Aug 11 15:24:05 EDT 2008
Author: div0
Date: 2008-08-11 15:24:04 -0400 (Mon, 11 Aug 2008)
New Revision: 4112
Modified:
trunk/data/qcsrc/server/g_damage.qc
Log:
wanted to handle independent players with OR, not AND
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2008-08-11 19:21:58 UTC (rev 4111)
+++ trunk/data/qcsrc/server/g_damage.qc 2008-08-11 19:24:04 UTC (rev 4112)
@@ -515,7 +515,7 @@
if(deathtype != DEATH_TELEFRAG)
if(attacker.classname == "player")
{
- if(targ.classname == "player" && targ != attacker && IS_INDEPENDENT_PLAYER(attacker) && IS_INDEPENDENT_PLAYER(targ))
+ if(targ.classname == "player" && targ != attacker && (IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(targ)))
{
damage = 0;
force = '0 0 0';
More information about the nexuiz-commits
mailing list