From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 3 Dec 2011 18:36:08 +0000 (+0100)
Subject: remove an unused arg
X-Git-Tag: xonotic-v0.6.0~35^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fbaa95e81c2a56ec3fe83d3a45381cd2b439d9d6;p=xonotic%2Fxonotic-data.pk3dir.git

remove an unused arg
---

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 1e91619f7..425bbf779 100644
--- 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 97e44c3ca..9d220fc12 100644
--- 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 065814018..e6df08cba 100644
--- 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 1823eb368..8778829aa 100644
--- 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 f145306d4..911106a30 100644
--- 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)
 	{