X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud.qc;h=91dc98fdcb2c32f7efa917bafd3b8912c1574644;hp=c87cb5a89cd853e3561826106d9b31fd2dd4ac2c;hb=4ee2807b2d8f808928ef14b3e814945b3edb4350;hpb=3f79cb166a46b006e182abf6158f958d40af6e20

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index c87cb5a89c..91dc98fdcb 100644
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -1,12 +1,13 @@
 #include "hud.qh"
 
+#include "panel/scoreboard.qh"
+
 #include "hud_config.qh"
 #include "../mapvoting.qh"
-#include "../scoreboard.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>
@@ -335,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
@@ -358,6 +357,8 @@ void HUD_Vehicle()
 	}
 }
 
+bool HUD_Minigame_Showpanels();
+
 bool HUD_Panel_CheckFlags(int showflags)
 {
     TC(int, showflags);
@@ -383,14 +384,14 @@ 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;
-float autocvar_hud_dynamic_shake_damage_max;
-float autocvar_hud_dynamic_shake_damage_min;
-float autocvar_hud_dynamic_shake_scale;
+float autocvar_hud_dynamic_shake = 1;
+float autocvar_hud_dynamic_shake_damage_max = 130;
+float autocvar_hud_dynamic_shake_damage_min = 10;
+float autocvar_hud_dynamic_shake_scale = 0.2;
 float hud_dynamic_shake_x[10] = {0,    1, -0.7,  0.5, -0.3,  0.2, -0.1,  0.1,  0.0, 0};
 float hud_dynamic_shake_y[10] = {0,  0.4,  0.8, -0.2, -0.6,  0.0,  0.3,  0.1, -0.1, 0};
 bool Hud_Shake_Update()
@@ -414,6 +415,7 @@ bool Hud_Shake_Update()
 	return true;
 }
 
+entity CSQCModel_server2csqc(int i);
 void calc_followmodel_ofs(entity view);
 void Hud_Dynamic_Frame()
 {
@@ -446,12 +448,15 @@ void Hud_Dynamic_Frame()
 
 	if(autocvar_hud_dynamic_shake > 0)
 	{
+		static float old_health = 0;
+		float health = max(-1, STAT(HEALTH));
 		if(hud_dynamic_shake_factor == -1) // don't allow the effect for this frame
+		{
 			hud_dynamic_shake_factor = 0;
+			old_health = health;
+		}
 		else
 		{
-			static float old_health = 0;
-			float health = max(-1, STAT(HEALTH));
 			float new_hud_dynamic_shake_factor = 0;
 			if (old_health - health >= autocvar_hud_dynamic_shake_damage_min
 				&& autocvar_hud_dynamic_shake_damage_max > autocvar_hud_dynamic_shake_damage_min
@@ -490,14 +495,13 @@ void Hud_Dynamic_Frame()
 void HUD_Main()
 {
 	int i;
-	// global hud theAlpha fade
-	if(menu_enabled == 1)
+	// global hud alpha fade (scoreboard-related panels behave differently and override it temporarly)
+	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);
 	else
-		hud_fade_alpha = (1 - autocvar__menu_alpha);
-
-	if(scoreboard_fade_alpha)
-		hud_fade_alpha = (1 - scoreboard_fade_alpha);
+		hud_fade_alpha = 1 - autocvar__menu_alpha;
 
 	HUD_Configure_Frame();
 
@@ -507,8 +511,14 @@ void HUD_Main()
 	// they must fade only when the menu does
 	if(scoreboard_fade_alpha == 1)
 	{
-		HUD_Panel_Draw(HUD_PANEL(CENTERPRINT));
-		return;
+		if(autocvar__menu_alpha == 1)
+			return;
+		if(scoreboard_fade_alpha == 1)
+		{
+			HUD_Panel_Draw(HUD_PANEL(SCOREBOARD));
+			HUD_Panel_Draw(HUD_PANEL(CENTERPRINT));
+			return;
+		}
 	}
 
 	if(!autocvar__hud_configure && !hud_fade_alpha)
@@ -599,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)