X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fhud%2Fhud.qc;h=9da25ebe9145e27f7cf400afd30e4b1f74343fc5;hb=991de5e6922cd3c283de56c3249624f0f1bfe767;hp=55d7ffeaa8bd1a106f1621bf9ca7b8f1c3f6dd33;hpb=e51ce3d45d2852ca793118fc73da9c25f789101f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index 55d7ffeaa..9da25ebe9 100644
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -2,6 +2,7 @@
 
 #include <client/defs.qh>
 #include <client/miscfunctions.qh>
+#include <client/view.qh>
 #include "panel/scoreboard.qh"
 #include "hud_config.qh"
 #include "../mapvoting.qh"
@@ -13,9 +14,11 @@
 #include <common/items/_mod.qh>
 #include <common/mapinfo.qh>
 #include <common/vehicles/all.qh>
+#include <common/vehicles/vehicle/bumblebee.qh>
 #include <common/mutators/mutator/waypoints/all.qh>
 #include <common/stats.qh>
 #include <lib/csqcmodel/cl_player.qh>
+#include <lib/csqcmodel/cl_model.qh>
 #include <common/gamemodes/_mod.qh>
 
 
@@ -72,14 +75,14 @@ vector HUD_Get_Num_Color (float hp, float maxvalue)
 
 float HUD_GetRowCount(int item_count, vector size, float item_aspect)
 {
-    TC(int, item_count);
+	TC(int, item_count);
 	float aspect = size_y / size_x;
 	return bound(1, floor((sqrt(4 * item_aspect * aspect * item_count + aspect * aspect) + aspect + 0.5) / 2), item_count);
 }
 
 vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect)
 {
-    TC(int, item_count);
+	TC(int, item_count);
 	float columns, rows;
 	float ratio, best_ratio = 0;
 	float best_columns = 1, best_rows = 1;
@@ -177,7 +180,7 @@ void HUD_Panel_LoadCvars()
 //basically the same code of draw_ButtonPicture and draw_VertButtonPicture for the menu
 void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag)
 {
-    TC(bool, vertical); TC(int, drawflag);
+	TC(bool, vertical); TC(int, drawflag);
 	if(!length_ratio || !theAlpha)
 		return;
 	if(length_ratio > 1)
@@ -284,7 +287,7 @@ void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, flo
 
 void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theAlpha, int drawflag)
 {
-    TC(int, drawflag);
+	TC(int, drawflag);
 	if(!theAlpha)
 		return;
 
@@ -305,7 +308,7 @@ void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theA
 
 void DrawNumIcon_expanding(vector myPos, vector mySize, float theTime, string icon, bool vertical, int icon_right_align, vector color, float theAlpha, float fadelerp)
 {
-    TC(bool, vertical); TC(int, icon_right_align);
+	TC(bool, vertical); TC(int, icon_right_align);
 	vector newPos = '0 0 0', newSize = '0 0 0';
 	vector picpos, numpos;
 
@@ -385,7 +388,7 @@ void DrawNumIcon_expanding(vector myPos, vector mySize, float theTime, string ic
 
 void DrawNumIcon(vector myPos, vector mySize, float theTime, string icon, bool vertical, int icon_right_align, vector color, float theAlpha)
 {
-    TC(bool, vertical); TC(int, icon_right_align);
+	TC(bool, vertical); TC(int, icon_right_align);
 	DrawNumIcon_expanding(myPos, mySize, theTime, icon, vertical, icon_right_align, color, theAlpha, 0);
 }
 
@@ -395,8 +398,6 @@ Main HUD system
 ==================
 */
 
-void CSQC_BUMBLE_GUN_HUD();
-
 void HUD_Vehicle()
 {
 	if(autocvar__hud_configure) return;
@@ -424,7 +425,11 @@ void HUD_Panel_Draw(entity panent)
 	}
 
 	bool draw_allowed = false;
-	if (active_minigame && HUD_MinigameMenu_IsOpened())
+	if (scoreboard_fade_alpha && panel.panel_showflags & PANEL_SHOW_WITH_SB)
+	{
+		draw_allowed = true;
+	}
+	else if (active_minigame && HUD_MinigameMenu_IsOpened())
 	{
 		if (panel.panel_showflags & PANEL_SHOW_MINIGAME)
 			draw_allowed = true;
@@ -440,7 +445,12 @@ void HUD_Panel_Draw(entity panent)
 	if (draw_allowed)
 	{
 		if (panel.panel_showflags & PANEL_SHOW_WITH_SB)
-			panel_fade_alpha = 1;
+		{
+			if (scoreboard_fade_alpha && intermission == 2 && !(panel.panel_showflags & PANEL_SHOW_MAPVOTE))
+				panel_fade_alpha = scoreboard_fade_alpha;
+			else
+				panel_fade_alpha = 1;
+		}
 		else
 		{
 			panel_fade_alpha = 1 - scoreboard_fade_alpha;
@@ -485,8 +495,6 @@ bool Hud_Shake_Update()
 	return true;
 }
 
-entity CSQCModel_server2csqc(int i);
-void calc_followmodel_ofs(entity view);
 void Hud_Dynamic_Frame()
 {
 	vector ofs = '0 0 0';
@@ -562,6 +570,24 @@ void Hud_Dynamic_Frame()
 	HUD_Scale_Disable();
 }
 
+bool HUD_WouldShowCursor()
+{
+	if(autocvar__hud_configure)
+		return true;
+	if(mv_active)
+		return true;
+	//entity local_player = ((csqcplayer) ? csqcplayer : CSQCModel_server2csqc(player_localentnum - 1)); // TODO: doesn't use regular cursor handling
+	//if(local_player.viewloc && (local_player.viewloc.spawnflags & VIEWLOC_FREEAIM))
+		//return true;
+	if(HUD_Radar_Clickable())
+		return true;
+	if(HUD_MinigameMenu_IsOpened())
+		return true;
+	if(QuickMenu_IsOpened())
+		return true;
+	return false;
+}
+
 void HUD_Main()
 {
 	int i;
@@ -677,10 +703,20 @@ void HUD_Main()
 		HUD_Panel_Draw(HUD_PANEL(RADAR));
 	if(autocvar__con_chat_maximized)
 		HUD_Panel_Draw(HUD_PANEL(CHAT));
-	if(hud_panel_quickmenu)
+	if (QuickMenu_IsOpened())
 		HUD_Panel_Draw(HUD_PANEL(QUICKMENU));
 	HUD_Panel_Draw(HUD_PANEL(SCOREBOARD));
 
+	int cursor_active_prev = cursor_active;
+	cursor_active = HUD_WouldShowCursor();
+	if (cursor_active_prev != cursor_active && autocvar_hud_cursormode)
+	{
+		setcursormode(cursor_active);
+		// cursor inactive this frame, will be set to 1 the next frame
+		if (cursor_active)
+			cursor_active = -1;
+	}
+
 	if (intermission == 2)
 		HUD_Reset();