Merge branch 'master' into TimePath/modules
[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / hud.qc
index c87e733e1d4e633dc2bd28e815d8c885c89ab22e..91dc98fdcb2c32f7efa917bafd3b8912c1574644 100644 (file)
@@ -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);
@@ -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()
 {