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

diff --git a/player_skate.h b/player_skate.h
index 1c23b58..9f21115 100644
--- a/player_skate.h
+++ b/player_skate.h
@@ -19,8 +19,6 @@ 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_back50,
          k_skate_activity_grind_front50,
          k_skate_activity_grind_5050
@@ -50,8 +48,6 @@ struct player_skate
       v3f up_dir;
       v3f head_position;
 
-      int lift_frames;
-
       v3f throw_v;
       v3f cog_v, cog;
 
@@ -79,9 +75,9 @@ struct player_skate
    state_gate_storage;
 
 
-   /* animation */
+   /* animation /audio */
    struct skeleton_anim *anim_stand, *anim_highg, *anim_slide,
-                        *anim_air,
+                        *anim_air, *anim_grind, *anim_grind_jump,
                         *anim_push,  *anim_push_reverse,
                         *anim_ollie, *anim_ollie_reverse,
                         *anim_grabs, *anim_stop;
@@ -93,6 +89,8 @@ struct player_skate
          blend_z,
          blend_x,
          blend_fly,
+         blend_grind,
+         blend_grind_balance,
          blend_stand,
          blend_push,
          blend_jump,
@@ -106,6 +104,18 @@ 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;
+
    /*
     * Physics 
     * ----------------------------------------------------
@@ -149,7 +159,8 @@ struct player_skate
        grind_vec,
        grind_dir;
 
-   u32 grind_cooldown;
+   u32 grind_cooldown,
+       surface_cooldown;
 
    float grind_strength;