dont remember

[carveJwlIkooP6JGAAIwe30JlM.git] / player_skate.h

diff --git a/player_skate.h b/player_skate.h
index d4900dd8d24fa476109236aa224192428cf9046b..1c23b5845395c3dc62f5942059259e949cf7e441 100644 (file)
--- a/player_skate.h
+++ b/player_skate.h
@@ -14,6 +14,7 @@ struct player_skate
       enum skate_activity
       {
          k_skate_activity_air,
+         k_skate_activity_air_to_grind,
          k_skate_activity_ground,
          k_skate_activity_undefined,
          k_skate_activity_grind_any,
@@ -58,7 +59,8 @@ struct player_skate
       v2f grab_mouse_delta;
 
       int charging_jump, jump_dir;
-      float jump_charge;
+      float jump_charge,
+            slap;
 
       double jump_time;
       double start_push,
@@ -70,6 +72,8 @@ struct player_skate
       double air_start;
       v3f    air_init_v,
              air_init_co;
+
+      v4f smoothed_rotation;
    }
    state,
    state_gate_storage;
@@ -95,8 +99,6 @@ struct player_skate
          blend_airdir,
          blend_weight;
 
-   float slap;
-
    /* vectors representing the direction of the axels in localspace */
    v3f truckv0[2];
    v2f wobble;
@@ -147,7 +149,7 @@ struct player_skate
        grind_vec,
        grind_dir;
 
-   u32 frames_since_activity_change;
+   u32 grind_cooldown;
 
    float grind_strength;