From: Mario <mario.mario@y7mail.com>
Date: Thu, 7 Mar 2013 06:13:59 +0000 (+1100)
Subject: Merge branch 'master' into mario/runematch_nuke
X-Git-Tag: xonotic-v0.7.0~79^2~2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=39bfc6b0e1d9775ccd116c7d803670af5166cce5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mario/runematch_nuke
---

39bfc6b0e1d9775ccd116c7d803670af5166cce5
diff --cc qcsrc/server/cl_client.qc
index a403af329,356d444c0..4c7d5c575
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1631,9 -1634,10 +1630,9 @@@ void ClientDisconnect (void
  
  	if(autocvar_sv_eventlog)
  		GameLogEcho(strcat(":part:", ftos(self.playerid)));
- 	bprint ("^4",self.netname);
- 	bprint ("^4 disconnected\n");
+ 		
+ 	Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_DISCONNECT, self.netname);
  
 -	DropAllRunes(self);
  	MUTATOR_CALLHOOK(ClientDisconnect);
  
  	Portal_ClearAll(self);
diff --cc qcsrc/server/teamplay.qc
index ab586a1ac,a96726c56..6608fc9a3
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@@ -13,45 -13,7 +13,6 @@@ void TeamchangeFrags(entity e
  	PlayerScore_Clear(e);
  }
  
- vector TeamColor(float teem)
- {
- 	switch(teem)
- 	{
- 		case COLOR_TEAM1:
- 			return '1 0.0625 0.0625';
- 		case COLOR_TEAM2:
- 			return '0.0625 0.0625 1';
- 		case COLOR_TEAM3:
- 			return '1 1 0.0625';
- 		case COLOR_TEAM4:
- 			return '1 0.0625 1';
- 		default:
- 			return '1 1 1';
- 	}
- }
- 
- string TeamName(float t)
- {
- 	return strcat(Team_ColorName(t), " Team");
- }
- string ColoredTeamName(float t)
- {
- 	return strcat(Team_ColorCode(t), Team_ColorName(t), " Team^7");
- }
- string TeamNoName(float t)
- {
- 	// fixme: Search for team entities and get their .netname's!
- 	if(t == 1)
- 		return "Red Team";
- 	if(t == 2)
- 		return "Blue Team";
- 	if(t == 3)
- 		return "Yellow Team";
- 	if(t == 4)
- 		return "Pink Team";
- 	return "Neutral Team";
- }
- 
 -void runematch_init();
  void tdm_init();
  void entcs_init();