scraped a small amount of crap

[carveJwlIkooP6JGAAIwe30JlM.git] / audio.h

diff --git a/audio.h b/audio.h
index 4f735099fb87fddbb8d6f40524c55bc885b5b664..d52f410defd3cebef94613ba19c348e3612d85b6 100644 (file)
--- a/audio.h
+++ b/audio.h
@@ -12,17 +12,36 @@
 VG_STATIC float audio_occlusion_current = 0.0f,
              k_audio_occlusion_rate  = 1.0f;
 
-VG_STATIC int   k_audio_debug_soundscape = 0;
+VG_STATIC int k_audio_debug_soundscape = 0;
 
 audio_clip audio_board[] =
 {
    { .path="sound/skate_hpf.ogg" },
    { .path="sound/wheel.ogg" },
    { .path="sound/slide.ogg" },
-   { .path="sound/reverb.ogg" },
-   { .path="sound/grind_loop.ogg" },
    { .path="sound/grind_enter.ogg" },
-   { .path="sound/grind_exit.ogg" }
+   { .path="sound/grind_exit.ogg" },
+   { .path="sound/grind_loop.ogg" },
+   { .path="sound/woodslide.ogg" },
+   { .path="sound/metalscrape.ogg" },
+   { .path="sound/slidetap.ogg" }
+};
+
+audio_clip audio_taps[] =
+{
+   { .path="sound/tap0.ogg" },
+   { .path="sound/tap1.ogg" },
+   { .path="sound/tap2.ogg" },
+   { .path="sound/tap3.ogg" }
+};
+
+audio_clip audio_hits[] =
+{
+   { .path="sound/hit0.ogg" },
+   { .path="sound/hit1.ogg" },
+   { .path="sound/hit2.ogg" },
+   { .path="sound/hit3.ogg" },
+   { .path="sound/hit4.ogg" }
 };
 
 audio_clip audio_splash =
@@ -126,11 +145,6 @@ audio_clip audio_ui[] = {
    { .path = "sound/ui_ding.ogg" },
 };
 
-audio_clip audio_music[] = {
-   { .path = "sound/song.ogg", .flags = k_audio_format_vorbis },
-   { .path = "sound/skate.ogg", .flags = k_audio_format_vorbis },
-};
-
 #if 0
 audio_player ambient_sprites[4] =
 {
@@ -195,12 +209,13 @@ VG_STATIC void audio_init(void)
 #endif
 
    audio_clip_loadn( audio_board, vg_list_size(audio_board), NULL );
+   audio_clip_loadn( audio_taps, vg_list_size(audio_taps), NULL );
+   audio_clip_loadn( audio_hits, vg_list_size(audio_hits), NULL );
    audio_clip_loadn( audio_ambience, vg_list_size(audio_ambience), NULL );
    audio_clip_loadn( &audio_splash, 1, NULL );
    audio_clip_loadn( &audio_gate_pass, 1, NULL );
    audio_clip_loadn( &audio_gate_lap, 1, NULL );
    audio_clip_loadn( &audio_gate_ambient, 1, NULL );
-   audio_clip_loadn( audio_music, vg_list_size(audio_music), NULL );
 
    audio_clip_loadn( audio_jumps, vg_list_size(audio_jumps), NULL );
    audio_clip_loadn( audio_lands, vg_list_size(audio_lands), NULL );