X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=4d65145bea75c893ffb0eb4efe2702a273da8d7b;hb=fdd41609e59c7df548682b25001f0015dc1acbea;hp=5c24b79e12681a1811284109778412f2e217bc69;hpb=cb1d2f9fbec8a274aaf7a80c5fb552b928148b1e;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index 5c24b79..4d65145 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,9 +47,13 @@ #include "workshop.c" #include "addon.c" #include "highscores.c" +#include "save.c" static struct player_avatar localplayer_avatar; + +#if 0 static struct player_model localplayer_models[3]; +#endif int main( int argc, char *argv[] ) { @@ -72,6 +77,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" ); @@ -96,9 +102,11 @@ vg_info(" ' ' '--' [] '----- '----- ' ' '---' " VG_STATIC void load_playermodels(void) { +#if 0 player_model_load( &localplayer_models[0], "models/ch_new.mdl" ); player_model_load( &localplayer_models[1], "models/ch_outlaw.mdl" ); player_model_load( &localplayer_models[2], "models/ch_jordan.mdl" ); +#endif /* FIXME: hack */ shader_model_character_view_register(); @@ -107,15 +115,15 @@ VG_STATIC void load_playermodels(void) } void temp_update_playermodel(void){ +#if 0 player__use_model( &localplayer, &localplayer_models[k_playermdl_id] ); +#endif } -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) @@ -145,7 +153,9 @@ VG_STATIC void vg_load(void) player__create( &localplayer ); player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" ); player__use_avatar( &localplayer, &localplayer_avatar ); +#if 0 player__use_model( &localplayer, &localplayer_models[k_playermdl_id] ); +#endif player__bind( &localplayer ); /* --------------------- */ @@ -206,7 +216,49 @@ 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_player, + "playermodels", ".mdl" ); + 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 ); + vg_pool_watch( &addon_system.board_cache, localplayer.board_view_slot ); + } + + board_processview_thread(NULL); /* END_OP!! */ } VG_STATIC void draw_origin_axis(void)