revision to walk animation/system

[carveJwlIkooP6JGAAIwe30JlM.git] / player_walk.h

diff --git a/player_walk.h b/player_walk.h
index 48be2ac6118f296e4e3b4dcb2f2703eba41118f9..368e99ce6f7b9cbfba908a1c2cdaf81b59412146 100644 (file)
--- a/player_walk.h
+++ b/player_walk.h
@@ -34,7 +34,8 @@ struct player_walk{
          k_walk_outro_none,
          k_walk_outro_jump_to_air,
          k_walk_outro_drop_in,
-         k_walk_outro_regular
+         k_walk_outro_regular,
+         k_walk_outro_max
       }
       outro_type;
       double outro_start_time;
@@ -74,13 +75,18 @@ struct player_walk{
 }
 static player_walk;
 
+enum player_walk_soundeffect {
+   k_player_walk_soundeffect_splash
+};
+
 static f32
-   k_walkspeed             = 10.0f,
+   k_walkspeed             = 3.0f,
+   k_runspeed              = 10.0f,
    k_airspeed              = 1.2f,
    k_stopspeed             = 4.0f,
    k_walk_accel            = 10.0f,
    k_walk_air_accel        = 7.0f,
-   k_walk_friction         = 10.0f,
+   k_walk_friction         = 6.0f,
    k_walk_step_height      = 0.2f,
 
    k_sit_yaw_limit         = VG_PIf/1.7f,
@@ -88,6 +94,7 @@ static f32
 
 static void player__walk_register(void){
    VG_VAR_F32( k_walkspeed,      flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_runspeed,       flags=VG_VAR_CHEAT );
    VG_VAR_F32( k_stopspeed,      flags=VG_VAR_CHEAT );
    VG_VAR_F32( k_airspeed,       flags=VG_VAR_CHEAT );
    VG_VAR_F32( k_walk_friction,  flags=VG_VAR_CHEAT );
@@ -104,14 +111,13 @@ static void player__walk_post_animate(void);
 static void player__walk_im_gui      (void);
 static void player__walk_bind        (void);
 static void player__walk_transition  (void);
-static void player__walk_reset       (ent_spawn *rp );
+static void player__walk_reset       (void);
 static void player__walk_restore     (void);
 static void player__walk_animator_exchange( bitpack_ctx *ctx, void *data );
 
 struct player_subsystem_interface static player_subsystem_walk = {
    .system_register = player__walk_register,
    .bind = player__walk_bind,
-   .reset = player__walk_reset,
    .pre_update = player__walk_pre_update,
    .update = player__walk_update,
    .post_update = player__walk_post_update,