X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;fp=skaterift.c;h=c9afd0b4ef6e2f5fe84a6b41670b79f650418cc9;hb=2329044d44a5aff035b01926f7901d9e89ad284e;hp=25957d5b6e88162a99d3d2fb6430ebf35eb2e3de;hpb=4b8fc63f926737ca0593a4e471550f9f4995c538;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 25957d5..c9afd0b 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -134,9 +134,12 @@ static void skaterift_restore_state(void){
       if( reg_id != 0xffffffff ){
          addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
 
-         world_static.addon_client = reg;
          world_static.load_state = k_world_loader_load;
-         skaterift_client_world_changer_thread(NULL);
+         struct world_load_args args = {
+            .purpose = k_world_purpose_client,
+            .reg = reg
+         };
+         skaterift_world_load_thread( &args );
 
          world_static.active_instance = vg_msg_seekkvu32( &world, "index", 0 );
          world_static.active_trigger_volume_count = 0;
@@ -226,8 +229,12 @@ VG_STATIC void vg_load(void){
    }
 
    /* load home/permanent world manually */
-   world_static.addon_hub = spawn;
-   world_instance_load_mdl( 0, "maps/mp_spawn/main.mdl" );
+   world_static.load_state = k_world_loader_load;
+   struct world_load_args args = {
+      .purpose = k_world_purpose_hub,
+      .reg = spawn
+   };
+   skaterift_world_load_thread( &args );
 
    vg_async_call( async_skaterift_player_start, NULL, 0 );
    vg_async_stall();