X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=f48c0c530a40cf631c10c1e54c696d80db6dc741;hp=7af59865466f288a6a74e46ea20223109ca1bb73;hb=cd4892b9fcd32bd4887f0b3bc2503894520945c7;hpb=a9e987cb5039b65491ac227d832df7e77bb06c1d

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 7af598654..f48c0c530 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -1,20 +1,21 @@
 #include "main.qh"
 
 #include <common/effects/qc/all.qh>
-#include "hud/all.qh"
+#include "hud/_mod.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"
 #include "weapons/projectile.qh"
 #include <common/deathtypes/all.qh>
-#include <common/items/all.qh>
+#include <common/items/_mod.qh>
 #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;
 
-	// hud_fields uses strunzone on the titles!
-	for(int i = 0; i < MAX_HUD_FIELDS; ++i)
-		hud_title[i] = strzone("(null)");
-
-	Cmd_HUD_SetFields(0);
-
 	postinit = false;
 
 	calledhooks = 0;
@@ -234,7 +229,7 @@ float SetTeam(entity o, int Team)
 			default:
 				if(GetTeam(Team, false) == NULL)
 				{
-					LOG_TRACEF("trying to switch to unsupported team %d\n", Team);
+					LOG_TRACEF("trying to switch to unsupported team %d", Team);
 					Team = NUM_SPECTATOR;
 				}
 				break;
@@ -250,7 +245,7 @@ float SetTeam(entity o, int Team)
 			default:
 				if(GetTeam(Team, false) == NULL)
 				{
-					LOG_TRACEF("trying to switch to unsupported team %d\n", Team);
+					LOG_TRACEF("trying to switch to unsupported team %d", Team);
 					Team = NUM_SPECTATOR;
 				}
 				break;
@@ -322,9 +317,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 +437,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 +471,7 @@ NET_HANDLE(ENT_CLIENT_TEAMSCORES, bool isnew)
 
 	return = true;
 
-	HUD_UpdateTeamPos(o);
+	Scoreboard_UpdateTeamPos(o);
 }
 
 NET_HANDLE(ENT_CLIENT_CLIENTDATA, bool isnew)
@@ -499,16 +494,6 @@ NET_HANDLE(ENT_CLIENT_CLIENTDATA, bool isnew)
 
 	spectatorbutton_zoom = (f & 4);
 
-	if(f & 8)
-	{
-		angles_held_status = 1;
-		angles_held.x = ReadAngle();
-		angles_held.y = ReadAngle();
-		angles_held.z = 0;
-	}
-	else
-		angles_held_status = 0;
-
 	if(f & 16)
 	{
 		num_spectators = ReadByte();
@@ -714,7 +699,7 @@ NET_HANDLE(ENT_CLIENT_SPAWNPOINT, bool is_new)
 		}*/
 		if(autocvar_cl_spawn_point_particles)
 		{
-			if((serverflags & SERVERFLAG_TEAMPLAY))
+			if(teamplay)
 			{
 				switch(teamnum)
 				{
@@ -844,7 +829,7 @@ void CSQC_Ent_Update(entity this, bool isnew)
 	time = savetime;
 	if (!done)
 	{
-		LOG_FATALF("CSQC_Ent_Update(%d) at %f with this=%i {.entnum=%d, .enttype=%d} t=%s (%d)\n", isnew, savetime, this, this.entnum, this.enttype, this.classname, t);
+		LOG_FATALF("CSQC_Ent_Update(%d) at %f with this=%i {.entnum=%d, .enttype=%d} t=%s (%d)", isnew, savetime, this, this.entnum, this.enttype, this.classname, t);
 	}
 }
 
@@ -879,7 +864,7 @@ void CSQC_Ent_Remove(entity this)
 	if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Ent_Remove() with this=%i {.entnum=%d, .enttype=%d}\n", this, this.entnum, this.enttype);
 	if (wasfreed(this))
 	{
-		LOG_WARNING("CSQC_Ent_Remove called for already removed entity. Packet loss?\n");
+		LOG_WARN("CSQC_Ent_Remove called for already removed entity. Packet loss?");
 		return;
 	}
 	if (this.enttype) Ent_Remove(this);
@@ -950,6 +935,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));
@@ -963,7 +949,7 @@ NET_HANDLE(ENT_CLIENT_SCORES_INFO, bool isnew)
 		teamscores_flags(i) = ReadByte();
 	}
 	return = true;
-	HUD_InitScores();
+	Scoreboard_InitScores();
 	Gamemode_Init();
 }