fix long standing grind bug

[carveJwlIkooP6JGAAIwe30JlM.git] / player_walk.c

diff --git a/player_walk.c b/player_walk.c
index 1845906e2fe01263dbddebf14bed07c860d232f0..10d00947a2701a8b67e024c58603511cd8cdfd9a 100644 (file)
--- a/player_walk.c
+++ b/player_walk.c
@@ -69,6 +69,7 @@ VG_STATIC void player_walk_generic_to_skate( player_instance *player,
 
 VG_STATIC void player_walk_drop_in_to_skate( player_instance *player )
 {
+   player->immobile = 0;
    player->subsystem = k_player_subsystem_skate;
 
    struct player_walk *w = &player->_walk;
@@ -119,7 +120,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 );
@@ -282,6 +283,9 @@ VG_STATIC void player__walk_pre_update( player_instance *player )
          player->subsystem = k_player_subsystem_drive;
       }
       else{
+         if( !player_get_player_board(player) )
+            return;
+
          if( w->state.activity == k_walk_activity_ground ){
             if( player_walk_scan_for_drop_in( player ) ){
                w->state.outro_type = k_walk_outro_drop_in;
@@ -386,7 +390,7 @@ 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();
+   world_instance *world = world_current_instance();
 
    /* 
     * Collision detection
@@ -648,19 +652,19 @@ VG_STATIC void player__walk_post_update( player_instance *player )
       audio_lock();
       if( w->surface == k_surface_prop_concrete ){
          audio_oneshot_3d( 
-               &audio_footsteps[rand()%vg_list_size(audio_footsteps)], 
+               &audio_footsteps[vg_randu32()%vg_list_size(audio_footsteps)], 
                player->rb.co, 40.0f, 1.0f 
          );
       }
       else if( w->surface == k_surface_prop_grass ){
          audio_oneshot_3d( 
-           &audio_footsteps_grass[rand()%vg_list_size(audio_footsteps_grass)],
+           &audio_footsteps_grass[vg_randu32()%vg_list_size(audio_footsteps_grass)],
             player->rb.co, 40.0f, 1.0f 
          );
       }
       else if( w->surface == k_surface_prop_wood ){
          audio_oneshot_3d( 
-           &audio_footsteps_wood[rand()%vg_list_size(audio_footsteps_wood)],
+           &audio_footsteps_wood[vg_randu32()%vg_list_size(audio_footsteps_wood)],
             player->rb.co, 40.0f, 1.0f 
          );
       }