LeaveSpectatorMode --> JoinOrShowTeamSelection

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index cb50d7cdaa9e207d9377ebb9694d2fe658db19a1..9ab7aea41fd28f8f95a1329f51dcdbe88b66f164 100644 (file)
--- 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 e613599119a967fe7762d39f78dbf02150a3fc8e..6bd810906e7ede5299594ec734fcc78c5219205e 100644 (file)
--- 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
                }