Merge branch 'master' into terencehill/arena_and_ca_fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / assault.qc

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 1e91619f7aff418a4ecaf4db0d55d22738156e9d..2562dca3df803fa93725204eb01f7059ef1cd189 100644 (file)
--- a/qcsrc/server/assault.qc
+++ b/qcsrc/server/assault.qc
@@ -47,7 +47,7 @@ void assault_objective_use() {
        self = oldself;
 }
 
-vector target_objective_spawn_evalfunc(entity player, entity spot, float teamcheck, vector current)
+vector target_objective_spawn_evalfunc(entity player, entity spot, vector current)
 {
        if(self.health < 0 || self.health >= ASSAULT_VALUE_INACTIVE)
                return '-1 0 0';
@@ -372,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
 }