X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_walk.c;h=6a20b17f32855eb9bcd1924eb822ef431318fdcf;hb=fdd41609e59c7df548682b25001f0015dc1acbea;hp=c3b6c2eba2418dc50ec546a1cea3ddbb0c55bbd1;hpb=ec90a4b46865009c1e1b1679f6926e35d2ee3f12;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_walk.c b/player_walk.c
index c3b6c2e..6a20b17 100644
--- a/player_walk.c
+++ b/player_walk.c
@@ -3,6 +3,7 @@
 
 #include "player.h"
 #include "input.h"
+#include "audio.h"
 
 VG_STATIC void player_walk_drop_in_vector( player_instance *player, v3f vec )
 {
@@ -120,7 +121,7 @@ VG_STATIC void player_walk_drop_in_overhang_transform( player_instance *player,
 VG_STATIC int player_walk_scan_for_drop_in( player_instance *player )
 {
    struct player_walk *w = &player->_walk;
-   world_instance *world = get_active_world();
+   world_instance *world = world_current_instance();
 
    v3f dir, center;
    q_mulv( player->rb.q, (v3f){0.0f,0.0f,1.0f}, dir );
@@ -316,6 +317,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 )
@@ -360,6 +365,17 @@ 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();
+
+   if( world->water.enabled ){
+      if( player->rb.co[1]+0.4f < world->water.height ){
+         audio_oneshot_3d( &audio_splash, player->rb.co, 40.0f, 1.0f );
+         player__dead_transition( player );
+         return;
+      }
+   }
 
    enum walk_activity prev_state = w->state.activity;
 
@@ -390,7 +406,6 @@ VG_STATIC void player__walk_update( player_instance *player )
    joystick_state( k_srjoystick_steer, steer );
 
    w->move_speed = v2_length( steer );
-   world_instance *world = get_active_world();
 
    /* 
     * Collision detection
@@ -451,14 +466,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 );