ragdoll quality improvements

[carveJwlIkooP6JGAAIwe30JlM.git] / player_skate.c

diff --git a/player_skate.c b/player_skate.c
index 7f4bc37f741991deb72b99cca2495cfe0a2731af..94b523b3ee3e567c4d3367d33183ff690c36ea2d 100644 (file)
--- a/player_skate.c
+++ b/player_skate.c
@@ -758,7 +758,7 @@ static void skate_apply_trick_model(void){
           state->trick_time > 0.2f)
       {
          player__skate_kill_audio();
-         player__dead_transition();
+         player__dead_transition( k_player_die_type_feet );
       }
 
       state->trick_euler[0] = roundf( state->trick_euler[0] );
@@ -957,6 +957,7 @@ static void skate_apply_jump_model(void){
          q_mulv( qtilt, jumpdir, jumpdir );
       }
       state->surface_cooldown = 10;
+      state->trick_input_collect = 0.0f;
       
       float force = k_jump_force*state->jump_charge;
       v3_muladds( localplayer.rb.v, jumpdir, force, localplayer.rb.v );
@@ -1100,9 +1101,14 @@ static void player__skate_pre_update(void){
       return;
    }
 
+   enum trick_type trick = player_skate_trick_input();
+   if( trick )
+      state->trick_input_collect += vg.time_frame_delta;
+   else 
+      state->trick_input_collect = 0.0f;
+
    if( state->activity <= k_skate_activity_air_to_grind ){
-      enum trick_type trick = k_trick_type_none;
-      if( (trick = player_skate_trick_input()) ){
+      if( trick && (state->trick_input_collect < 0.1f) ){
          if( state->trick_time == 0.0f ){
             audio_lock();
             audio_oneshot_3d( &audio_flips[vg_randu32(&vg.rand)%4], 
@@ -2042,7 +2048,7 @@ static void player__skate_update(void){
                                 k_player_walk_soundeffect_splash,
                                 localplayer.rb.co, 1.0f );
          player__skate_kill_audio();
-         player__dead_transition();
+         player__dead_transition( k_player_die_type_generic );
          return;
       }
    }
@@ -2317,7 +2323,7 @@ begin_collision:;
       rb_update_transform( &localplayer.rb );
 
       player__skate_kill_audio();
-      player__dead_transition();
+      player__dead_transition( k_player_die_type_head );
       return;
    }
 
@@ -2485,7 +2491,7 @@ begin_collision:;
    if( nforce > 4.0f ){
       if( nforce > 17.6f ){
          v3_muladds( localplayer.rb.v, normal_total, -1.0f, localplayer.rb.v );
-         player__dead_transition();
+         player__dead_transition( k_player_die_type_feet );
          player__skate_kill_audio();
          return;
       }