X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_spawn_near_teammate.qc;h=1464870916ebaa23b06be4fe3992fb60a9b58ed0;hp=ffae9543b95c663527fe29a6abe49f527453c94f;hb=86c9dc7c3696c329496b06375c1e79fb407401ce;hpb=e80962600618cee1bb882cf785a2f3011466e12c

diff --git a/qcsrc/server/mutators/mutator_spawn_near_teammate.qc b/qcsrc/server/mutators/mutator_spawn_near_teammate.qc
index ffae9543b9..1464870916 100644
--- a/qcsrc/server/mutators/mutator_spawn_near_teammate.qc
+++ b/qcsrc/server/mutators/mutator_spawn_near_teammate.qc
@@ -1,11 +1,17 @@
+#include "../_all.qh"
+
+#include "mutator.qh"
+
 .entity msnt_lookat;
 
 .float msnt_timer;
 .vector msnt_deathloc;
 
+.float cvar_cl_spawn_near_teammate;
+
 MUTATOR_HOOKFUNCTION(msnt_Spawn_Score)
 {
-	if(autocvar_g_spawn_near_teammate_ignore_spawnpoint)
+	if(autocvar_g_spawn_near_teammate_ignore_spawnpoint == 1 || (autocvar_g_spawn_near_teammate_ignore_spawnpoint == 2 && self.cvar_cl_spawn_near_teammate))
 		return 0;
 
 	entity p;
@@ -31,10 +37,10 @@ MUTATOR_HOOKFUNCTION(msnt_Spawn_Score)
 	if(RandomSelection_chosen_ent)
 	{
 		spawn_spot.msnt_lookat = RandomSelection_chosen_ent;
-		spawn_score_x += SPAWN_PRIO_NEAR_TEAMMATE_FOUND;
+		spawn_score.x += SPAWN_PRIO_NEAR_TEAMMATE_FOUND;
 	}
 	else if(self.team == spawn_spot.team)
-		spawn_score_x += SPAWN_PRIO_NEAR_TEAMMATE_SAMETEAM; // prefer same team, if we can't find a spawn near teammate
+		spawn_score.x += SPAWN_PRIO_NEAR_TEAMMATE_SAMETEAM; // prefer same team, if we can't find a spawn near teammate
 
 	return 0;
 }
@@ -42,7 +48,7 @@ MUTATOR_HOOKFUNCTION(msnt_Spawn_Score)
 MUTATOR_HOOKFUNCTION(msnt_PlayerSpawn)
 {
 	// Note: when entering this, fixangle is already set.
-	if(autocvar_g_spawn_near_teammate_ignore_spawnpoint)
+	if(autocvar_g_spawn_near_teammate_ignore_spawnpoint == 1 || (autocvar_g_spawn_near_teammate_ignore_spawnpoint == 2 && self.cvar_cl_spawn_near_teammate))
 	{
 		if(autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death)
 			self.msnt_timer = time + autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death;
@@ -136,7 +142,7 @@ MUTATOR_HOOKFUNCTION(msnt_PlayerSpawn)
 	else if(spawn_spot.msnt_lookat)
 	{
 		self.angles = vectoangles(spawn_spot.msnt_lookat.origin - self.origin);
-		self.angles_x = -self.angles_x;
+		self.angles_x = -self.angles.x;
 		self.angles_z = 0; // never spawn tilted even if the spot says to
 		/*
 		sprint(self, "You should be looking at ", spawn_spot.msnt_lookat.netname, "^7.\n");
@@ -154,11 +160,18 @@ MUTATOR_HOOKFUNCTION(msnt_PlayerDies)
 	return 0;
 }
 
+MUTATOR_HOOKFUNCTION(msnt_GetCvars)
+{
+	GetCvars_handleFloat(get_cvars_s, get_cvars_f, cvar_cl_spawn_near_teammate, "cl_spawn_near_teammate");
+	return false;
+}
+
 MUTATOR_DEFINITION(mutator_spawn_near_teammate)
 {
 	MUTATOR_HOOK(Spawn_Score, msnt_Spawn_Score, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerSpawn, msnt_PlayerSpawn, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerDies, msnt_PlayerDies, CBC_ORDER_ANY);
+	MUTATOR_HOOK(GetCvars, msnt_GetCvars, CBC_ORDER_ANY);
 
 	return 0;
 }