reverts

[carveJwlIkooP6JGAAIwe30JlM.git] / player_walk.c

diff --git a/player_walk.c b/player_walk.c
index bacb48c42bb12203fdab132af5beb6eca3495bed..45c2d0ae1e4c72a57ff0a04643650c91b3044c83 100644 (file)
--- a/player_walk.c
+++ b/player_walk.c
@@ -284,8 +284,11 @@ VG_STATIC void player__walk_pre_update( player_instance *player )
          player->subsystem = k_player_subsystem_drive;
       }
       else{
-         if( !player_get_player_board(player) )
-            return;
+         struct player_board *board = 
+            addon_cache_item_if_loaded( k_addon_type_board,
+                                        player->board_view_slot );
+
+         if( !board ) return;
 
          if( w->state.activity == k_walk_activity_ground ){
             if( player_walk_scan_for_drop_in( player ) ){
@@ -317,6 +320,10 @@ VG_STATIC void player__walk_pre_update( player_instance *player )
          }
       }
    }
+   else if( button_down( k_srbind_jump ) && !player->immobile ){
+      w->state.jump_queued = 1;
+      w->state.jump_input_time = vg.time;
+   }
 }
 
 VG_STATIC int player_walk_normal_standable( player_instance *player, v3f n )
@@ -361,6 +368,7 @@ VG_STATIC void player__walk_update( player_instance *player )
 {
    struct player_walk *w = &player->_walk;
    v3_copy( player->rb.co, w->state.prev_pos );
+   v3_zero( player->rb.w );
 
    world_instance *world = world_current_instance();
 
@@ -461,14 +469,19 @@ VG_STATIC void player__walk_update( player_instance *player )
       nominal_speed = k_walkspeed;
 
       /* jump */
-      if( button_down( k_srbind_jump ) ){
-         float d = v3_dot( player->basis[1], player->rb.v );
-         v3_muladds( player->rb.v, player->basis[1], -d, player->rb.v );
-         v3_muladds( player->rb.v, player->basis[1], 5.0f, player->rb.v );
-         w->state.activity = k_walk_activity_air;
-         prev_state = k_walk_activity_air;
-         accel_speed = k_walk_air_accel;
-         nominal_speed = k_airspeed;
+      if( w->state.jump_queued ){
+         w->state.jump_queued = 0;
+
+         f32 t = vg.time - w->state.jump_input_time;
+         if( t < PLAYER_JUMP_EPSILON ){
+            float d = v3_dot( player->basis[1], player->rb.v );
+            v3_muladds( player->rb.v, player->basis[1], -d, player->rb.v );
+            v3_muladds( player->rb.v, player->basis[1], 5.0f, player->rb.v );
+            w->state.activity = k_walk_activity_air;
+            prev_state = k_walk_activity_air;
+            accel_speed = k_walk_air_accel;
+            nominal_speed = k_airspeed;
+         }
       }
       else{
          player_friction( player->rb.v );