X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.h;h=69be37e75411da8af5af97fbc3b3dccc6e8ef836;hb=72c40f1bc7a732f6a628dbf8a4135ac0bf3efa4e;hp=72eb94e678a1cb49247018074ea31f09c0db4b50;hpb=7398f8a24aaba107bafb5ab5c55141b94e10027b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_skate.h b/player_skate.h
index 72eb94e..69be37e 100644
--- a/player_skate.h
+++ b/player_skate.h
@@ -19,8 +19,7 @@ struct player_skate
          k_skate_activity_undefined,
          k_skate_activity_grind_any,
          k_skate_activity_grind_boardslide,
-         k_skate_activity_grind_noseslide,
-         k_skate_activity_grind_tailslide,
+         k_skate_activity_grind_metallic,
          k_skate_activity_grind_back50,
          k_skate_activity_grind_front50,
          k_skate_activity_grind_5050
@@ -28,11 +27,7 @@ struct player_skate
       activity,
       activity_prev;
 
-      float /* steery,
-            steerx,
-            steery_s,
-            steerx_s, */
-            reverse,
+      float reverse,
             slip;
 
       int manual_direction;
@@ -50,8 +45,6 @@ struct player_skate
       v3f up_dir;
       v3f head_position;
 
-      int lift_frames;
-
       v3f throw_v;
       v3f cog_v, cog;
 
@@ -78,8 +71,7 @@ struct player_skate
    state,
    state_gate_storage;
 
-
-   /* animation */
+   /* animation /audio */
    struct skeleton_anim *anim_stand, *anim_highg, *anim_slide,
                         *anim_air, *anim_grind, *anim_grind_jump,
                         *anim_push,  *anim_push_reverse,
@@ -99,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];
@@ -108,6 +101,20 @@ struct player_skate
    audio_channel *aud_main, *aud_slide, *aud_air;
    enum mdl_surface_prop surface, audio_surface;
 
+   int wheel_contacts[2];
+   float sample_change_cooldown;
+
+   enum {
+      k_skate_sample_concrete,
+      k_skate_sample_wood,
+      k_skate_sample_concrete_scrape_metal,
+      k_skate_sample_concrete_scrape_wood,
+      k_skate_sample_metal_scrape_generic
+   }
+   main_sample_type;
+
+   player_pose holdout;
+
    /*
     * Physics 
     * ----------------------------------------------------
@@ -151,7 +158,8 @@ struct player_skate
        grind_vec,
        grind_dir;
 
-   u32 grind_cooldown;
+   u32 grind_cooldown,
+       surface_cooldown;
 
    float grind_strength;
 
@@ -174,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 );