From: Mario <mario@smbclan.net>
Date: Sun, 28 Feb 2016 22:07:39 +0000 (+1000)
Subject: Don't show team join message if team is -1 (auto select)
X-Git-Tag: xonotic-v0.8.2~1169
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=17999ec96994e441b6826f3cf1808d739e5b8cb8;p=xonotic%2Fxonotic-data.pk3dir.git

Don't show team join message if team is -1 (auto select)
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 3f9fdd41b..5328e959f 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1827,7 +1827,7 @@ void LeaveSpectatorMode()
 
 			PutClientInServer();
 
-			if(IS_PLAYER(self)) { Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay) ? APP_TEAM_ENT_4(this, INFO_JOIN_PLAY_TEAM_) : INFO_JOIN_PLAY), self.netname); }
+			if(IS_PLAYER(self)) { Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay && this.team != -1) ? APP_TEAM_ENT_4(this, INFO_JOIN_PLAY_TEAM_) : INFO_JOIN_PLAY), self.netname); }
 		}
 		else
 			stuffcmd(self, "menu_showteamselect\n");
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 5c052e2d9..c897966aa 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -180,7 +180,7 @@ void ClientCommand_join(float request)
 						self.classname = STR_PLAYER;
 						PlayerScore_Clear(self);
 						Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_PREVENT_JOIN);
-						Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay) ? APP_TEAM_ENT_4(this, INFO_JOIN_PLAY_TEAM_) : INFO_JOIN_PLAY), self.netname);
+						Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay && self.team != -1) ? APP_TEAM_ENT_4(this, INFO_JOIN_PLAY_TEAM_) : INFO_JOIN_PLAY), self.netname);
 						PutClientInServer();
 					}
 					else