ye

diff --git a/src/network.c b/src/network.c
index 174903a84c6c44e28ec17beaa47e57d148e7d21b..b41ff9e45cddd28ea8b72ad41985364f765a1914 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -487,8 +487,6 @@ struct resolve_info
 };
 static void _network_resolve_host( vg_async_task *co_task )
 {
-   VG_ASSERT( co_task );
-
    if( co_task )
    {
       struct resolve_info *co_info = (void *)co_task->data;

diff --git a/src/player_render.c b/src/player_render.c
index 700c60099a74d23f2bc162500cf10f5a7a05aa8b..2138e79e71ac319c43d0ee84f937a9144664d499 100644 (file)
--- a/src/player_render.c
+++ b/src/player_render.c
@@ -487,8 +487,7 @@ void render_board( vg_camera *cam, world_instance *world,
 
       v4f qroll;
       q_axis_angle( qroll, (v3f){0.0f,0.0f,1.0f}, pose->lean * 0.6f );
-      keyframe_rotate_around( &kf, (v3f){0.0f,0.11f,0.0f}, 
-                              (v3f){0.0f,0.0f,0.0f}, qroll );
+      keyframe_rotate_around( &kf, (v3f){0.0f,0.11f,0.0f}, (v3f){0.0f,0.0f,0.0f}, qroll );
 
       v3_add( board->board_position, kf.co, mlocal[3] );
       q_m3x3( kf.q, mlocal );

diff --git a/src/player_skate.c b/src/player_skate.c
index 9d2f5bb3700e82bd22948c87f5711f359fac2b05..9c20d7324e7fc4afbec2bf1a5561869ef1f8e865 100644 (file)
--- a/src/player_skate.c
+++ b/src/player_skate.c
@@ -3536,7 +3536,8 @@ void player__skate_pose( void *_animator, player_pose *pose ){
 
 void player__skate_effects( void *_animator, m4x3f *final_mtx,
                                    struct player_board *board,
-                                   struct player_effects_data *effect_data ){
+                                   struct player_effects_data *effect_data )
+{
    struct skeleton *sk = &localplayer.skeleton;
    struct player_skate_animator *animator = _animator;
 

diff --git a/src/replay2.c b/src/replay2.c
index 6ab05d03ee63bc87bbaa2e9b640a20df5539a251..ce019049695976d677d1d88177f96ba24c8af426 100644 (file)
--- a/src/replay2.c
+++ b/src/replay2.c
@@ -54,6 +54,8 @@ void replay2_close_player(void)
 
 static void replay_download_callback( void *data, u32 data_size, u64 userdata, enum request_status status )
 {
+   THREAD_0;
+
    bool is_from_network = userdata;
    replay2 *replay = &_remote_replay.replay;
 
@@ -108,8 +110,7 @@ static void replay_download_callback( void *data, u32 data_size, u64 userdata, e
             if( playermodel_str )
             {
                addon_cache_unwatch( k_addon_type_player, _replay_player.playermodel_cache_id );
-               _replay_player.playermodel_cache_id = 
-                  addon_cache_create_viewer_from_uid( k_addon_type_player, playermodel_str );
+               _replay_player.playermodel_cache_id = addon_cache_create_viewer_from_uid( k_addon_type_player, playermodel_str );
             }
 
             if( board_str )
@@ -360,8 +361,7 @@ void _replay2_pre_update(void)
       m4x3f *final_mtx = _replay_player.final_mtx;
       v3f *glider_mtx = _replay_player.glider_mtx;
       struct player_board_pose *board_pose = &_replay_player.board_pose;
-      struct player_board *board = &localplayer.fallback_board;
-      //struct player_board *board = addon_cache_item_if_loaded( k_addon_type_board, player->board_view_slot );
+      struct player_board *board = addon_cache_item_data( k_addon_type_board, _replay_player.board_cache_id, 1 );
       struct player_effects_data *effects = &_replay_player.effect_data;
       bool *glider_flag = &_replay_player.render_glider;
       f64 frame_time = _replay_player.cursor;
@@ -386,15 +386,11 @@ void _replay2_render_player( world_instance *world, vg_camera *cam )
    if( skaterift.activity != k_skaterift_replay ) 
       return;
 
-   //struct player_model *model = addon_cache_item_if_loaded( k_addon_type_player, player->playermodel_view_slot );
-   //if( !model ) 
-   //   model = &localplayer.fallback_model;
+   struct player_model *model = addon_cache_item_data( k_addon_type_player, _replay_player.playermodel_cache_id, 1 );
    struct skeleton *sk = &localplayer.skeleton;
-   struct player_model *model = &localplayer.fallback_model;
    render_playermodel( cam, world, 0, model, sk, _replay_player.final_mtx );
 
-   //struct player_board *board = addon_cache_item_if_loaded( k_addon_type_board, player->board_view_slot );
-   struct player_board *board = &localplayer.fallback_board;
+   struct player_board *board = addon_cache_item_data( k_addon_type_board, _replay_player.board_cache_id, 1 );
    render_board( cam, world, board, _replay_player.final_mtx[localplayer.id_board], 
                  &_replay_player.board_pose, k_board_shader_player );
 

diff --git a/src/replay2.h b/src/replay2.h
index 3b5ea93bec2d44c033f406e33abf1e4e9ab305db..375989503a2dbc86e29ee7bff8694694834a0b45 100644 (file)
--- a/src/replay2.h
+++ b/src/replay2.h
@@ -87,8 +87,8 @@ struct _replay_player
    f64 highlight_start, highlight_length;
 
    bool animation_dirty;
-   u16 board_cache_id,
-       playermodel_cache_id;
+   addon_cache_id board_cache_id,
+                  playermodel_cache_id;
 
    struct player_effects_data effect_data;
    bool render_glider;

diff --git a/src/skaterift.c b/src/skaterift.c
index d4e432cc179f34356fbc11acee540a9d26ce2194..32398b6b5c8384f322e7bc448cb6579ed974208a 100644 (file)
--- a/src/skaterift.c
+++ b/src/skaterift.c
@@ -115,8 +115,8 @@ static void game_load_0(void *_)
    vg_loader_step( world_map_init, NULL );
    vg_loader_step( ent_tornado_init, NULL );
    vg_loader_step( skaterift_replay_init, NULL );
-   vg_loader_step( _replay2_init, NULL );
    vg_loader_step( skaterift_load_player_content, NULL );
+   vg_loader_step( _replay2_init, NULL );
 
    vg_loader_set_user_information( "Compiling shaders" );
    vg_bake_shaders();