From dbdb031ee290892468d24b6dd576fe62c47e778a Mon Sep 17 00:00:00 2001 From: hgn Date: Sun, 11 Jun 2023 21:10:27 +0100 Subject: [PATCH] savedata start --- addon.c | 30 +++++++++++++++++++++++++++++- ent_skateshop.c | 11 ++++++++--- save.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ save.h | 3 +++ skaterift.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 5 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 save.c diff --git a/addon.c b/addon.c index fde9f9d..b599c30 100644 --- a/addon.c +++ b/addon.c @@ -42,6 +42,34 @@ static u32 get_index_from_addon( enum workshop_file_type type, addon_reg *a ){ return 0xffffffff; } +static u32 addon_match( enum workshop_file_type type, + u64 workshop_id, const char *foldername ){ + u32 foldername_djb2 = vg_strdjb2( foldername ); + + u32 count = 0; + for( u32 i=0; counttype == type ){ + + if( workshop_id ){ + if( workshop_id == reg->workshop_id ) + return count; + } + else{ + if( reg->foldername_hash == foldername_djb2 ){ + if( !strcmp( reg->foldername, foldername ) ){ + return count; + } + } + } + + count ++; + } + } + + return 0xffffffff; +} + static void addon_system_init( void ){ u32 reg_size = sizeof(addon_reg)*ADDON_MOUNTED_MAX; addon_system.registry = vg_linear_alloc( vg_mem.rtmemory, reg_size ); @@ -189,7 +217,7 @@ VG_STATIC addon_reg *addon_mount_local_addon( const char *folder, vg_strnull( &folder_path, folder_path_buf, 4096 ); vg_strcat( &folder_path, folder ); - const char *folder_name = vg_strch( &folder_path, '/' ); + const char *folder_name = vg_strch( &folder_path, '/' )+1; u32 folder_hash = vg_strdjb2(folder_name); for( u32 i=0; ireg_ptr ){ + if( cache_ptr->reg_ptr->workshop_id ) + vg_msg_wkvu64( &sav, "board", cache_ptr->reg_ptr->workshop_id ); + else + vg_msg_wkvstr( &sav, "board", cache_ptr->reg_ptr->foldername ); + } + } + + vg_msg_end_frame( &sav ); + savedata.len = sav.len; + + FILE *fp = fopen( "save.bkv", "wb" ); + if( fp ){ + fwrite( savedata.buf, sav.len, 1, fp ); + fclose( fp ); + } +} + +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 ); + } +} + +#endif /* SAVE_C */ diff --git a/save.h b/save.h index 945b729..bffbcd5 100644 --- a/save.h +++ b/save.h @@ -1,6 +1,9 @@ #ifndef SAVE_H #define SAVE_H +#include "ent_skateshop.h" +static void skaterift_write_savedata(void); +static void skaterift_read_savedata(void); #endif /* SAVE_H */ diff --git a/skaterift.c b/skaterift.c index 5c24b79..e510a1f 100644 --- a/skaterift.c +++ b/skaterift.c @@ -35,6 +35,7 @@ #include "menu.h" #include "vehicle.h" #include "pointcloud.h" +#include "save.h" /* unity build * ----------------- */ @@ -46,6 +47,7 @@ #include "workshop.c" #include "addon.c" #include "highscores.c" +#include "save.c" static struct player_avatar localplayer_avatar; static struct player_model localplayer_models[3]; @@ -72,6 +74,7 @@ VG_STATIC void vg_launch_opt(void) VG_STATIC void vg_preload(void) { conf_init(); + skaterift_read_savedata(); vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" ); @@ -110,12 +113,10 @@ void temp_update_playermodel(void){ player__use_model( &localplayer, &localplayer_models[k_playermdl_id] ); } -VG_STATIC void async_skaterift_complete( void *payload, u32 size ) +VG_STATIC void async_skaterift_player_start( void *payload, u32 size ) { localplayer.viewable_world = world_current_instance(); localplayer_cmd_respawn( 1, (const char *[]){ "start" } ); - - skaterift_end_op(); } VG_STATIC void vg_load(void) @@ -206,7 +207,47 @@ VG_STATIC void vg_load(void) temp_update_playermodel(); //vg_mem_log( vg_mem.rtmemory, 0, "Root" ); - vg_async_call( async_skaterift_complete, NULL, 0 ); + + vg_async_call( async_skaterift_player_start, NULL, 0 ); + + skaterift_shift_op( k_async_op_board_scan ); + addon_mount_content_folder( k_workshop_file_type_board, "boards", ".mdl" ); + addon_mount_workshop_items(); + vg_async_call( async_addon_reg_update, NULL, 0 ); + vg_async_stall(); + + /* and now */ + + vg_msg sav = {0}; + sav.buf = savedata.buf; + sav.len = savedata.len; + sav.max = sizeof(savedata.buf); + + u64 query_workshop_id = 0; + const char *query_local_folder = ""; + + if( vg_msg_seekframe(&sav, "player",0) ){ + vg_msg_print( &sav ); + vg_msg_cmd board = vg_msg_seekkv( &sav, "board", 0 ); + if( board.code == k_vg_msg_kvstring ) + query_local_folder = board.value; + else + query_workshop_id = vg_msg_read_as_u64( &board ); + } + else{ + vg_error( "%u\n", sav.error ); + } + + vg_info( "search: %lu '%s'\n", query_workshop_id, query_local_folder ); + + u32 reg_id = addon_match( k_workshop_file_type_board, + query_workshop_id, query_local_folder ); + if( reg_id != 0xffffffff ){ + localplayer.board_view_slot = skateshop_cache_fetch_board( reg_id ); + watch_cache_board( localplayer.board_view_slot ); + } + + board_processview_thread(NULL); /* END_OP!! */ } VG_STATIC void draw_origin_axis(void) -- 2.25.1