audio_play_oneshot( &audio_rewind[4], 1.0f );
audio_unlock();
- if( v < 0.0f )
+ if( v > 0.0f )
{
game_menu.selected_map --;
}
}
-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 );
}
{
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() )
{
}
/* Update camera */
+#if 0
{
main_camera.angles[0] =
vg_alerpf( main_camera.angles[0], angles[0], menu_opacity );
camera_update_transform( &main_camera );
}
+#endif
float dt = vg.frame_delta * 6.0f;
menu_opacity = vg_lerpf( menu_opacity, cl_menu&&!cl_menu_go_away, dt );