volume slider

diff --git a/conf.h b/conf.h
index 99d0e9f0ae4507ee64b7149b372a8f4b7fc023a9..b07be66ffc45c4015639fee565e23dab61a5fb83 100644 (file)
--- a/conf.h
+++ b/conf.h
@@ -5,7 +5,6 @@
 #include "vg/vg.h"
 
 VG_STATIC float cl_fov              = 0.86f,
-                cl_volume           = 1.0f,
                 cl_blur_strength    = 2.0f;
 VG_STATIC int   cl_blur             = 1,
                 cl_playermdl_id     = 0;

diff --git a/menu.h b/menu.h
index d8dbd1a576a1d32cd12060c6209e5812cd704b60..162b76e8771456ba8cdc6225f1ac5e4d99660603 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -582,14 +582,16 @@ VG_STATIC void menu_page_skater(void)
    }
 }
 
-VG_STATIC void menu_slider( float *value, float min, float max,
+VG_STATIC void menu_slider( float *value, int set_value,
                             mdl_node *slider, mdl_node *pmin, mdl_node *pmax )
 {
-   float h = input_menu_h.axis.value;
-
-   if( fabsf(h) > 0.04f )
-      *value += h * vg.frame_delta;
-   *value = vg_clampf( *value, min, max );
+   if( set_value )
+   {
+      float h = input_menu_h.axis.value;
+      if( fabsf(h) > 0.04f )
+         *value += h * vg.frame_delta;
+      *value = vg_clampf( *value, 0.0f, 1.0f );
+   }
 
    v3_lerp( pmin->co, pmax->co, *value, slider->co );
 }
@@ -598,20 +600,18 @@ VG_STATIC void menu_page_settings(void)
 {
    menu_run_directional();
 
-   if( game_menu.loc == menu_get_loc( "fov_slider" ) )
-   {
-      menu_slider( &cl_fov, 0.0f, 1.0f, 
-                     menu_pnode_fov_slider, menu_pnode_fov_min,
-                     menu_pnode_fov_max );
+   int fov_select = game_menu.loc == menu_get_loc( "fov_slider" );
+   menu_slider( &cl_fov, fov_select,
+                  menu_pnode_fov_slider, menu_pnode_fov_min,
+                  menu_pnode_fov_max );
 
+   if( fov_select )
       menu_fov_target = vg_lerpf( 97.0f, 135.0f, cl_fov ) * 0.8f;
-   }
-   else if( game_menu.loc == menu_get_loc( "vol_slider" ) )
-   {
-      menu_slider( &cl_volume, 0.0f, 1.0f, 
-                     menu_pnode_vol_slider, menu_pnode_vol_min,
-                     menu_pnode_vol_max );
-   }
+
+   menu_slider( &vg_audio.volume_console, 
+                  (game_menu.loc == menu_get_loc( "vol_slider" )),
+                  menu_pnode_vol_slider, menu_pnode_vol_min,
+                  menu_pnode_vol_max );
 
    if( menu_page_should_backout() )
    {