r2615 - trunk/data/qcsrc/server
savagex at icculus.org
savagex at icculus.org
Sat May 19 14:31:48 EDT 2007
Author: savagex
Date: 2007-05-19 14:31:48 -0400 (Sat, 19 May 2007)
New Revision: 2615
Modified:
trunk/data/qcsrc/server/assault.qc
Log:
func_assault_destructible are only attackable by attackers now.
Modified: trunk/data/qcsrc/server/assault.qc
===================================================================
--- trunk/data/qcsrc/server/assault.qc 2007-05-19 18:24:23 UTC (rev 2614)
+++ trunk/data/qcsrc/server/assault.qc 2007-05-19 18:31:48 UTC (rev 2615)
@@ -133,9 +133,8 @@
}
void assault_destructible_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) {
- // TODO: check for teams
- if(self.cnt > 0)
+ if(self.cnt > 0 && self.team == attacker.team)
self.health = self.health - damage;
}
@@ -172,6 +171,7 @@
self.cnt = 0; // not yet activated
self.classname = "func_assault_destructible";
+ self.team = COLOR_TEAM1; // red team, gets swapped every round
self.mdl = self.model;
setmodel(self, self.mdl);
@@ -236,6 +236,11 @@
oldself = self;
self = ent;
assault_destructible_reset();
+ if(self.team == COLOR_TEAM1) {
+ self.team = COLOR_TEAM2;
+ } else {
+ self.team = COLOR_TEAM1;
+ }
self = oldself;
ent = find(ent, classname, "func_assault_destructible");
}
More information about the nexuiz-commits
mailing list