X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=44a669abee8f43288e03d54073cacb12dbac4f7e;hb=4b8fc63f926737ca0593a4e471550f9f4995c538;hp=7cb0e9aa1e414ac369c7f951e5f0aaeb2430895a;hpb=2dd61c7f0185ec525658ca398801f46e6adccf23;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index 7cb0e9a..44a669a 100644 --- a/ent_skateshop.c +++ b/ent_skateshop.c @@ -252,7 +252,7 @@ VG_STATIC void global_skateshop_preupdate(void){ localplayer.board_view_slot = cache_id; global_skateshop_exit(); - skaterift_write_savedata(); + skaterift_write_main_savedata(); return; } } @@ -346,9 +346,7 @@ VG_STATIC void global_skateshop_preupdate(void){ if( loadable && button_down( k_srbind_maccept ) ){ vg_info( "Select rift (%u)\n", global_skateshop.selected_world_id ); - world_loader.reg = reg; - world_loader.override_name[0] = '\0'; - skaterift_change_world_start(); + skaterift_change_world_start( reg ); return; } else{ @@ -430,7 +428,7 @@ VG_STATIC void skateshop_render_boardshop(void){ q_nlerp( xform.q, mark_display->transform.q, t, xform.q ); v3_lerp( xform.s, mark_display->transform.s, t, xform.s ); - struct board_pose pose = {0}; + struct player_board_pose pose = {0}; m4x3f mmdl; mdl_transform_m4x3( &xform, mmdl ); render_board( &skaterift.cam, world, board, mmdl,