X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=36ca217240f0ba0e8a6966fcb25b06829df43491;hb=34e7f534e2015466228eb3a78c9857741b736dca;hp=d49548084a3e04726242bff8bfafd36f63c42daf;hpb=e424ba544c41fc40b241b17bd7c1d9c2fc930705;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index d49548084..36ca21724 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -15,6 +15,7 @@
 #include <common/mapinfo.qh>
 #include <common/minigames/cl_minigames.qh>
 #include <common/minigames/cl_minigames_hud.qh>
+#include <common/net_linked.qh>
 #include <common/net_notice.qh>
 #include <common/triggers/include.qh>
 #include <common/vehicles/all.qh>
@@ -132,12 +133,6 @@ void CSQC_Init()
 
 	gametype = NULL;
 
-	// sbt_fields uses strunzone on the titles!
-	for(int i = 0; i < MAX_SBT_FIELDS; ++i)
-		sbt_field_title[i] = strzone("(null)");
-
-	Cmd_Scoreboard_SetFields(0);
-
 	postinit = false;
 
 	calledhooks = 0;
@@ -714,7 +709,7 @@ NET_HANDLE(ENT_CLIENT_SPAWNPOINT, bool is_new)
 		}*/
 		if(autocvar_cl_spawn_point_particles)
 		{
-			if((serverflags & SERVERFLAG_TEAMPLAY))
+			if(teamplay)
 			{
 				switch(teamnum)
 				{
@@ -950,6 +945,7 @@ NET_HANDLE(ENT_CLIENT_SCORES_INFO, bool isnew)
 {
 	make_pure(this);
 	gametype = ReadRegistered(Gametypes);
+	teamplay = _MapInfo_GetTeamPlayBool(gametype);
 	HUD_ModIcons_SetFunc();
 	FOREACH(Scores, true, {
 		if (scores_label(it)) strunzone(scores_label(it));