X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FView.qc;h=e6d2f925e4a246cb67cbf5081193bd7181fa678d;hb=0f060ee04a520b3692340198b22fa6184181c827;hp=4f00c55341639fbce6fd13122c29384a1db910b6;hpb=3319c56e4f4d3d2e4dc657147ebfd8fbfabb7aef;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 4f00c5534..e6d2f925e 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -381,9 +381,13 @@ vector damage_blurpostprocess, content_blurpostprocess;
 
 float checkfail[16];
 
+float last_flicker;
+vector previous_color;
+
 #define BUTTON_3 4
 #define BUTTON_4 8
 float cl_notice_run();
+float prev_myteam;
 void CSQC_UpdateView(float w, float h)
 {
 	entity e;
@@ -442,6 +446,14 @@ void CSQC_UpdateView(float w, float h)
 #endif
 		myteam = GetPlayerColor(player_localentnum - 1);
 
+	if(myteam != prev_myteam)
+	{
+		myteamcolors = colormapPaletteColor(myteam, 1);
+		for(i = 0; i < HUD_PANEL_NUM; ++i)
+			hud_panel[i].update_time = time;
+		prev_myteam = myteam;
+	}
+
 	ticrate = getstatf(STAT_MOVEVARS_TICRATE) * getstatf(STAT_MOVEVARS_TIMESCALE);
 
 	float is_dead = (getstati(STAT_HEALTH) <= 0);
@@ -886,8 +898,8 @@ void CSQC_UpdateView(float w, float h)
 			}
 		}
 	}
-	
-	if(autocvar_hud_damage)
+
+	if(autocvar_hud_damage && !getstati(STAT_FROZEN))
 	{
 		splash_size_x = max(vid_conwidth, vid_conheight);
 		splash_size_y = max(vid_conwidth, vid_conheight);
@@ -1071,7 +1083,7 @@ void CSQC_UpdateView(float w, float h)
 			if(getstatf(STAT_REVIVE_PROGRESS))
 			{
 				DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", getstatf(STAT_REVIVE_PROGRESS), '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
-				drawstring_aspect(eY * 0.64 * vid_conheight, "Revival progress", eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL);
+				drawstring_aspect(eY * 0.64 * vid_conheight, _("Revival progress"), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL);
 			}
 		}
 
@@ -1394,6 +1406,16 @@ void CSQC_UpdateView(float w, float h)
 					if (ring_value)
 						DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, ring_image, ring_value, ring_rgb, wcross_alpha * ring_alpha, DRAWFLAG_ADDITIVE);
 				}
+				
+				if(autocvar_crosshair_rainbow)
+				{
+					if(time >= last_flicker)
+					{
+						previous_color = randomvec() * autocvar_crosshair_rainbow_brightness;
+						last_flicker = time + autocvar_crosshair_rainbow_delay;
+					}
+					wcross_color = previous_color;
+				}
 
 #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
 				do \