From: terencehill <piuntn@gmail.com>
Date: Wed, 31 Aug 2016 14:01:01 +0000 (+0200)
Subject: LeaveSpectatorMode  -->  JoinOrShowTeamSelection
X-Git-Tag: xonotic-v0.8.2~620^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a159cac32566413c445ae3ab75a671b224872c34;p=xonotic%2Fxonotic-data.pk3dir.git

LeaveSpectatorMode  -->  JoinOrShowTeamSelection
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index cb50d7cda..9ab7aea41 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1867,7 +1867,7 @@ void ShowRespawnCountdown(entity this)
 }
 
 .int team_selected;
-void LeaveSpectatorMode(entity this)
+void JoinOrShowTeamSelection(entity this)
 {
 	if(!teamplay || autocvar_g_campaign || autocvar_g_balance_teams || this.team_selected || (this.wasplayer && autocvar_g_changeteam_banned) || this.team_forced > 0)
 	{
@@ -2041,7 +2041,7 @@ void ObserverThink(entity this)
 			if(this.flags & FL_SPAWNING)
 			{
 				this.flags &= ~FL_SPAWNING;
-				LeaveSpectatorMode(this);
+				JoinOrShowTeamSelection(this);
 				return;
 			}
 		}
@@ -2099,7 +2099,7 @@ void SpectatorThink(entity this)
 			if(this.flags & FL_SPAWNING)
 			{
 				this.flags &= ~FL_SPAWNING;
-				LeaveSpectatorMode(this);
+				JoinOrShowTeamSelection(this);
 				return;
 			}
 		}
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index e61359911..6bd810906 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -160,7 +160,7 @@ void ClientCommand_mv_getpicture(entity caller, float request, float argc)  // i
 }
 
 bool spawnAllowed(entity this);
-void LeaveSpectatorMode(entity this);
+void JoinOrShowTeamSelection(entity this);
 void ClientCommand_join(entity caller, float request)
 {
 	switch (request)
@@ -170,7 +170,7 @@ void ClientCommand_join(entity caller, float request)
 			if (!gameover)
 			if (IS_CLIENT(caller) && !IS_PLAYER(caller))
 			if (spawnAllowed(caller))
-				LeaveSpectatorMode(caller);
+				JoinOrShowTeamSelection(caller);
 
 			return;  // never fall through to usage
 		}