review save method

[carveJwlIkooP6JGAAIwe30JlM.git] / save.c

diff --git a/save.c b/save.c
index 40929d990d13084ea29b004d76611f0ed0aa16b6..e31816e1d748e2692a97a7ba18d0321f1246713c 100644 (file)
--- a/save.c
+++ b/save.c
@@ -4,19 +4,36 @@
 #include "save.h"
 #include "vg/vg_msg.h"
 
-struct {
-   u8  buf[1024];
-   u32 len;
+static void savedata_write_thread( void *file ){
+   struct savedata *sav = file;
+   FILE *fp = fopen( sav->path, "wb" );
+   if( fp ){
+      fwrite( sav->buf, sav->len, 1, fp );
+      fclose( fp );
+   }
+   else {
+      vg_error( "Error writing savedata (%s)\n", sav->path );
+   }
 }
-static savedata;
 
-static void skaterift_write_savedata_thread(void *_){
-   FILE *fp = fopen( "save.bkv", "wb" );
+static void savedata_read( struct savedata *sav ){
+   FILE *fp = fopen( sav->path, "rb" );
    if( fp ){
-      fwrite( savedata.buf, savedata.len, 1, fp );
+      sav->len = fread( sav->buf, 1, sizeof(sav->buf), fp );
       fclose( fp );
    }
-   skaterift_end_op();
+   else{
+      sav->len = 0;
+      vg_error( "Error reading savedata (%s)\n", sav->path );
+   }
+}
+
+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,
@@ -27,16 +44,13 @@ static void skaterift_write_viewslot( vg_msg *msg, const char *key,
    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 );
-   }
+   if( reg )
+      skaterift_write_addon_alias( msg, key, &reg->alias );
 }
 
-static void skaterift_read_viewslot( vg_msg *msg, const char *key,
-                                     enum addon_type type, addon_alias *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;
@@ -51,33 +65,47 @@ static void skaterift_read_viewslot( vg_msg *msg, const char *key,
       alias->workshop_id = vg_msg_read_as_u64( &kv );
 }
 
-static void skaterift_write_savedata(void){
-   if( skaterift.async_op != k_async_op_none ) return;
+static void skaterift_write_main_savedata(void){
+   if( !vg_loader_availible() ) return;
 
-   skaterift_begin_op( k_async_op_write_savedata );
+   vg_linear_clear( vg_async.buffer );
+   struct savedata *sav = vg_linear_alloc( vg_async.buffer, 
+                                           vg_align8(sizeof(struct savedata)) );
 
-   vg_msg sav = {0};
-   sav.buf = savedata.buf;
-   sav.max = sizeof(savedata.buf);
+   strcpy( sav->path, "save.bkv" );
 
-   vg_msg_frame( &sav, "player" );
+   vg_msg kvsav = {0};
+   kvsav.buf = sav->buf;
+   kvsav.max = sizeof(sav->buf);
 
-   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_frame( &kvsav, "player" );
+   {
+      skaterift_write_viewslot( &kvsav, "board", k_addon_type_board, 
+                                localplayer.board_view_slot );
+      skaterift_write_viewslot( &kvsav, "playermodel", k_addon_type_player,
+                                localplayer.playermodel_view_slot );
+   }
+   vg_msg_end_frame( &kvsav );
+
+   vg_msg_frame( &kvsav, "world" );
+   {
+      addon_reg *reg = world_static.addon_client;
+      if( reg && (world_static.active_instance > 0) ){
+         skaterift_write_addon_alias( &kvsav, "alias", &reg->alias );
+         vg_msg_wkvu32( &kvsav, "index", world_static.active_instance );
+         vg_msg_wkvnum( &kvsav, "position", k_vg_msg_float|k_vg_msg_32b, 3, 
+                        localplayer.rb.co );
+      }
+   }
+   vg_msg_end_frame( &kvsav );
 
-   vg_msg_end_frame( &sav );
-   savedata.len = sav.len;
-   vg_loader_start( skaterift_write_savedata_thread, NULL );
+   sav->len = kvsav.len;
+   vg_loader_start( savedata_write_thread, sav );
 }
 
-static void skaterift_read_savedata(void){
-   FILE *fp = fopen( "save.bkv", "rb" );
-   if( fp ){
-      savedata.len = fread( savedata.buf, 1, sizeof(savedata.buf), fp );
-      fclose( fp );
-   }
+static void skaterift_read_main_savedata( struct savedata *sav ){
+   strcpy( sav->path, "save.bkv" );
+   savedata_read( sav );
 }
 
 #endif /* SAVE_C */