X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.h;h=69be37e75411da8af5af97fbc3b3dccc6e8ef836;hb=16f58e6b8d79762919000b9ae8266ad55a01a870;hp=9f21115eee71e0f4318873f47eb77f925571ef67;hpb=6e29d444f89478d5965fc652373272e5d70e84e4;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_skate.h b/player_skate.h
index 9f21115..69be37e 100644
--- a/player_skate.h
+++ b/player_skate.h
@@ -19,6 +19,7 @@ struct player_skate
          k_skate_activity_undefined,
          k_skate_activity_grind_any,
          k_skate_activity_grind_boardslide,
+         k_skate_activity_grind_metallic,
          k_skate_activity_grind_back50,
          k_skate_activity_grind_front50,
          k_skate_activity_grind_5050
@@ -26,11 +27,7 @@ struct player_skate
       activity,
       activity_prev;
 
-      float /* steery,
-            steerx,
-            steery_s,
-            steerx_s, */
-            reverse,
+      float reverse,
             slip;
 
       int manual_direction;
@@ -74,7 +71,6 @@ struct player_skate
    state,
    state_gate_storage;
 
-
    /* animation /audio */
    struct skeleton_anim *anim_stand, *anim_highg, *anim_slide,
                         *anim_air, *anim_grind, *anim_grind_jump,
@@ -95,7 +91,8 @@ struct player_skate
          blend_push,
          blend_jump,
          blend_airdir,
-         blend_weight;
+         blend_weight,
+         subslap;
 
    /* vectors representing the direction of the axels in localspace */
    v3f truckv0[2];
@@ -116,6 +113,8 @@ struct player_skate
    }
    main_sample_type;
 
+   player_pose holdout;
+
    /*
     * Physics 
     * ----------------------------------------------------
@@ -183,6 +182,7 @@ VG_STATIC void player__skate_animate      ( player_instance *player,
 VG_STATIC void player__skate_post_animate ( player_instance *player );
 VG_STATIC void player__skate_reset        ( player_instance *player,
                                             ent_spawn *rp );
+VG_STATIC void player__skate_restore( player_instance *player );
 
 VG_STATIC void player__skate_clear_mechanics( player_instance *player );
 VG_STATIC void player__skate_reset_animator( player_instance *player );