ent_challenge extra features

[carveJwlIkooP6JGAAIwe30JlM.git] / player_skate.c

diff --git a/player_skate.c b/player_skate.c
index 3cd9a928194cbc677aa9741e3694b26773849040..a7899075d0525f5db0a62a92f74aaf230bc5f4ea 100644 (file)
--- a/player_skate.c
+++ b/player_skate.c
@@ -1119,27 +1119,29 @@ VG_STATIC void player__skate_pre_update( player_instance *player ){
       return;
    }
 
-   enum trick_type trick = k_trick_type_none;
-   if( (s->state.activity <= k_skate_activity_air_to_grind) && 
-       (trick = player_skate_trick_input( player )) )
-   {
-      if( (vg.time - s->state.jump_time) < 0.1f ){
-         v3_zero( s->state.trick_vel );
-         s->state.trick_time = 0.0f;
-
-         if( trick == k_trick_type_kickflip ){
-            s->state.trick_vel[0] = 3.0f;
-         }
-         else if( trick == k_trick_type_shuvit ){
-            s->state.trick_vel[2] = 3.0f;
-         }
-         else if( trick == k_trick_type_treflip ){
-            s->state.trick_vel[0] = 2.0f;
-            s->state.trick_vel[2] = 2.0f;
+   if( s->state.activity <= k_skate_activity_air_to_grind ){
+      enum trick_type trick = k_trick_type_none;
+      if( (trick = player_skate_trick_input( player )) ){
+         if( (vg.time - s->state.jump_time) < 0.1f ){
+            v3_zero( s->state.trick_vel );
+            s->state.trick_time = 0.0f;
+
+            if( trick == k_trick_type_kickflip ){
+               s->state.trick_vel[0] = 3.0f;
+            }
+            else if( trick == k_trick_type_shuvit ){
+               s->state.trick_vel[2] = 3.0f;
+            }
+            else if( trick == k_trick_type_treflip ){
+               s->state.trick_vel[0] = 2.0f;
+               s->state.trick_vel[2] = 2.0f;
+            }
+            s->state.trick_type = trick;
          }
-         s->state.trick_type = trick;
       }
    }
+   else
+      s->state.trick_type = k_trick_type_none;
 }
 
 VG_STATIC void player__skate_post_update( player_instance *player ){