more sensible world loading stuff (wip)

[carveJwlIkooP6JGAAIwe30JlM.git] / save.c

diff --git a/save.c b/save.c
index ad1b35e0414186b650596a4a094aed3e3b76c67b..93169db81eb4c32e25cf5c7b3903163062d1d523 100644 (file)
--- a/save.c
+++ b/save.c
@@ -16,35 +16,73 @@ static void skaterift_write_savedata_thread(void *_){
       fwrite( savedata.buf, savedata.len, 1, fp );
       fclose( fp );
    }
-   skaterift_end_op();
 }
 
-static void skaterift_write_savedata(void){
-   if( skaterift.async_op != k_async_op_none ) return;
+static void skaterift_write_addon_alias( vg_msg *msg, const char *key,
+                                         addon_alias *alias ){
+   if( alias->workshop_id ) 
+      vg_msg_wkvu64( msg, key, alias->workshop_id );
+   else
+      vg_msg_wkvstr( msg, key, alias->foldername );
+}
+
+static void skaterift_write_viewslot( vg_msg *msg, const char *key,
+                                      enum addon_type type, u16 cache_id ){
+   if( !cache_id ) return;
 
-   skaterift_begin_op( k_async_op_write_savedata );
+   struct addon_cache *cache = &addon_system.cache[type];
+   addon_cache_entry *entry = vg_pool_item( &cache->pool, cache_id );
+   addon_reg *reg = entry->reg_ptr;
+
+   if( reg )
+      skaterift_write_addon_alias( msg, key, &reg->alias );
+}
+
+static void skaterift_read_addon_alias( vg_msg *msg, const char *key,
+                                        enum addon_type type, 
+                                        addon_alias *alias ){
+   
+   alias->foldername[0] = '\0';
+   alias->workshop_id = 0;
+   alias->type = type;
+
+   vg_msg_cmd kv = vg_msg_seekkv( msg, key, 0 );
+   if( kv.code == k_vg_msg_kvstring ){
+      vg_strncpy( kv.value, alias->foldername, sizeof(alias->foldername),
+                  k_strncpy_allow_cutoff );
+   }
+   else 
+      alias->workshop_id = vg_msg_read_as_u64( &kv );
+}
+
+static void skaterift_write_savedata(void){
+   if( !vg_loader_availible() ) return;
 
    vg_msg sav = {0};
    sav.buf = savedata.buf;
    sav.max = sizeof(savedata.buf);
 
    vg_msg_frame( &sav, "player" );
+   {
+      skaterift_write_viewslot( &sav, "board", k_addon_type_board, 
+                                localplayer.board_view_slot );
+      skaterift_write_viewslot( &sav, "playermodel", k_addon_type_player,
+                                localplayer.playermodel_view_slot );
+   }
+   vg_msg_end_frame( &sav );
 
-   struct addon_cache *cache = &addon_system.cache[k_workshop_file_type_board];
-
-   if( localplayer.board_view_slot ){
-      addon_cache_entry *entry = vg_pool_item( &cache->pool, 
-                                               localplayer.board_view_slot );
-
-      if( entry->reg_ptr ){
-         if( entry->reg_ptr->workshop_id ) 
-            vg_msg_wkvu64( &sav, "board", entry->reg_ptr->workshop_id );
-         else
-            vg_msg_wkvstr( &sav, "board", entry->reg_ptr->foldername );
+   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 );
+
    savedata.len = sav.len;
    vg_loader_start( skaterift_write_savedata_thread, NULL );
 }