r2646 - trunk/data/qcsrc/server

savagex at icculus.org savagex at icculus.org
Mon May 21 06:44:13 EDT 2007


Author: savagex
Date: 2007-05-21 06:44:12 -0400 (Mon, 21 May 2007)
New Revision: 2646

Modified:
   trunk/data/qcsrc/server/assault.qc
Log:
assault mode: use proper sprites


Modified: trunk/data/qcsrc/server/assault.qc
===================================================================
--- trunk/data/qcsrc/server/assault.qc	2007-05-21 10:43:04 UTC (rev 2645)
+++ trunk/data/qcsrc/server/assault.qc	2007-05-21 10:44:12 UTC (rev 2646)
@@ -83,11 +83,17 @@
 }
 
 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 @@
 		}
 	}
 
+	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 @@
 
 	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;
 	}




More information about the nexuiz-commits mailing list