X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fassault.qc;h=2562dca3df803fa93725204eb01f7059ef1cd189;hb=e52c92b8ba22924be19d8458fb1dd0cb7cfe11c7;hp=45fa5c77d43aabc688d325e9f8f6edd191cc2c7f;hpb=a8f44b0e98aedacaae872b937ee023e24fc30878;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 45fa5c77d..2562dca3d 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;
 }
 
 
@@ -364,5 +372,5 @@ void assault_new_round()
 
 	// reset the level with a countdown
 	cvar_set("timelimit", ftos(ceil(time - game_starttime) / 60));
-	ReadyRestartForce(); // sets game_starttime
+	ReadyRestart_force(); // sets game_starttime
 }