Make variables descriptive

diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc
index 9f2476d4fbd5b07a6e6de73a5883395ea56c35ee..52be4acffb585c4ffa7a417174524d5f914cdfa1 100644 (file)
--- a/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@ -388,7 +388,7 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input !=
     MSG_INFO_NOTIF(JOIN_CONNECT,                            N_CHATCON,  1, 0, "s1", "",         "",     _("^BG%s^F3 connected"), "")
     MSG_INFO_NOTIF(JOIN_PLAY,                               N_CHATCON,  1, 0, "s1", "",         "",     _("^BG%s^F3 is now playing"), "")
     MULTITEAM_INFO(JOIN_PLAY_TEAM,                          N_CHATCON,  1, 0, "s1", "",         "",     _("^BG%s^F3 is now playing on the ^TC^TT team"), "", NAME)
-       MULTITEAM_INFO(JOIN_WANTS_TEAM,                         N_CHATCON,  1, 0, "s1", "",         "",     _("^BG%s^F3 wants to play on the ^TC^TT team"), "", NAME)
+    MULTITEAM_INFO(JOIN_WANTS_TEAM,                         N_CHATCON,  1, 0, "s1", "",         "",     _("^BG%s^F3 wants to play on the ^TC^TT team"), "", NAME)
 
     MSG_INFO_NOTIF(KEEPAWAY_DROPPED,                        N_CONSOLE,  1, 0, "s1", "s1",       "notify_balldropped",       _("^BG%s^BG has dropped the ball!"), "")
     MSG_INFO_NOTIF(KEEPAWAY_PICKUP,                         N_CONSOLE,  1, 0, "s1", "s1",       "notify_ballpickedup",      _("^BG%s^BG has picked up the ball!"), "")

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index e487b7cf04abcdec2aa029daf28234f2f3af3587..c0d29cfe2de15933d4171aea12dba8f2057a8ea3 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1979,15 +1979,15 @@ void Join(entity this)
 
        TRANSMUTE(Player, this);
 
-       entity to_join = SpectatorWantsJoin(this);
-       if(to_join)
+       entity queued_join = SpectatorWantsJoin(this);
+       if(queued_join)
        {
-               Join(to_join);
+               Join(queued_join);
                this.team_selected = false; // Don't let this player select team
        }
 
        if(!this.team_selected)
-       if(autocvar_g_campaign || autocvar_g_balance_teams || to_join)
+       if(autocvar_g_campaign || autocvar_g_balance_teams || queued_join)
                TeamBalance_JoinBestTeam(this);
 
        if(autocvar_g_campaign)
@@ -2007,8 +2007,8 @@ void Join(entity this)
                Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_JOIN_PLAY, this.netname);
        this.team_selected = false;
 
-       if(to_join)
-               CS(to_join).wants_join = false;
+       if(queued_join)
+               CS(queued_join).wants_join = false;
 }
 
 int GetPlayerLimit()