From 27a7bea0894af7edc8722a3af405fee095c032fe Mon Sep 17 00:00:00 2001 From: savagex Date: Mon, 21 May 2007 10:44:12 +0000 Subject: [PATCH] assault mode: use proper sprites git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2646 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/assault.qc | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/assault.qc b/data/qcsrc/server/assault.qc index 4c7e81323..28fa9f149 100644 --- a/data/qcsrc/server/assault.qc +++ b/data/qcsrc/server/assault.qc @@ -83,11 +83,17 @@ void target_objective() { } float assault_objective_decrease_customizeforclient() { + if(!self.spawnflags) + return FALSE; + if(self.cnt == 0) { if(other.team == assault_attacker_team) - setmodel(self, "models/sprites/here.sp2"); + if(self.spawnflags == 1) + setmodel(self, "models/sprites/push.sp2"); + else + setmodel(self, "models/sprites/destroy.sp2"); else - setmodel(self, "models/sprites/helpme.sp2"); + setmodel(self, "models/sprites/defend.sp2"); } else { return FALSE; } @@ -116,6 +122,16 @@ void assault_objective_decrease_think() { } } + if(!self.spawnflags) { + local entity ent; + ent = find(world, target, self.targetname); + if(ent) { + if(ent.classname == "func_assault_destructible") + self.spawnflags = 2; + else + self.spawnflags = 1; + } + } self.nextthink = time + 0.2; } @@ -151,6 +167,10 @@ void target_objective_decrease() { self.classname = "target_objective_decrease"; + precache_model("models/sprites/defend.sp2"); + precache_model("models/sprites/destroy.sp2"); + precache_model("models/sprites/push.sp2"); + if(!self.dmg) { self.dmg = 101; } -- 2.39.2