X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;fp=qcsrc%2Fclient%2Fmain.qc;h=517a09549fa124381d5ffa84ab27bb5ec0d4f3e5;hb=6585b5a8ef2ce4ee66826df826a6c759bd815cb8;hp=4021161732b422ad9fc88c719d25ffbaf16d9d44;hpb=b6d22ea672a1e0b7924a8ac804933a90ea7baabd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 402116173..517a09549 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -4,8 +4,8 @@
 #include "hud/all.qh"
 #include "mapvoting.qh"
 #include "mutators/events.qh"
+#include "hud/panel/scoreboard.qh"
 #include "hud/panel/quickmenu.qh"
-#include "scoreboard.qh"
 #include "shownames.qh"
 #include <common/t_items.qh>
 #include "wall.qh"
@@ -132,11 +132,11 @@ void CSQC_Init()
 
 	gametype = NULL;
 
-	// hud_fields uses strunzone on the titles!
-	for(int i = 0; i < MAX_HUD_FIELDS; ++i)
-		hud_title[i] = strzone("(null)");
+	// sbt_fields uses strunzone on the titles!
+	for(int i = 0; i < MAX_SBT_FIELDS; ++i)
+		sbt_field_title[i] = strzone("(null)");
 
-	Cmd_HUD_SetFields(0);
+	Cmd_Scoreboard_SetFields(0);
 
 	postinit = false;
 
@@ -322,9 +322,9 @@ void Playerchecker_Think(entity this)
 				e.ping_movementloss = 0;
 				//e.gotscores = 0; // we might already have the scores...
 				int t = entcs_GetScoreTeam(i);
-				if (t) SetTeam(e, t); // will not hurt; later updates come with HUD_UpdatePlayerTeams
+				if (t) SetTeam(e, t); // will not hurt; later updates come with Scoreboard_UpdatePlayerTeams
 				RegisterPlayer(e);
-				HUD_UpdatePlayerPos(e);
+				Scoreboard_UpdatePlayerPos(e);
 			}
 		}
 	}
@@ -442,7 +442,7 @@ NET_HANDLE(ENT_CLIENT_SCORES, bool isnew)
 	return = true;
 
 	if(o.sort_prev)
-		HUD_UpdatePlayerPos(o); // if not registered, we cannot do this yet!
+		Scoreboard_UpdatePlayerPos(o); // if not registered, we cannot do this yet!
 
 	this.entremove = Ent_RemovePlayerScore;
 }
@@ -476,7 +476,7 @@ NET_HANDLE(ENT_CLIENT_TEAMSCORES, bool isnew)
 
 	return = true;
 
-	HUD_UpdateTeamPos(o);
+	Scoreboard_UpdateTeamPos(o);
 }
 
 NET_HANDLE(ENT_CLIENT_CLIENTDATA, bool isnew)
@@ -963,7 +963,7 @@ NET_HANDLE(ENT_CLIENT_SCORES_INFO, bool isnew)
 		teamscores_flags(i) = ReadByte();
 	}
 	return = true;
-	HUD_InitScores();
+	Scoreboard_InitScores();
 	Gamemode_Init();
 }