X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=audio.h;h=dbd6fc7b4a3cb00e23d24353bb8cf1567f54791d;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=c07f0d15912ace5cb90eca6bcb1a6f09c8e767b3;hpb=a8ba9cc44e1ae9aeca62fb579a3105c625e59133;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/audio.h b/audio.h
index c07f0d1..dbd6fc7 100644
--- a/audio.h
+++ b/audio.h
@@ -128,7 +128,17 @@ audio_clip audio_ui[] = {
    { .path = "sound/ui_ding.ogg" },
 };
 
-VG_STATIC void audio_init(void)
+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" }
+};
+
+static void audio_init(void)
 {
    audio_clip_loadn( audio_board, vg_list_size(audio_board), NULL );
    audio_clip_loadn( audio_taps, vg_list_size(audio_taps), 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 );
@@ -157,7 +168,7 @@ VG_STATIC void audio_init(void)
    audio_unlock();
 }
 
-VG_STATIC void audio_free(void)
+static void audio_free(void)
 {
    /* TODO! */
    vg_warn( "UNIMPLEMENTED: audio_free()\n" );
@@ -170,7 +181,7 @@ enum audio_sprite_type
    k_audio_sprite_type_water
 };
 
-VG_STATIC void audio_ambient_sprite_play( v3f co, audio_clip *clip )
+static void audio_ambient_sprite_play( v3f co, audio_clip *clip )
 {
    audio_lock();
    u16 group_id = 0xfff0;
@@ -186,9 +197,9 @@ VG_STATIC void audio_ambient_sprite_play( v3f co, audio_clip *clip )
    audio_unlock();
 }
 
-VG_STATIC
+static
 enum audio_sprite_type world_audio_sample_sprite_random(v3f origin, v3f output);
-VG_STATIC void audio_ambient_sprites_update( world_instance *world, v3f co )
+static void audio_ambient_sprites_update( world_instance *world, v3f co )
 {
    static float accum = 0.0f;
    accum += vg.time_delta;