fixed bubble sort loop (#802), 2 entries in the language files and a possible overrun

8 files changed, 31 insertions, 30 deletions

diff --git a/data/languages/czech.txt b/data/languages/czech.txt
index 5f6157b4..6954810f 100644
--- a/data/languages/czech.txt
+++ b/data/languages/czech.txt
@@ -130,8 +130,8 @@ Game over
 Game type
 == Herní typ
 
-Game types
-== Herní typy
+Game types:
+== Herní typy:
 
 General
 == Hlavní
@@ -199,8 +199,8 @@ MOTD
 Map
 == Mapa
 
-Maximum ping
-== Max. odezva
+Maximum ping:
+== Max. odezva:
 
 Miscellaneous
 == Ostatní
diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
index 024b3ade..c4652352 100644
--- a/data/languages/dutch.txt
+++ b/data/languages/dutch.txt
@@ -129,8 +129,8 @@ Game over
 Game type
 == Speltype
 
-Game types
-== Speltypen
+Game types:
+== Speltypen:
 
 General
 == Algemeen
@@ -198,8 +198,8 @@ MOTD
 Map
 == Kaart
 
-Maximum ping
-== Maximale Ping
+Maximum ping:
+== Maximale Ping:
 
 Miscellaneous
 == Anders
diff --git a/data/languages/french.txt b/data/languages/french.txt
index 23bb9ede..c3e8dc8a 100644
--- a/data/languages/french.txt
+++ b/data/languages/french.txt
@@ -127,8 +127,8 @@ Game over
 Game type
 == Type de jeu
 
-Game types
-== Types de jeu
+Game types:
+== Types de jeu:
 
 General
 == Général
@@ -196,8 +196,8 @@ MOTD
 Map
 == Carte
 
-Maximum ping
-== Ping maximum
+Maximum ping:
+== Ping maximum:
 
 Miscellaneous
 == Divers
diff --git a/data/languages/german.txt b/data/languages/german.txt
index 407a83a3..beb70e30 100644
--- a/data/languages/german.txt
+++ b/data/languages/german.txt
@@ -130,8 +130,8 @@ Game over
 Game type
 == Spieltyp
 
-Game types
-== Spieltypen
+Game types:
+== Spieltypen:
 
 General
 == Allgemein
@@ -199,8 +199,8 @@ MOTD
 Map
 == Karte
 
-Maximum ping
-== Maximaler Ping
+Maximum ping:
+== Maximaler Ping:
 
 Miscellaneous
 == Verschiedenes
diff --git a/data/languages/italian.txt b/data/languages/italian.txt
index 57558774..9c0c42f2 100644
--- a/data/languages/italian.txt
+++ b/data/languages/italian.txt
@@ -127,8 +127,8 @@ Game over
 Game type
 == Tipo di gioco
 
-Game types
-== Tipi di gioco
+Game types:
+== Tipi di gioco:
 
 General
 == Generale
@@ -196,8 +196,8 @@ MOTD
 Map
 == Mappa
 
-Maximum ping
-== Ping massimo
+Maximum ping:
+== Ping massimo:
 
 Miscellaneous
 == Altro
diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt
index d4a8405b..36e5611b 100644
--- a/data/languages/portuguese.txt
+++ b/data/languages/portuguese.txt
@@ -127,8 +127,8 @@ Game over
 Game type
 == Tipo de jogo
 
-Game types
-== Tipos de jogo
+Game types:
+== Tipos de jogo:
 
 General
 == Geral
@@ -196,8 +196,8 @@ MOTD
 Map
 == Mapa
 
-Maximum ping
-== Ping máximo
+Maximum ping:
+== Ping máximo:
 
 Miscellaneous
 == Diverso
diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt
index d9ac1f3c..706bce87 100644
--- a/data/languages/swedish.txt
+++ b/data/languages/swedish.txt
@@ -127,8 +127,8 @@ Game over
 Game type
 == Speltyp
 
-Game types
-== Speltyper
+Game types:
+== Speltyper:
 
 General
 == Generellt
@@ -196,8 +196,8 @@ MOTD
 Map
 == Karta
 
-Maximum ping
-== Högsta ping
+Maximum ping:
+== Högsta ping:
 
 Miscellaneous
 == Övrigt
diff --git a/src/game/client/components/scoreboard.cpp b/src/game/client/components/scoreboard.cpp
index b7e8aa9a..80330e9c 100644
--- a/src/game/client/components/scoreboard.cpp
+++ b/src/game/client/components/scoreboard.cpp
@@ -166,13 +166,14 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
 			if(pInfo->m_Team == Team)
 			{
 				paPlayers[NumPlayers] = pInfo;
-				NumPlayers++;
+				if(++NumPlayers == MAX_CLIENTS)
+					break;
 			}
 		}
 	}
 
 	// sort players
-	for(int k = 0; k < NumPlayers; k++) // ffs, bubblesort
+	for(int k = 0; k < NumPlayers-1; k++) // ffs, bubblesort
 	{
 		for(int i = 0; i < NumPlayers-k-1; i++)
 		{