Volume cutting: Don't reduce music and sound volume when in the stomach only. But...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 2bd4aec8b4cd63452566cadae6b77d162752139c..4555317ddfb3824ca917044fd7ce3a1e6ba8d5b7 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1605,9 +1605,8 @@ seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the co
 \r
 seta cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between = alpha"\r
 seta cl_vore_swallowmodel 1 "when enabled, we see the swallow model around us while getting eaten. -1 = disabled, 1 = enabled, anything between = alpha"\r
-seta cl_vore_cutvolume_sound 0.75 "sound volume is reduced to this amount when you are in a stomach"\r
-seta cl_vore_cutvolume_music 0.25 "music volume is reduced to this amount when you are in a stomach"\r
-seta cl_vore_cutvolume_fade 1 "fading speed of the volume change"\r
+seta cl_vore_cutvolume_sound 0.75 "sound volume is reduced to this amount when you are in a stomach or being swallowed"\r
+seta cl_vore_cutvolume_music 0.15 "music volume is reduced to this amount when you are in a stomach or being swallowed"\r
 seta cl_vore_autodigest 0 "when enabled, the player will automatically begin digesting enemy prey after eating them, as long as no team mates are inside (automated digest key)"\r
 seta cl_vore_vieweffects_idlescale_predator 35 "the view will move around by this ammount while swallowing someone (based on progress), reserves the cvar v_idlescale"\r
 seta cl_vore_vieweffects_idlescale_prey 50 "the view will move around by this ammount while being swallowed (based on progress), reserves the cvar v_idlescale"\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 113d8c5423b290f4ca6ed6fd447cac7c92599481..58e1082be0edc869e91eec8a40e8944c89cea4b0 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -255,8 +255,6 @@ float myhealth, myhealth_prev, myhealth_flash;
 float contentavgalpha, liquidalpha_prev;\r
 float old_blurradius, old_bluralpha, old_cartoon_intensity;\r
 float stomachsplash_alpha;\r
-float volume_modify_1, volume_modify_2, volume_modify_default_1, volume_modify_default_2;\r
-float volume_modify_changed_1, volume_modify_changed_2;\r
 float eventchase_current_distance;\r
 float helper_pause, helper_health, helper_armor, helper_ammo, helper_speed, helper_stomachload;\r
 vector myhealth_gentlergb;\r
@@ -961,63 +959,30 @@ void CSQC_UpdateView(float w, float h)
                        cvar_set("r_glsl_saturation", "1");\r
        }\r
 \r
-       // volume cutting\r
-       if(cvar("cl_vore_cutvolume_sound") < 1 || cvar("cl_vore_cutvolume_music") < 1 && frametime)\r
+       float target_volume;\r
+       if(cvar("cl_vore_cutvolume_sound") && frametime)\r
        {\r
-               float volume_modify_1_target, volume_modify_2_target, volume_modify_fade;\r
-\r
-               if(volume_modify_changed_1 != cvar("menu_volume") || volume_modify_changed_2 != cvar("menu_bgmvolume"))\r
-               {\r
-                       // An ugly hack to allow the cutvolume feature to work with the menu audio sliders.\r
-                       // Without it, adjusting the music or master sound sliders while fading that volume would have bad results.\r
-                       // This needs to be done in a better way! Currently, changing the volume sliders will just reset the fading.\r
-\r
-                       volume_modify_default_1 = cvar("menu_volume");\r
-                       volume_modify_default_2 = cvar("menu_bgmvolume");\r
-\r
-                       volume_modify_changed_1 = cvar("menu_volume");\r
-                       volume_modify_changed_2 = cvar("menu_bgmvolume");\r
-               }\r
-               else\r
-               {\r
-                       if(spectatee_status == -1 || intermission)\r
-                       {\r
-                               volume_modify_1_target = volume_modify_default_1;\r
-                               volume_modify_2_target = volume_modify_default_2;\r
-                       }\r
-                       else if(getstati(STAT_VORE_EATEN))\r
-                       {\r
-                               volume_modify_1_target = volume_modify_default_1 * cvar("cl_vore_cutvolume_sound");\r
-                               volume_modify_2_target = volume_modify_default_2 * cvar("cl_vore_cutvolume_music");\r
-                       }\r
-                       else\r
-                       {\r
-                               volume_modify_1_target = volume_modify_default_1;\r
-                               volume_modify_2_target = volume_modify_default_2;\r
-                       }\r
-                       volume_modify_fade = cvar("cl_vore_cutvolume_fade") * frametime;\r
-\r
-                       if(volume_modify_1 != volume_modify_1_target || volume_modify_2 != volume_modify_2_target)\r
-                       {\r
-                               if (volume_modify_1 > volume_modify_1_target + volume_modify_fade)\r
-                                       volume_modify_1 -= volume_modify_fade;\r
-                               else if (volume_modify_1 < volume_modify_1_target - volume_modify_fade)\r
-                                       volume_modify_1 += volume_modify_fade;\r
-                               else\r
-                                       volume_modify_1 = volume_modify_1_target;\r
-\r
-                               if (volume_modify_2 > volume_modify_2_target + volume_modify_fade)\r
-                                       volume_modify_2 -= volume_modify_fade;\r
-                               else if (volume_modify_2 < volume_modify_2_target - volume_modify_fade)\r
-                                       volume_modify_2 += volume_modify_fade;\r
-                               else\r
-                                       volume_modify_2 = volume_modify_2_target;\r
-\r
-                               cvar_set("volume", ftos(volume_modify_1));\r
-                               cvar_set("bgmvolume", ftos(volume_modify_2));\r
-                               // TODO: Setting the "volume" cvar is a bad way to go, and modifies the menu slider! We need a better way\r
-                       }\r
-               }\r
+               // sound volume cutting\r
+               if(getstatf(STAT_VORE_PROGRESS_PREY))\r
+                       target_volume = getstatf(STAT_VORE_PROGRESS_PREY);\r
+               else if(getstati(STAT_VORE_EATEN))\r
+                       target_volume = 1;\r
+               target_volume = cvar("menu_volume") * (1 - target_volume * cvar("cl_vore_cutvolume_sound"));\r
+\r
+               if(cvar("volume") != target_volume) // reduce cvar_set spam as much as possible\r
+                       cvar_set("volume", ftos(target_volume));\r
+       }\r
+       if(cvar("cl_vore_cutvolume_music") && frametime)\r
+       {\r
+               // music volume cutting\r
+               if(getstatf(STAT_VORE_PROGRESS_PREY))\r
+                       target_volume = getstatf(STAT_VORE_PROGRESS_PREY);\r
+               else if(getstati(STAT_VORE_EATEN))\r
+                       target_volume = 1;\r
+               target_volume = cvar("menu_bgmvolume") * (1 - target_volume * cvar("cl_vore_cutvolume_music"));\r
+\r
+               if(cvar("bgmvolume") != target_volume) // reduce cvar_set spam as much as possible\r
+                       cvar_set("bgmvolume", ftos(target_volume));\r
        }\r
 \r
        // Draw the mouse cursor\r