X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud.qc;h=91770fd724ecc9b3b477ce5d279a88077e0448d0;hb=717defe5e02506bb5c857025d71fb605d6eb8c55;hp=bee8d0568ec2ac1afe7b7ba2704cb3dc77b08f9f;hpb=1ff1288152dd20786853bed28c9d9aad1f21c8a5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index bee8d0568..91770fd72 100644
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -398,6 +398,8 @@ Main HUD system
 ==================
 */
 
+float lasthud;
+float vh_notice_time;
 void HUD_Vehicle()
 {
 	if(autocvar__hud_configure) return;
@@ -406,9 +408,14 @@ void HUD_Vehicle()
 	if(hud == HUD_BUMBLEBEE_GUN)
 		CSQC_BUMBLE_GUN_HUD();
 	else {
-		Vehicle info = Vehicles_from(hud);
+		Vehicle info = REGISTRY_GET(Vehicles, hud);
 		info.vr_hud(info);
 	}
+
+	if(hud != HUD_NORMAL && lasthud == HUD_NORMAL)
+		vh_notice_time = time + autocvar_cl_vehicles_notify_time;
+
+	lasthud = hud;
 }
 
 void HUD_Panel_Draw(entity panent)
@@ -425,7 +432,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;
@@ -441,7 +452,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;
@@ -565,8 +581,6 @@ bool HUD_WouldShowCursor()
 {
 	if(autocvar__hud_configure)
 		return true;
-	if(hud_panel_radar_mouse)
-		return true;
 	if(mv_active)
 		return true;
 	//entity local_player = ((csqcplayer) ? csqcplayer : CSQCModel_server2csqc(player_localentnum - 1)); // TODO: doesn't use regular cursor handling
@@ -581,6 +595,7 @@ bool HUD_WouldShowCursor()
 	return false;
 }
 
+float prev_myteam;
 void HUD_Main()
 {
 	int i;
@@ -589,6 +604,13 @@ void HUD_Main()
 	else
 		hud_fade_alpha = 1 - autocvar__menu_alpha;
 
+	if(myteam != prev_myteam)
+	{
+		myteamcolors = colormapPaletteColor(myteam, 1);
+		FOREACH(hud_panels, true, it.update_time = time);
+		prev_myteam = myteam;
+	}
+
 	HUD_Configure_Frame();
 
 	if(scoreboard_fade_alpha == 1)
@@ -645,18 +667,18 @@ void HUD_Main()
 
 	// cache the panel order into the panel_order array
 	if(autocvar__hud_panelorder != hud_panelorder_prev) {
-		for(i = 0; i < hud_panels_COUNT; ++i)
+		for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i)
 			panel_order[i] = -1;
 		string s = "";
 		int p_num;
 		bool warning = false;
 		int argc = tokenize_console(autocvar__hud_panelorder);
-		if (argc > hud_panels_COUNT)
+		if (argc > REGISTRY_COUNT(hud_panels))
 			warning = true;
 		//first detect wrong/missing panel numbers
-		for(i = 0; i < hud_panels_COUNT; ++i) {
+		for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i) {
 			p_num = stoi(argv(i));
-			if (p_num >= 0 && p_num < hud_panels_COUNT) { //correct panel number?
+			if (p_num >= 0 && p_num < REGISTRY_COUNT(hud_panels)) { //correct panel number?
 				if (panel_order[p_num] == -1) //found for the first time?
 					s = strcat(s, ftos(p_num), " ");
 				panel_order[p_num] = 1; //mark as found
@@ -664,7 +686,7 @@ void HUD_Main()
 			else
 				warning = true;
 		}
-		for(i = 0; i < hud_panels_COUNT; ++i) {
+		for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i) {
 			if (panel_order[i] == -1) {
 				warning = true;
 				s = strcat(s, ftos(i), " "); //add missing panel number
@@ -678,15 +700,15 @@ void HUD_Main()
 
 		//now properly set panel_order
 		tokenize_console(s);
-		for(i = 0; i < hud_panels_COUNT; ++i) {
+		for(i = 0; i < REGISTRY_COUNT(hud_panels); ++i) {
 			panel_order[i] = stof(argv(i));
 		}
 	}
 
 	hud_draw_maximized = 0;
 	// draw panels in the order specified by panel_order array
-	for(i = hud_panels_COUNT - 1; i >= 0; --i)
-		HUD_Panel_Draw(hud_panels_from(panel_order[i]));
+	for(i = REGISTRY_COUNT(hud_panels) - 1; i >= 0; --i)
+		HUD_Panel_Draw(REGISTRY_GET(hud_panels, panel_order[i]));
 
 	HUD_Vehicle();
 
@@ -700,10 +722,15 @@ void HUD_Main()
 		HUD_Panel_Draw(HUD_PANEL(QUICKMENU));
 	HUD_Panel_Draw(HUD_PANEL(SCOREBOARD));
 
-	bool cursor_active_prev = cursor_active;
+	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();