X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=audio.h;h=fc9330c1a629d7cc7fb4bb3f3c0e93c5e4e08e91;hb=d13f2700b1773551307685cc7c34c804ccd6d664;hp=3e4fc77b7ba9c1fdc87a094d735f61856094b77d;hpb=cedb92d590f4578a246a09a96c0fa0eda109d3c7;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/audio.h b/audio.h index 3e4fc77..fc9330c 100644 --- a/audio.h +++ b/audio.h @@ -18,8 +18,8 @@ audio_clip audio_board[] = {.path="sound/reverb.ogg",.source_mode=k_audio_source_compressed } }; -audio_clip audio_ding = -{ .path = "sound/ding.ogg", .source_mode=k_audio_source_compressed }; +audio_clip audio_splash = +{ .path = "sound/splash.ogg", .source_mode=k_audio_source_compressed }; audio_clip audio_jumps[] = { { .path = "sound/jump0.ogg", .source_mode=k_audio_source_compressed, }, @@ -136,7 +136,7 @@ static void audio_init(void) audio_clip_loadn( audio_board, vg_list_size(audio_board) ); audio_clip_loadn( audio_ambience, vg_list_size(audio_ambience) ); - audio_clip_loadn( &audio_ding, 1 ); + audio_clip_loadn( &audio_splash, 1 ); audio_clip_loadn( &audio_gate_pass, 1 ); audio_clip_loadn( &audio_gate_lap, 1 ); audio_clip_loadn( &audio_gate_ambient, 1 ); @@ -160,7 +160,7 @@ static void audio_init(void) audio_player_set_flags( &ambient_sprites[2], AUDIO_FLAG_SPACIAL_3D ); audio_player_set_flags( &ambient_sprites[3], AUDIO_FLAG_SPACIAL_3D ); audio_player_set_vol( &ambient_player, 1.0f ); - audio_player_set_vol( &audio_player_gate, 5.0f ); + audio_player_set_vol( &audio_player_gate, 0.0f ); audio_player_set_vol( &audio_player_extra, 1.0f ); audio_player_playclip( &audio_player0, &audio_board[0] ); @@ -189,8 +189,10 @@ static void audio_init(void) }); } -static void audio_free(void) +static void audio_free(void*_) { + /* TODO! */ + vg_warn( "UNIMPLEMENTED: audio_free()\n" ); } static void audio_sample_occlusion( v3f origin ) @@ -202,6 +204,7 @@ static void audio_sample_occlusion( v3f origin ) int lv = 0; v3f last; + v3_zero(last); for( int i=0; i