From cf86abbca8980282d15916dac09f78800515fb0a Mon Sep 17 00:00:00 2001 From: savagex Date: Sat, 19 May 2007 18:31:48 +0000 Subject: [PATCH] func_assault_destructible are only attackable by attackers now. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2615 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/assault.qc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/assault.qc b/data/qcsrc/server/assault.qc index 957e2972e..60edf15da 100644 --- a/data/qcsrc/server/assault.qc +++ b/data/qcsrc/server/assault.qc @@ -133,9 +133,8 @@ void assault_destructible_use() { } 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 @@ void func_assault_destructible() { 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 @@ void assault_new_round() { 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"); } -- 2.39.2