X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=save.c;h=73eaa499d6d921f1266ad42adff23710008e3b9b;hb=8d336ea2cde7c596296dbaf0d3ce27a82c6c6cf0;hp=a8076c76a9f0fe3434eb7b1c55a2f07cd4d65639;hpb=6b036c10d38e7d691eb0bc06c29235b450c3ff10;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/save.c b/save.c index a8076c7..73eaa49 100644 --- a/save.c +++ b/save.c @@ -1,13 +1,17 @@ -#ifndef SAVE_C -#define SAVE_C - +#include "skaterift.h" #include "save.h" #include "addon.h" #include "vg/vg_msg.h" #include "vg/vg_log.h" +#include "vg/vg_loader.h" #include "world.h" +#include "player.h" + +static const char *str_skaterift_main_save = "save.bkv"; +static f64 last_autosave; -static void savedata_file_write( savedata_file *file ){ +void savedata_file_write( savedata_file *file ) +{ savedata_file *sav = file; FILE *fp = fopen( sav->path, "wb" ); if( fp ){ @@ -20,13 +24,15 @@ static void savedata_file_write( savedata_file *file ){ } } -static void savedata_group_write( savedata_group *group ){ +void savedata_group_write( savedata_group *group ) +{ for( u32 i=0; ifile_count; i++ ){ savedata_file_write( &group->files[i] ); } } -static void savedata_file_read( savedata_file *file ){ +void savedata_file_read( savedata_file *file ) +{ FILE *fp = fopen( file->path, "rb" ); if( fp ){ file->len = fread( file->buf, 1, sizeof(file->buf), fp ); @@ -41,7 +47,7 @@ static void savedata_file_read( savedata_file *file ){ 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 ); + vg_msg_wkvnum( msg, key, k_vg_msg_u64, 1, &alias->workshop_id ); else vg_msg_wkvstr( msg, key, alias->foldername ); } @@ -58,9 +64,10 @@ static void skaterift_write_viewslot( vg_msg *msg, const char *key, skaterift_write_addon_alias( msg, key, ®->alias ); } -static void skaterift_read_addon_alias( vg_msg *msg, const char *key, - enum addon_type type, - addon_alias *alias ){ +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; @@ -77,12 +84,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,27 +99,28 @@ 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; istatus == 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; } -static void skaterift_populate_main_savedata( savedata_file *file ){ +static void skaterift_populate_main_savedata( savedata_file *file ) +{ strcpy( file->path, str_skaterift_main_save ); vg_msg sav; vg_msg_init( &sav, file->buf, sizeof(file->buf) ); + vg_msg_wkvnum( &sav, "ach", k_vg_msg_u32, 1, &skaterift.achievements ); vg_msg_frame( &sav, "player" ); { @@ -125,28 +131,25 @@ 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", ®->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; } -static int skaterift_autosave( int async ){ +void skaterift_read_main_savedata( savedata_file *file ) +{ + strcpy( file->path, str_skaterift_main_save ); + savedata_file_read( file ); +} + +int skaterift_autosave( int async ) +{ if( 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 +166,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 ); @@ -175,8 +180,16 @@ static int skaterift_autosave( int async ){ return 1; } -static void skaterift_autosave_synchronous(void){ +void skaterift_autosave_synchronous(void) +{ skaterift_autosave(0); } -#endif /* SAVE_C */ +void skaterift_autosave_update(void) +{ + if( vg.time - last_autosave > 20.0 ){ + if( skaterift_autosave(1) ){ + last_autosave = vg.time; + } + } +}