X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fclient%2FView.qc;h=0e4167c83fff54e70f9dbb7bff3e2c9aa5b1a41b;hp=42a685260d2bd14aa541623597104abaf4eb1cac;hb=8cac9a6f0e00ad7b1a39f9b616e4da769550df3d;hpb=ffac6c9232e818bba0ee32a74605189d990f5911

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 42a68526..0e4167c8 100644
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -256,6 +256,7 @@ float pickup_crosshair_time, pickup_crosshair_size;
 float myhealth, myhealth_prev, myhealth_flash;
 float contentavgalpha, liquidalpha_prev;
 float stomachsplash_alpha, stomachsplash_remove_at_respawn;
+float volume_modify_1, volume_modify_2, volume_modify_default_1, volume_modify_default_2;
 vector myhealth_gentlergb;
 vector liquidcolor_prev;
 vector damage_blurpostprocess, content_blurpostprocess;
@@ -512,6 +513,31 @@ void CSQC_UpdateView(float w, float h)
 		
 		if(contentavgalpha)
 			drawfill('0 0 0', '1 0 0' * vid_conwidth + '0 1 0' * vid_conheight, liquidcolor_prev, contentavgalpha * liquidalpha_prev, DRAWFLAG_NORMAL);
+
+		if(cvar("hud_postprocessing"))
+		{
+			if(cvar("hud_contents_liquid_blur"))
+			{
+				// when inside the stomach, we use different blur settings than when we're inside other fluids
+				content_blurpostprocess_x = 1;
+				if(getstati(STAT_VORE_EATEN))
+				{
+					content_blurpostprocess_y = contentavgalpha * cvar("hud_contents_stomach_blur");
+					content_blurpostprocess_z = contentavgalpha * cvar("hud_contents_stomach_blur_alpha");
+				}
+				else
+				{
+					content_blurpostprocess_y = contentavgalpha * cvar("hud_contents_liquid_blur");
+					content_blurpostprocess_z = contentavgalpha * cvar("hud_contents_liquid_blur_alpha");
+				}
+			}
+			else
+			{
+				content_blurpostprocess_x = 0;
+				content_blurpostprocess_y = 0;
+				content_blurpostprocess_z = 0;
+			}
+		}
 	}
 
 	if(cvar("hud_damage"))
@@ -634,6 +660,27 @@ void CSQC_UpdateView(float w, float h)
 			cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");
 			cvar_set("r_glsl_postprocess_uservec1_enable", "0");
 		}
+
+		if(cvar("hud_powerup"))
+		{
+			float sharpen_intensity;
+			if (getstatf(STAT_STRENGTH_FINISHED) - time > 0)
+				sharpen_intensity += (getstatf(STAT_STRENGTH_FINISHED) - time);
+			if (getstatf(STAT_INVINCIBLE_FINISHED) - time > 0)
+				sharpen_intensity += (getstatf(STAT_INVINCIBLE_FINISHED) - time);
+			sharpen_intensity = bound(0, sharpen_intensity, 5); // powerup warning time is 5 seconds, so fade the effect from there
+
+			if(sharpen_intensity > 0)
+			{
+				cvar_set("r_glsl_postprocess_uservec2", strcat("0 ", ftos(-sharpen_intensity * cvar("hud_powerup")), " 0 0"));
+				cvar_set("r_glsl_postprocess_uservec2_enable", "1");
+			}
+			else
+			{
+				cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");
+				cvar_set("r_glsl_postprocess_uservec2_enable", "0");
+			}
+		}
 	}
 
 	if not(cvar("hud_damage") && cvar("hud_postprocessing"))
@@ -642,6 +689,61 @@ void CSQC_UpdateView(float w, float h)
 		cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");
 		cvar_set("r_glsl_postprocess_uservec1_enable", "0");
 	}
+	if not(cvar("hud_powerup") && cvar("hud_postprocessing"))
+	{
+		// don't allow sharpen to get stuck on if we disable the cvar while powered up
+		cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");
+		cvar_set("r_glsl_postprocess_uservec2_enable", "0");
+	}
+
+	if(cvar("cl_vore_cutvolume_sound") < 1 || cvar("cl_vore_cutvolume_music") < 1)
+	{
+		float volume_modify_1_target, volume_modify_2_target, volume_modify_fade;
+		if(getstati(STAT_VORE_EATEN))
+		{
+			volume_modify_1_target = volume_modify_default_1 * cvar("cl_vore_cutvolume_sound");
+			volume_modify_2_target = volume_modify_default_2 * cvar("cl_vore_cutvolume_music");
+		}
+		else
+		{
+			volume_modify_1_target = 1;
+			volume_modify_2_target = 1;
+		}
+		volume_modify_fade = cvar("cl_vore_cutvolume_fade") * frametime;
+
+		if(spectatee_status == -1 || intermission)
+		{
+			// no volume fading is currently taking place, so if we change the volume settings, update the initial volume
+			volume_modify_default_1 = cvar("volume");
+			volume_modify_default_2 = cvar("bgmvolume");
+		}
+		else if(volume_modify_1 != volume_modify_1_target || volume_modify_2 != volume_modify_2_target)
+		{
+			if (volume_modify_1 > volume_modify_1_target + volume_modify_fade)
+				volume_modify_1 -= volume_modify_fade;
+			else if (volume_modify_1 < volume_modify_1_target - volume_modify_fade)
+				volume_modify_1 += volume_modify_fade;
+			else
+				volume_modify_1 = volume_modify_1_target;
+
+			if (volume_modify_2 > volume_modify_2_target + volume_modify_fade)
+				volume_modify_2 -= volume_modify_fade;
+			else if (volume_modify_2 < volume_modify_2_target - volume_modify_fade)
+				volume_modify_2 += volume_modify_fade;
+			else
+				volume_modify_2 = volume_modify_1_target;
+
+			cvar_set("volume", ftos(volume_modify_1));
+			cvar_set("bgmvolume", ftos(volume_modify_2));
+			// TODO: Setting the "volume" cvar is a bad way to go, and modifies the menu slider! We need a better way
+		}
+		else if(cvar("volume") != volume_modify_default_1 || cvar("bgmvolume") != volume_modify_default_2)
+		{
+			// no volume fading is currently taking place, so if we change the volume settings, update the initial volume
+			volume_modify_default_1 = cvar("volume");
+			volume_modify_default_2 = cvar("bgmvolume");
+		}
+	}
 
 	// Draw the mouse cursor
 	// NOTE: drawpic must happen after R_RenderScene for some reason