X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.c;h=c18df219f4f8f9475d91ae6ac5e3e569fa58c95b;hb=8f83be5a31728cd6bf95020e729367cc44308763;hp=bfccb61a2930b5c146544182eb5d3327b379858f;hpb=2673c575386c604fc2c0603dba2480eda05cf97a;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_skate.c b/player_skate.c
index bfccb61..c18df21 100644
--- a/player_skate.c
+++ b/player_skate.c
@@ -302,7 +302,7 @@ VG_STATIC int create_jumps_to_hit_target( player_instance *player,
    m3x3_mulv( player->invbasis, player->rb.v, v_local );
 
    v2f d = { v3_dot( ax, v0 ),           v0[1] },
-       v = { v3_dot( ax, player->rb.v ), v_local[1] };
+       v = { v3_dot( ax, v_local ), v_local[1] };
 
    float a = atan2f( v[1], v[0] ),
          m = v2_length( v ),
@@ -1198,11 +1198,17 @@ VG_STATIC void player__skate_post_update( player_instance *player )
 
    const u32 flags = AUDIO_FLAG_SPACIAL_3D|AUDIO_FLAG_LOOP;
 
-   if( !s->aud_air )
-      s->aud_air = audio_request_channel( &audio_board[1], flags );
+   if( !s->aud_air ){
+      s->aud_air = audio_get_first_idle_channel();
+      if( s->aud_air )
+         audio_channel_init( s->aud_air, &audio_board[1], flags );
+   }
 
-   if( !s->aud_slide )
-      s->aud_slide = audio_request_channel( &audio_board[2], flags );
+   if( !s->aud_slide ){
+      s->aud_slide = audio_get_first_idle_channel();
+      if( s->aud_slide ) 
+         audio_channel_init( s->aud_slide, &audio_board[2], flags );
+   }
 
 
    /* brrrrrrrrrrrt sound for tiles and stuff 
@@ -1273,7 +1279,8 @@ VG_STATIC void player__skate_post_update( player_instance *player )
    if( s->aud_main ){
       s->aud_main->colour = 0x00103efe;
       audio_channel_set_spacial( s->aud_main, player->rb.co, 40.0f );
-      audio_channel_slope_volume( s->aud_main, 0.05f, vol_main );
+      //audio_channel_slope_volume( s->aud_main, 0.05f, vol_main );
+      audio_channel_edit_volume( s->aud_main, vol_main, 1 );
       audio_channel_sidechain_lfo( s->aud_main, 0, sidechain_amt );
 
       float rate = 1.0f + (attn-0.5f)*0.2f;
@@ -1283,14 +1290,16 @@ VG_STATIC void player__skate_post_update( player_instance *player )
    if( s->aud_slide ){
       s->aud_slide->colour = 0x00103efe;
       audio_channel_set_spacial( s->aud_slide, player->rb.co, 40.0f );
-      audio_channel_slope_volume( s->aud_slide, 0.05f, vol_slide );
+      //audio_channel_slope_volume( s->aud_slide, 0.05f, vol_slide );
+      audio_channel_edit_volume( s->aud_slide, vol_slide, 1 );
       audio_channel_sidechain_lfo( s->aud_slide, 0, sidechain_amt );
    }
 
    if( s->aud_air ){
       s->aud_air->colour = 0x00103efe;
       audio_channel_set_spacial( s->aud_air, player->rb.co, 40.0f );
-      audio_channel_slope_volume( s->aud_air, 0.05f, vol_air );
+      //audio_channel_slope_volume( s->aud_air, 0.05f, vol_air );
+      audio_channel_edit_volume( s->aud_air, vol_air, 1 );
    }
 
    audio_unlock();