more sensible world loading stuff (wip)

[carveJwlIkooP6JGAAIwe30JlM.git] / ent_skateshop.c

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 7cb0e9aa1e414ac369c7f951e5f0aaeb2430895a..7dd11c0bcd46ea4e9446061b2343805e4991f81a 100644 (file)
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -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,