X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=audio.h;h=79fcc582d98387c9074c4753bdd54715c3fbd0d9;hb=1d06671f87a9d24596fc6808d8e0db889a818750;hp=e6e76bdd22d5940a1ffb3beff528485d06b4854a;hpb=ec90a4b46865009c1e1b1679f6926e35d2ee3f12;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/audio.h b/audio.h index e6e76bd..79fcc58 100644 --- a/audio.h +++ b/audio.h @@ -128,6 +128,16 @@ audio_clip audio_ui[] = { { .path = "sound/ui_ding.ogg" }, }; +audio_clip audio_challenge[] = { + { .path = "sound/objective0.ogg" }, + { .path = "sound/objective1.ogg" }, + { .path = "sound/objective_win.ogg" }, + { .path = "sound/ui_good.ogg" }, + { .path = "sound/ui_inf.ogg" }, + { .path = "sound/ui_ok.ogg" }, + { .path = "sound/objective_fail.ogg" } +}; + VG_STATIC void audio_init(void) { audio_clip_loadn( audio_board, vg_list_size(audio_board), NULL ); @@ -150,6 +160,7 @@ VG_STATIC void audio_init(void) vg_list_size(audio_footsteps_wood), NULL ); audio_clip_loadn( audio_rewind, vg_list_size(audio_rewind), NULL ); audio_clip_loadn( audio_ui, vg_list_size(audio_ui), NULL ); + audio_clip_loadn( audio_challenge, vg_list_size(audio_challenge), NULL ); audio_lock(); audio_set_lfo_wave( 0, k_lfo_polynomial_bipolar, 80.0f ); @@ -173,12 +184,12 @@ enum audio_sprite_type VG_STATIC void audio_ambient_sprite_play( v3f co, audio_clip *clip ) { audio_lock(); - u32 channel_id = 31342352; - audio_channel *ch = audio_get_group_idle_channel( channel_id, 4 ); + u16 group_id = 0xfff0; + audio_channel *ch = audio_get_group_idle_channel( group_id, 4 ); if( ch ){ audio_channel_init( ch, clip, AUDIO_FLAG_SPACIAL_3D ); - audio_channel_group( ch, channel_id ); + audio_channel_group( ch, group_id ); audio_channel_set_spacial( ch, co, 80.0f ); audio_channel_edit_volume( ch, 1.0f, 1 ); ch = audio_relinquish_channel( ch );