a mess but stable

[carveJwlIkooP6JGAAIwe30JlM.git] / player_glide.c

diff --git a/player_glide.c b/player_glide.c
index 4a5958e3cc6ad3b12be4e7fc70e22701e6a09b3b..3cbcb28041470de213dd49074550b952dda4e462 100644 (file)
--- a/player_glide.c
+++ b/player_glide.c
@@ -273,11 +273,15 @@ void player_glide_update(void)
    v2f steer;
    joystick_state( k_srjoystick_steer, steer );
 
-   if( glider_physics( steer ) ){
+   if( glider_physics( steer ) )
+   {
       vg_info( "player fell off due to glider hitting ground\n" );
       player__dead_transition( k_player_die_type_generic );
       localplayer.glider_orphan = 1;
    }
+
+   if( !world_water_player_safe( world_current_instance(), 1.0f ) )
+      return;
 }
 
 void player_glide_post_update(void)
@@ -343,18 +347,17 @@ void player_glide_remote_animator_exchange( bitpack_ctx *ctx, void *data )
    bitpack_qquat( ctx, animator->root_q );
 }
 
-void player_glide_im_gui(void)
+void player_glide_im_gui( ui_context *ctx )
 {
-   player__debugtext( 1, "Nothing here" );
-   player__debugtext( 1, " lift: %.2f %.2f %.2f", 
+   player__debugtext( ctx, 1, " lift: %.2f %.2f %.2f", 
                            player_glide.info_lift[0],
                            player_glide.info_lift[1],
                            player_glide.info_lift[2] );
-   player__debugtext( 1, " slip: %.2f %.2f %.2f", 
+   player__debugtext( ctx, 1, " slip: %.2f %.2f %.2f", 
                            player_glide.info_slip[0],
                            player_glide.info_slip[1],
                            player_glide.info_slip[2] );
-   player__debugtext( 1, " drag: %.2f %.2f %.2f", 
+   player__debugtext( ctx, 1, " drag: %.2f %.2f %.2f", 
                            player_glide.info_drag[0],
                            player_glide.info_drag[1],
                            player_glide.info_drag[2] );
@@ -698,6 +701,6 @@ void player_glide_render_effects( vg_camera *cam )
                            localplayer.rb.to_world[1], alpha );
                            
       trail_system_prerender( &trails_glider[i] );
-      trail_system_render( &trails_glider[i], &skaterift.cam );
+      trail_system_render( &trails_glider[i], &g_render.cam );
    }
 }