X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=save.c;fp=save.c;h=90e9c202cbab2732ce793d90e0ce7dca9603a3a3;hb=7e1fe6c7931ba4492aa10ac5eebc316b74fb5dac;hp=a8076c76a9f0fe3434eb7b1c55a2f07cd4d65639;hpb=f2e2b3c37719f839bc130625ee0fcf4ef3179750;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/save.c b/save.c
index a8076c7..90e9c20 100644
--- a/save.c
+++ b/save.c
@@ -80,9 +80,7 @@ static void skaterift_populate_world_savedata( savedata_file *file,
                                               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" );
@@ -127,7 +125,7 @@ static void skaterift_populate_main_savedata( savedata_file *file ){
 
    vg_msg_frame( &sav, "world" );
    {
-      addon_reg *reg = world_static.addon_client;
+      addon_reg *reg = world_static.instance_addons[ k_world_purpose_client ];
       if( reg && (world_static.active_instance > 0) ){
          skaterift_write_addon_alias( &sav, "alias", &reg->alias );
       }
@@ -145,7 +143,7 @@ static int skaterift_autosave( int async ){
       if( !vg_loader_availible() ) return 0;
 
    u32 save_files = 2;
-   if( world_static.addon_client )
+   if( world_static.instance_addons[ k_world_purpose_client ] )
       save_files ++;
 
    vg_linear_clear( vg_async.buffer );
@@ -163,9 +161,10 @@ 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.instance_addons[ k_world_purpose_client ] ){
       skaterift_populate_world_savedata( &group->files[2], 
                                           k_world_purpose_client );
+   }
 
    if( async )
       vg_loader_start( (void *)savedata_group_write, group );