quite a lot of changes

[carveJwlIkooP6JGAAIwe30JlM.git] / save.c

diff --git a/save.c b/save.c
index ad1b35e0414186b650596a4a094aed3e3b76c67b..40929d990d13084ea29b004d76611f0ed0aa16b6 100644 (file)
--- a/save.c
+++ b/save.c
@@ -19,6 +19,38 @@ static void skaterift_write_savedata_thread(void *_){
    skaterift_end_op();
 }
 
+static void skaterift_write_viewslot( vg_msg *msg, const char *key,
+                                      enum addon_type type, u16 cache_id ){
+   if( !cache_id ) return;
+
+   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 ){
+      if( reg->alias.workshop_id ) 
+         vg_msg_wkvu64( msg, key, reg->alias.workshop_id );
+      else
+         vg_msg_wkvstr( msg, key, reg->alias.foldername );
+   }
+}
+
+static void skaterift_read_viewslot( 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( skaterift.async_op != k_async_op_none ) return;
 
@@ -30,19 +62,10 @@ static void skaterift_write_savedata(void){
 
    vg_msg_frame( &sav, "player" );
 
-   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 );
-      }
-   }
+   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 );
    savedata.len = sav.len;