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

diff --git a/skaterift.c b/skaterift.c
index 3e3af23..25957d5 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -13,7 +13,7 @@
 
 #if 1
 
-//#define SR_NETWORKED
+#define SR_NETWORKED
 
 #ifndef VG_RELEASE
  #define VG_DEVWINDOW
@@ -63,7 +63,7 @@ int main( int argc, char *argv[] ){
 VG_STATIC void vg_launch_opt(void){}
 
 VG_STATIC void vg_preload(void){
-   skaterift_read_savedata();
+   //skaterift_read_savedata();
 
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
 vg_info(" 2021-2023  |\\      /| |           /  |      |    | |    /| \n" );
@@ -95,12 +95,14 @@ static void async_call_ready( void *payload, u32 size ){
 }
 
 static void skaterift_restore_state(void){
-   vg_msg sav = {0};
-   sav.buf = savedata.buf;
-   sav.len = savedata.len;
-   sav.max = sizeof(savedata.buf);
-
-   vg_msg player = sav;
+   struct savedata sav;
+   skaterift_read_main_savedata( &sav );
+   vg_msg kvsav = {0};
+   kvsav.buf = sav.buf;
+   kvsav.len = sav.len;
+   kvsav.max = sizeof(sav.buf);
+
+   vg_msg player = kvsav;
    if( vg_msg_seekframe( &player, "player", 0 ) ){
       addon_alias q;
 
@@ -122,7 +124,7 @@ static void skaterift_restore_state(void){
          addon_cache_create_viewer( k_addon_type_player, reg_id );
    }
 
-   vg_msg world = sav;
+   vg_msg world = kvsav;
    if( vg_msg_seekframe( &world, "world", 0 ) ){
       addon_alias q;
 
@@ -132,12 +134,11 @@ static void skaterift_restore_state(void){
       if( reg_id != 0xffffffff ){
          addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
 
-         world_loader.generate_point_cloud = 0;
-         world_loader.reg = reg;
-         world_loader.state = k_world_loader_load;
-         skaterift_world_changer_thread(NULL);
+         world_static.addon_client = reg;
+         world_static.load_state = k_world_loader_load;
+         skaterift_client_world_changer_thread(NULL);
 
-         world_static.active_world = vg_msg_seekkvu32( &world, "index", 0 );
+         world_static.active_instance = vg_msg_seekkvu32( &world, "index", 0 );
          world_static.active_trigger_volume_count = 0;
          localplayer.viewable_world = world_current_instance();
 
@@ -189,16 +190,6 @@ VG_STATIC void vg_load(void){
    vg_loader_step( audio_init, audio_free );
 
    /* 'systems' are completely loaded now */
-   
-   /* load home/permanent world manually */
-   world_loader.reg = NULL;
-   strcpy( world_loader.override_name, "mp_spawn" );
-   world_loader.generate_point_cloud = 1;
-   world_loader.world_index = 0;
-   world_load_mdl( "maps/mp_spawn/main.mdl" );
-
-   vg_async_call( async_skaterift_player_start, NULL, 0 );
-   vg_async_stall();
 
    /* Completing addon registrations
     * -------------------------------------
@@ -234,6 +225,14 @@ VG_STATIC void vg_load(void){
       mtzero->metadata_len = msg.cur;
    }
 
+   /* load home/permanent world manually */
+   world_static.addon_hub = spawn;
+   world_instance_load_mdl( 0, "maps/mp_spawn/main.mdl" );
+
+   vg_async_call( async_skaterift_player_start, NULL, 0 );
+   vg_async_stall();
+
+
    global_skateshop.selected_world_id=1;
    global_skateshop.pointcloud_world_id=1;
    skateshop_world_preview_loader_thread( mtzero ); /* HACK */
@@ -251,7 +250,7 @@ VG_STATIC void vg_load(void){
 
    /* and now */
    skaterift_restore_state();
-   vg_loader_step( NULL, skaterift_write_savedata );
+   vg_loader_step( NULL, skaterift_write_main_savedata );
 
    board_processview_thread(NULL);
    vg_async_call( async_call_ready, NULL, 0 );
@@ -262,7 +261,7 @@ VG_STATIC void draw_origin_axis(void){
    vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 1.0f, 0.0f }, 0xff00ff00 );
    vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff );
 }
-static void skaterift_change_world_preupdate(void);
+static void skaterift_change_client_world_preupdate(void);
 
 /* 
  * UPDATE LOOP
@@ -274,8 +273,8 @@ VG_STATIC void vg_pre_update(void){
    steam_update();
    skaterift_preupdate_inputs();
    if( skaterift.op == k_async_op_clientloading ) return;
-   if( world_loader.state == k_world_loader_preload )
-      skaterift_change_world_preupdate();
+   if( world_static.load_state == k_world_loader_preload )
+      skaterift_change_client_world_preupdate();
 
    draw_origin_axis();
    network_update();
@@ -429,9 +428,9 @@ VG_STATIC void render_scene(void){
       return;
    }
 
-   for( u32 i=0; i<vg_list_size(world_static.worlds); i++ ){
-      if( world_static.worlds[i].status == k_world_status_loaded ){
-         world_prerender( &world_static.worlds[i] );
+   for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
+      if( world_static.instances[i].status == k_world_status_loaded ){
+         world_prerender( &world_static.instances[i] );
       }
    }