X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FView.qc;h=8a479a992759d3f6a5958bbffc461336207580aa;hp=908e6dbf17fbc63b9cff14daa7e4d7f49d0866da;hb=009a974c908606ffda671ec958053a6f85f0a6f2;hpb=ee1bc52fd8269edac22ce73ddecc88583fa1d623

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 908e6dbf1..8a479a992 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -137,7 +137,7 @@ vector GetCurrentFov(float fov)
 			zoomspeed = 3.5;
 
 	zoomdir = button_zoom;
-	if((getstati(STAT_ACTIVEWEAPON) == WEP_NEX && nex_scope) || (getstati(STAT_ACTIVEWEAPON) == WEP_CAMPINGRIFLE && campingrifle_scope)) // do NOT use switchweapon here
+	if((getstati(STAT_ACTIVEWEAPON) == WEP_NEX && nex_scope) || (getstati(STAT_ACTIVEWEAPON) == WEP_SNIPERRIFLE && sniperrifle_scope)) // do NOT use switchweapon here
 		zoomdir += button_attack2;
 	if(spectatee_status > 0 || isdemo())
 	{
@@ -274,7 +274,7 @@ float TrueAimCheck()
 		case WEP_MINSTANEX:
 			mv = MOVE_NORMAL;
 			break;
-		case WEP_CAMPINGRIFLE:
+		case WEP_SNIPERRIFLE:
 			ta = trueaim_rifle;
 			mv = MOVE_NORMAL;
 			if(zoomscript_caught)
@@ -306,6 +306,9 @@ float TrueAimCheck()
 	traceline(view_origin, view_origin + view_forward * MAX_SHOT_DISTANCE, mv, ta);
 	trueaimpoint = trace_endpos;
 
+	if(vlen(trueaimpoint - view_origin) < g_trueaim_minrange)
+		trueaimpoint = view_origin + view_forward * g_trueaim_minrange;
+
 	if(vecs_x > 0)
 		vecs_y = -vecs_y;
 	else
@@ -357,6 +360,9 @@ float myhealth_flash;
 
 vector myhealth_gentlergb;
 
+float contentavgalpha, liquidalpha_prev;
+vector liquidcolor_prev;
+
 void CSQC_UpdateView(float w, float h)
 {
 	entity e;
@@ -572,7 +578,7 @@ void CSQC_UpdateView(float w, float h)
 	// next R_RenderScene call
 	drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
 
-	if(autocvar_r_fakelight >= 2 || autocvar_r_fullbright >= 1)
+	if(autocvar_r_fakelight >= 2 || autocvar_r_fullbright)
 	if not(serverflags & SERVERFLAG_ALLOW_FULLBRIGHT)
 	{
 		// apply night vision effect
@@ -628,11 +634,11 @@ void CSQC_UpdateView(float w, float h)
 	// the view to go back to normal, so reticle_type would become 0 as we fade out)
 	if(spectatee_status || getstati(STAT_HEALTH) <= 0)
 		reticle_type = 0; // prevent reticle from showing during the respawn zoom effect or for spectators
-	else if(activeweapon == WEP_NEX && (button_zoom || zoomscript_caught) || activeweapon == WEP_CAMPINGRIFLE && (button_zoom || zoomscript_caught) || activeweapon == WEP_MINSTANEX && (button_zoom || zoomscript_caught))
+	else if(activeweapon == WEP_NEX && (button_zoom || zoomscript_caught) || activeweapon == WEP_SNIPERRIFLE && (button_zoom || zoomscript_caught) || activeweapon == WEP_MINSTANEX && (button_zoom || zoomscript_caught))
 		reticle_type = 2; // nex zoom
 	else if(button_zoom || zoomscript_caught)
 		reticle_type = 1; // normal zoom
-	else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_CAMPINGRIFLE && button_attack2)
+	else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_SNIPERRIFLE && button_attack2)
 		reticle_type = 2; // nex zoom
 
 	if(autocvar_cl_reticle_stretch)
@@ -666,8 +672,57 @@ void CSQC_UpdateView(float w, float h)
 			drawpic(reticle_pos, "gfx/reticle_nex", reticle_size, '1 1 1', f * autocvar_cl_reticle_item_nex, DRAWFLAG_NORMAL);
 	}
 
-	// improved polyblend
+
+	// improved polyblend with post processing effects
 	vector rgb;
+	if(autocvar_hud_contents)
+	{
+		float contentalpha_temp, incontent, liquidalpha, contentfadetime;
+		vector liquidcolor;
+		
+		switch(pointcontents(view_origin))
+		{
+			case CONTENT_WATER:
+				liquidalpha = autocvar_hud_contents_water_alpha;
+				liquidcolor = stov(autocvar_hud_contents_water_color);
+				incontent = 1;
+				break;
+				
+			case CONTENT_LAVA:
+				liquidalpha = autocvar_hud_contents_lava_alpha;
+				liquidcolor = stov(autocvar_hud_contents_lava_color);
+				incontent = 1;
+				break;	
+							
+			case CONTENT_SLIME:
+				liquidalpha = autocvar_hud_contents_slime_alpha;
+				liquidcolor = stov(autocvar_hud_contents_slime_color);
+				incontent = 1;
+				break;
+				
+			default:
+				liquidalpha = 0;
+				liquidcolor = '0 0 0';
+				incontent = 0;
+				break;
+		}
+		
+		if(incontent) // fade in/out at different speeds so you can do e.g. instant fade when entering water and slow when leaving it.
+		{ // also lets delcare previous values for blending properties, this way it isn't reset until after you have entered a different content
+			contentfadetime = autocvar_hud_contents_fadeintime;
+			liquidalpha_prev = liquidalpha;
+			liquidcolor_prev = liquidcolor;
+		}
+		else
+			contentfadetime = autocvar_hud_contents_fadeouttime;
+			
+		contentalpha_temp = bound(0, drawframetime / max(0.0001, contentfadetime), 1);
+		contentavgalpha = contentavgalpha * (1 - contentalpha_temp) + incontent * contentalpha_temp;
+		
+		if(contentavgalpha)
+			drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, liquidcolor_prev, contentavgalpha * liquidalpha_prev, DRAWFLAG_NORMAL);
+	}
+	
 	if(autocvar_hud_damage)
 	{
 		float myhealth_flash_temp;
@@ -676,7 +731,7 @@ void CSQC_UpdateView(float w, float h)
 		// fade out
 		myhealth_flash = max(0, myhealth_flash - autocvar_hud_damage_fade_rate * frametime);
 		// add new damage
-		myhealth_flash = bound(0, myhealth_flash + max(0, myhealth_prev - myhealth) * autocvar_hud_damage_factor, autocvar_hud_damage_maxalpha);
+		myhealth_flash = bound(0, myhealth_flash + dmg_take * autocvar_hud_damage_factor, autocvar_hud_damage_maxalpha);
 
 		float pain_threshold, pain_threshold_lower, pain_threshold_lower_health;
 		pain_threshold = autocvar_hud_damage_pain_threshold;
@@ -941,12 +996,12 @@ void CSQC_UpdateView(float w, float h)
 				nex_charge_movingavg = nex_charge;
 
 			// ring around crosshair representing bullets left in camping rifle clip
-			if (activeweapon == WEP_CAMPINGRIFLE && cr_maxbullets)
+			if (activeweapon == WEP_SNIPERRIFLE && cr_maxbullets)
 			{
 				bullets = getstati(STAT_BULLETS_LOADED);
 				f = bound(0, bullets / cr_maxbullets, 1);
 
-				a = autocvar_crosshair_ring_campingrifle_alpha;
+				a = autocvar_crosshair_ring_sniperrifle_alpha;
 				DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE);
 			}
 			else if (activeweapon == WEP_NEX && nex_charge) // ring around crosshair representing velocity-dependent damage for the nex