couple bugs

diff --git a/src/skaterift.c b/src/skaterift.c
index 5d2f4edab41dcd3ce6634bc134bf35c6416cf874..f4fa1e9b6f2ccb5af96e6121514a1dcd0d74f674 100644 (file)
--- a/src/skaterift.c
+++ b/src/skaterift.c
@@ -195,8 +195,6 @@ void vg_pre_update(void)
    if( skaterift.activity & k_skaterift_replay )
       target = 0;
 
-   vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) );
-   vg.time_rate = vg_smoothstepf( skaterift.time_rate );
    world_update( &_world.main, localplayer.rb.co );
 
    cutscene_update( vg.time_rate * vg.time_frame_delta );
@@ -220,6 +218,9 @@ void vg_pre_update(void)
       else target = 0;
    }
    audio_ambient_sprites_update( &_world.main, listen_co );
+
+   vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) );
+   vg.time_rate = vg_smoothstepf( skaterift.time_rate );
 }
 
 void vg_fixed_update(void)

diff --git a/src/world_load.c b/src/world_load.c
index 32329a0da886d4affc05eb402876cb7ec716d5c3..e4e04f4171266fdc607d8fbf48bd738b83ff608f 100644 (file)
--- a/src/world_load.c
+++ b/src/world_load.c
@@ -324,8 +324,7 @@ void async_start_player_from_worldsave( void *payload, u32 size )
       vg_msg player_frame = sav;
       if( vg_msg_seekframe( &player_frame, "player" ) )
       {
-         if( vg_msg_getkvvecf( &player_frame, "position", k_vg_msg_v3f, 
-                               localplayer.rb.co, NULL ) )
+         if( vg_msg_getkvvecf( &player_frame, "position", k_vg_msg_v3f, localplayer.rb.co, NULL ) )
             restored_player_position = 1;
       }
 
@@ -334,6 +333,8 @@ void async_start_player_from_worldsave( void *payload, u32 size )
 
       player__reset();
    }
+
+   network_send_item( k_netmsg_playeritem_world0 );
 }
 
 void load_player_from_world_savedata_thread( void *_ )