animation and transition adjustments

[carveJwlIkooP6JGAAIwe30JlM.git] / player_skate.c

diff --git a/player_skate.c b/player_skate.c
index de240df816280c96f09c8b7bd991397a297d3479..191c708ad1a160340e3040846a34bcbafc21c0b8 100644 (file)
--- a/player_skate.c
+++ b/player_skate.c
@@ -1146,19 +1146,6 @@ static enum trick_type player_skate_trick_input(void){
 static void player__skate_pre_update(void){
    struct player_skate_state *state = &player_skate.state;
 
-#if 0
-   if( button_down(k_srbind_devbutton) ){
-      state->activity = k_skate_activity_popoff;
-      state->handplant_t = 0.0f;
-      v3_copy( localplayer.rb.co, state->store_co );
-      v3_copy( localplayer.rb.v, state->air_init_v );
-      v4_copy( localplayer.rb.q, state->store_q );
-      v3_copy( state->cog, state->store_cog );
-      v3_copy( state->cog_v, state->store_cog_v );
-      v4_copy( state->smoothed_rotation, state->store_smoothed );
-   }
-#endif
-
    if( state->activity == k_skate_activity_handplant ){
       state->handplant_t += vg.time_delta;
       mdl_keyframe hpose[32];
@@ -1234,7 +1221,8 @@ static void player__skate_pre_update(void){
 
       player__begin_holdout( offset );
       player__skate_kill_audio();
-      player__walk_transition( k_walk_activity_ipopoff, state->trick_euler[0] );
+      player__walk_transition( state->activity <= k_skate_activity_air_to_grind?
+                               0: 1, state->trick_euler[0] );
       return;
    }