remove an unused arg

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 1e91619f7aff418a4ecaf4db0d55d22738156e9d..425bbf77933892791bf46b5c96219b50daec758e 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';

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 97e44c3ca2dc6d776819cf950aa734d1603778de..9d220fc12be68e80ee4ce303907f8cdcdb41e9d9 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -162,6 +162,7 @@ vector Spawn_Score(entity spot, float mindist, float teamcheck)
                prio += SPAWN_PRIO_GOOD_DISTANCE;
 
        spawn_score = prio * '1 0 0' + shortest * '0 1 0';
+       spawn_score_spot = spot;
 
        // filter out spots for assault
        if(spot.target != "") {
@@ -176,7 +177,7 @@ vector Spawn_Score(entity spot, float mindist, float teamcheck)
                        {
                                entity oldself = self;
                                self = ent;
-                               spawn_score = ent.spawn_evalfunc(oldself, spot, teamcheck, spawn_score);
+                               spawn_score = ent.spawn_evalfunc(oldself, spot, spawn_score);
                                self = oldself;
                                if(spawn_score_x < 0)
                                        return spawn_score;

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 065814018b6883319b50dbf78c357a0181b9aca2..e6df08cbad9464d4d6f628b54c2e6dcaf0e543c2 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -670,5 +670,5 @@ float serverflags;
 
 void PlayerUseKey();
 
-typedef vector(entity player, entity spot, float teamcheck, vector current) spawn_evalfunc_t;
+typedef vector(entity player, entity spot, vector current) spawn_evalfunc_t;
 .spawn_evalfunc_t spawn_evalfunc;

diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh
index 1823eb36813fcaa92922f28260227940c481c6a5..8778829aa61ccc071f419c0b1292c119e265b88a 100644 (file)
--- a/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@ -194,5 +194,6 @@ MUTATOR_HOOKABLE(Spawn_Score);
        // return 1 to make the spawnpoint unusable
        // INPUT
        entity self; // player wanting to spawn
+       entity spawn_score_spot; // spot to be evaluated
        // IN+OUT
        vector spawn_score; // _x is priority, _y is "distance"

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index f145306d44ec2e38d30c9da7d0240505f2509555..911106a30560358e6ae03054ab21526dc0e6ad8a 100644 (file)
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -764,7 +764,7 @@ void trigger_race_checkpoint_verify()
        self = oldself;
 }
 
-vector trigger_race_checkpoint_spawn_evalfunc(entity player, entity spot, float teamcheck, vector current)
+vector trigger_race_checkpoint_spawn_evalfunc(entity player, entity spot, vector current)
 {
        if(g_race_qualifying)
        {