replace team name by clan name if possible

17 files changed, 101 insertions, 10 deletions

diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt
index dcb1f2ce..289004f7 100644
--- a/data/languages/bosnian.txt
+++ b/data/languages/bosnian.txt
@@ -513,6 +513,9 @@ Your skin
 %d Bytes
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/czech.txt b/data/languages/czech.txt
index 1248c51a..4d09b20c 100644
--- a/data/languages/czech.txt
+++ b/data/languages/czech.txt
@@ -453,6 +453,9 @@ Your skin
 %i seconds left
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
index c098a524..5a94e349 100644
--- a/data/languages/dutch.txt
+++ b/data/languages/dutch.txt
@@ -537,6 +537,9 @@ no limit
 %d Bytes
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt
index 9164cf8a..fe729ed8 100644
--- a/data/languages/finnish.txt
+++ b/data/languages/finnish.txt
@@ -477,6 +477,9 @@ Your skin
 %i seconds left
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/french.txt b/data/languages/french.txt
index c0d0a6b4..2e276a9d 100644
--- a/data/languages/french.txt
+++ b/data/languages/french.txt
@@ -525,6 +525,9 @@ no limit
 %d Bytes
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/german.txt b/data/languages/german.txt
index 253a22fc..95ebf2c0 100644
--- a/data/languages/german.txt
+++ b/data/languages/german.txt
@@ -537,6 +537,9 @@ no limit
 %d Bytes
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/italian.txt b/data/languages/italian.txt
index 523d4d6f..abdd46e3 100644
--- a/data/languages/italian.txt
+++ b/data/languages/italian.txt
@@ -519,6 +519,9 @@ no limit
 %d Bytes
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/polish.txt b/data/languages/polish.txt
index 3aed6d23..2315ae2b 100644
--- a/data/languages/polish.txt
+++ b/data/languages/polish.txt
@@ -480,6 +480,9 @@ Your skin
 %i seconds left
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt
index 1d5531d9..fa3d1bec 100644
--- a/data/languages/portuguese.txt
+++ b/data/languages/portuguese.txt
@@ -474,6 +474,9 @@ Your skin
 %i seconds left
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt
index 293873c7..3844b30e 100644
--- a/data/languages/romanian.txt
+++ b/data/languages/romanian.txt
@@ -537,6 +537,9 @@ no limit
 %d Bytes
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/russian.txt b/data/languages/russian.txt
index 203b4fe6..03ec928f 100644
--- a/data/languages/russian.txt
+++ b/data/languages/russian.txt
@@ -483,6 +483,9 @@ Your skin
 %i seconds left
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt
index 84be1a24..7838c862 100644
--- a/data/languages/serbian.txt
+++ b/data/languages/serbian.txt
@@ -477,6 +477,9 @@ Your skin
 %i seconds left
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt
index e3e7b8d6..b4667900 100644
--- a/data/languages/spanish.txt
+++ b/data/languages/spanish.txt
@@ -537,6 +537,9 @@ no limit
 %d Bytes
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt
index c72fb917..43471832 100644
--- a/data/languages/swedish.txt
+++ b/data/languages/swedish.txt
@@ -663,5 +663,8 @@ no limit
 
 ##### needs translation #####
 
+%s wins!
+== 
+
 ##### old translations #####
 
diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt
index 818dfe48..8f32416e 100644
--- a/data/languages/ukrainian.txt
+++ b/data/languages/ukrainian.txt
@@ -501,6 +501,9 @@ Your skin
 %i seconds left
 == 
 
+%s wins!
+== 
+
 -Page %d-
 == 
 
diff --git a/src/game/client/components/scoreboard.cpp b/src/game/client/components/scoreboard.cpp
index 863cae58..a8c9d93b 100644
--- a/src/game/client/components/scoreboard.cpp
+++ b/src/game/client/components/scoreboard.cpp
@@ -334,21 +334,35 @@ void CScoreboard::OnRender()
 			RenderScoreboard(Width/2-w/2, 150.0f, w, 0, 0);
 		else
 		{
-		
+			const char *pRedClanName = GetClanName(TEAM_RED);
+			const char *pBlueClanName = GetClanName(TEAM_BLUE);
+			
 			if(m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags&GAMESTATEFLAG_GAMEOVER && m_pClient->m_Snap.m_pGameDataObj)
 			{
-				const char *pText = Localize("Draw!");
+				char aText[256];
+				str_copy(aText, Localize("Draw!"), sizeof(aText));
+				
 				if(m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed > m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue)
-					pText = Localize("Red team wins!");
+				{
+					if(pRedClanName)
+						str_format(aText, sizeof(aText), Localize("%s wins!"), pRedClanName);
+					else
+						str_copy(aText, Localize("Red team wins!"), sizeof(aText));
+				}
 				else if(m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreBlue > m_pClient->m_Snap.m_pGameDataObj->m_TeamscoreRed)
-					pText = Localize("Blue team wins!");
-			
-				float w = TextRender()->TextWidth(0, 86.0f, pText, -1);
-				TextRender()->Text(0, Width/2-w/2, 39, 86.0f, pText, -1);
+				{
+					if(pBlueClanName)
+						str_format(aText, sizeof(aText), Localize("%s wins!"), pBlueClanName);
+					else
+						str_copy(aText, Localize("Blue team wins!"), sizeof(aText));
+				}
+				
+				float w = TextRender()->TextWidth(0, 86.0f, aText, -1);
+				TextRender()->Text(0, Width/2-w/2, 39, 86.0f, aText, -1);
 			}
-		
-			RenderScoreboard(Width/2-w-5.0f, 150.0f, w, TEAM_RED, Localize("Red team"));
-			RenderScoreboard(Width/2+5.0f, 150.0f, w, TEAM_BLUE, Localize("Blue team"));
+			
+			RenderScoreboard(Width/2-w-5.0f, 150.0f, w, TEAM_RED, pRedClanName ? pRedClanName : Localize("Red team"));
+			RenderScoreboard(Width/2+5.0f, 150.0f, w, TEAM_BLUE, pBlueClanName ? pBlueClanName : Localize("Blue team"));
 		}
 	}
 
@@ -376,3 +390,33 @@ bool CScoreboard::Active()
 
 	return false;
 }
+
+const char *CScoreboard::GetClanName(int Team)
+{
+	int ClanPlayers = 0;
+	const char *pClanName = 0;
+	for(int i = 0; i < MAX_CLIENTS; i++)
+	{
+		const CNetObj_PlayerInfo *pInfo = m_pClient->m_Snap.m_paInfoByScore[i];
+		if(!pInfo || pInfo->m_Team != Team)
+			continue;
+		
+		if(!pClanName)
+		{
+			pClanName = m_pClient->m_aClients[pInfo->m_ClientID].m_aClan;
+			ClanPlayers++;
+		}
+		else
+		{
+			if(str_comp(m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, pClanName) == 0)
+				ClanPlayers++;
+			else
+				return 0;
+		}
+	}
+	
+	if(ClanPlayers > 1 && pClanName[0])
+		return pClanName;
+	else
+		return 0;
+}
diff --git a/src/game/client/components/scoreboard.h b/src/game/client/components/scoreboard.h
index 64d6ad0e..5ac43a49 100644
--- a/src/game/client/components/scoreboard.h
+++ b/src/game/client/components/scoreboard.h
@@ -13,6 +13,8 @@ class CScoreboard : public CComponent
 
 	static void ConKeyScoreboard(IConsole::IResult *pResult, void *pUserData);
 	
+	const char *GetClanName(int Team);
+	
 	bool m_Active;
 	
 public: