X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud.qc;h=f9ac20627518e16b4fbcec3b225b8540a6908e21;hb=f34fd47ee0a7f283ab60592a17399ec5a500416c;hp=d1029b288a957da7719e7a6287fe144ca884e17e;hpb=6585b5a8ef2ce4ee66826df826a6c759bd815cb8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index d1029b288..f9ac20627 100644
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -1,11 +1,13 @@
 #include "hud.qh"
 
+#include "panel/scoreboard.qh"
+
 #include "hud_config.qh"
 #include "../mapvoting.qh"
 #include "../teamradar.qh"
 #include <common/t_items.qh>
 #include <common/deathtypes/all.qh>
-#include <common/items/all.qc>
+#include <common/items/_mod.qh>
 #include <common/mapinfo.qh>
 #include <common/vehicles/all.qh>
 #include <common/mutators/mutator/waypoints/all.qh>
@@ -334,8 +336,6 @@ void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertica
 	DrawNumIcon_expanding(myPos, mySize, x, icon, vertical, icon_right_align, color, theAlpha, 0);
 }
 
-#include "all.inc"
-
 /*
 ==================
 Main HUD system
@@ -357,6 +357,8 @@ void HUD_Vehicle()
 	}
 }
 
+bool HUD_Minigame_Showpanels();
+
 bool HUD_Panel_CheckFlags(int showflags)
 {
     TC(int, showflags);
@@ -382,8 +384,8 @@ void HUD_Panel_Draw(entity panent)
 void HUD_Reset()
 {
 	// reset gametype specific icons
-	if(gametype == MAPINFO_TYPE_CTF)
-		HUD_Mod_CTF_Reset();
+	if(gametype.m_modicons_reset)
+		gametype.m_modicons_reset();
 }
 
 float autocvar_hud_dynamic_shake = 1;
@@ -413,6 +415,7 @@ bool Hud_Shake_Update()
 	return true;
 }
 
+entity CSQCModel_server2csqc(int i);
 void calc_followmodel_ofs(entity view);
 void Hud_Dynamic_Frame()
 {
@@ -493,7 +496,7 @@ void HUD_Main()
 {
 	int i;
 	// global hud alpha fade (scoreboard-related panels behave differently and override it temporarly)
-	if(menu_enabled == 1)
+	if(hud_configure_menu_open == 1)
 		hud_fade_alpha = 1;
 	else if(!autocvar__hud_configure)
 		hud_fade_alpha = (1 - scoreboard_fade_alpha) * (1 - autocvar__menu_alpha);
@@ -556,11 +559,11 @@ void HUD_Main()
 		{
 			string hud_dock_color = autocvar_hud_dock_color;
 			if(hud_dock_color == "shirt") {
-				f = stof(getplayerkeyvalue(current_player, "colors"));
+				f = entcs_GetClientColors(current_player);
 				color = colormapPaletteColor(floor(f / 16), 0);
 			}
 			else if(hud_dock_color == "pants") {
-				f = stof(getplayerkeyvalue(current_player, "colors"));
+				f = entcs_GetClientColors(current_player);
 				color = colormapPaletteColor(f % 16, 1);
 			}
 			else
@@ -606,7 +609,7 @@ void HUD_Main()
 			}
 		}
 		if (warning)
-			LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder\n");
+			LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder");
 
 		cvar_set("_hud_panelorder", s);
 		if(hud_panelorder_prev)