network release 9

[carveJwlIkooP6JGAAIwe30JlM.git] / save.c

diff --git a/save.c b/save.c
index a8076c76a9f0fe3434eb7b1c55a2f07cd4d65639..88dfada37adfea272434b22bd19f8e6f5091346d 100644 (file)
--- a/save.c
+++ b/save.c
@@ -77,12 +77,10 @@ static void skaterift_read_addon_alias( vg_msg *msg, const char *key,
 }
 
 static void skaterift_populate_world_savedata( savedata_file *file,
-                                              enum world_purpose which ){
+                                               enum world_purpose which ){
    file->path[0] = '\0';
    file->len = 0;
-   addon_reg *reg = NULL;
-   if( which == k_world_purpose_hub ) reg = world_static.addon_hub;
-   else reg = world_static.addon_client;
+   addon_reg *reg = world_static.instance_addons[ which ];
 
    if( !reg ){
       vg_error( "Tried to save unspecified world (reg was null)\n" );
@@ -94,18 +92,17 @@ static void skaterift_populate_world_savedata( savedata_file *file,
    vg_msg sav;
    vg_msg_init( &sav, file->buf, sizeof(file->buf) );
 
-   if( which == k_world_purpose_hub ){
-      if( world_static.instances[0].status == k_world_status_loaded )
-         world_entity_serialize( &world_static.instances[0], &sav );
-   }
-   else {
-      for( u32 i=1; i<vg_list_size(world_static.instances); i++ ){
-         world_instance *instance = &world_static.instances[i];
-         if( instance->status == k_world_status_loaded ){
-            world_entity_serialize( instance, &sav );
-         }
-      }
+   world_instance *instance = &world_static.instances[which];
+   world_entity_serialize( instance, &sav );
+
+   vg_msg_frame( &sav, "player" );
+   {
+      vg_msg_wkvnum( &sav, "position", k_vg_msg_float|k_vg_msg_32b, 3, 
+                     (which == world_static.active_instance)? 
+                           localplayer.rb.co:
+                           instance->player_co );
    }
+   vg_msg_end_frame( &sav );
 
    file->len = sav.cur.co;
 }
@@ -115,6 +112,7 @@ static void skaterift_populate_main_savedata( savedata_file *file ){
 
    vg_msg sav;
    vg_msg_init( &sav, file->buf, sizeof(file->buf) );
+   vg_msg_wkvu32( &sav, "ach", skaterift.achievements );
 
    vg_msg_frame( &sav, "player" );
    {
@@ -125,18 +123,6 @@ static void skaterift_populate_main_savedata( savedata_file *file ){
    }
    vg_msg_end_frame( &sav );
 
-   vg_msg_frame( &sav, "world" );
-   {
-      addon_reg *reg = world_static.addon_client;
-      if( reg && (world_static.active_instance > 0) ){
-         skaterift_write_addon_alias( &sav, "alias", &reg->alias );
-      }
-      vg_msg_wkvu32( &sav, "index", world_static.active_instance );
-      vg_msg_wkvnum( &sav, "position", k_vg_msg_float|k_vg_msg_32b, 3, 
-                     localplayer.rb.co );
-   }
-   vg_msg_end_frame( &sav );
-
    file->len = sav.cur.co;
 }
 
@@ -145,8 +131,10 @@ static int skaterift_autosave( int async ){
       if( !vg_loader_availible() ) return 0;
 
    u32 save_files = 2;
-   if( world_static.addon_client )
+   if( world_static.instances[k_world_purpose_client].status 
+         == k_world_status_loaded ){
       save_files ++;
+   }
 
    vg_linear_clear( vg_async.buffer );
    u32 size = sizeof(savedata_group) + sizeof(savedata_file) * save_files;
@@ -163,9 +151,11 @@ static int skaterift_autosave( int async ){
    skaterift_populate_main_savedata( &group->files[0] );
    skaterift_populate_world_savedata( &group->files[1], k_world_purpose_hub );
 
-   if( world_static.addon_client )
+   if( world_static.instances[ k_world_purpose_client ].status 
+         == k_world_status_loaded ){
       skaterift_populate_world_savedata( &group->files[2], 
                                           k_world_purpose_client );
+   }
 
    if( async )
       vg_loader_start( (void *)savedata_group_write, group );