X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fassault.qc;h=425bbf77933892791bf46b5c96219b50daec758e;hb=8fe8a8dfeb0c561a14946bb7177588652e7fefe6;hp=517da81684928019729e385b6feb244b32963021;hpb=f15ff9f0d34d7f4aff3de7542b923ef53694a0e5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 517da8168..425bbf779 100644
--- a/qcsrc/server/assault.qc
+++ b/qcsrc/server/assault.qc
@@ -47,6 +47,13 @@ void assault_objective_use() {
 	self = oldself;
 }
 
+vector target_objective_spawn_evalfunc(entity player, entity spot, vector current)
+{
+	if(self.health < 0 || self.health >= ASSAULT_VALUE_INACTIVE)
+		return '-1 0 0';
+	return current;
+}
+
 void spawnfunc_target_objective() {
 	if(!g_assault)
 	{
@@ -57,6 +64,7 @@ void spawnfunc_target_objective() {
 	self.use = assault_objective_use;
 	assault_objective_reset();
 	self.reset = assault_objective_reset;
+	self.spawn_evalfunc = target_objective_spawn_evalfunc;
 }
 
 
@@ -115,7 +123,7 @@ void assault_objective_decrease_use() {
 
 void assault_setenemytoobjective()
 {
-	local entity objective;
+	entity objective;
 	for(objective = world; (objective = find(objective, targetname, self.target)); ) {
 		if(objective.classname == "target_objective") {
 			if(self.enemy == world)
@@ -350,7 +358,7 @@ void assault_new_round()
 	}
 
 
-	local entity ent;
+	entity ent;
 	for(ent = world; (ent = nextent(ent)); )
 	{
 		if(clienttype(ent) == CLIENTTYPE_NOTACLIENT)