X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=d8d91078357af8a8db70af7190cd7b991841d848;hb=960d442e442efab5e1dff05ad3d6613bf228dd71;hp=8983f23f26cacb78fa0063c2306117a34320c86f;hpb=cbeec2e44e93ab43ccde54c2dd9cd02f559ebef8;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 8983f23..d8d9107 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -21,7 +21,6 @@
  * --------------------- */
 
 #include "skaterift.h"
-#include "conf.h"
 #include "steam.h"
 #include "render.h"
 #include "audio.h"
@@ -51,10 +50,6 @@
 
 static struct player_avatar localplayer_avatar;
 
-#if 0
-static struct player_model  localplayer_models[3];
-#endif
-
 int main( int argc, char *argv[] )
 {
    vg_mem.use_libc_malloc = 0;
@@ -63,20 +58,12 @@ int main( int argc, char *argv[] )
    return 0;
 }
 
-#if 0
-VG_STATIC void highscores_save_at_exit(void)
-{
-   highscores_serialize_all();
-}
-#endif
-
 VG_STATIC void vg_launch_opt(void)
 {
 }
 
 VG_STATIC void vg_preload(void)
 {
-   conf_init();
    skaterift_read_savedata();
 
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
@@ -87,14 +74,6 @@ vg_info("            |   \\/   | |        /     |      |    \\ | /   | \n" );
 vg_info("            '        ' '--' [] '----- '----- '     ' '---'  " 
         "SOFTWARE\n" );
 
-   /* 31.05.23 (hgn): this is only a server feature now */
-#if 0
-   highscores_init( 2000, 50 );
-   if( !highscores_read() )
-      highscores_create_db();
-   vg_loader_step( NULL, highscores_save_at_exit );
-#endif
-
    steam_init();
    vg_loader_step( NULL, steam_end );
    vg_loader_step( network_init, network_end );
@@ -102,30 +81,75 @@ 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();
    shader_model_board_view_register();
    shader_model_entity_register();
 }
 
-void temp_update_playermodel(void){
-#if 0
-   player__use_model( &localplayer, &localplayer_models[k_playermdl_id] );
-#endif
-}
-
-VG_STATIC void async_skaterift_player_start( 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" } );
 }
 
+static void async_call_ready( void *payload, u32 size ){
+   skaterift.op = k_async_op_none;
+}
+
+static void skaterift_restore_state(void){
+   vg_msg sav = {0};
+   sav.buf = savedata.buf;
+   sav.len = savedata.len;
+   sav.max = sizeof(savedata.buf);
+
+   vg_msg player = sav;
+   if( vg_msg_seekframe( &player, "player", 0 ) ){
+      addon_alias q;
+
+      /* board */
+      skaterift_read_addon_alias( &player, "board", k_addon_type_board, &q );
+      u32 reg_id = addon_match( &q );
+      if( reg_id != 0xffffffff ){
+         localplayer.board_view_slot = 
+            addon_cache_create_viewer( k_addon_type_board, reg_id );
+      }
+
+      /* playermodel */
+      skaterift_read_addon_alias( &player, "playermodel", 
+                                  k_addon_type_player, &q );
+      reg_id = addon_match( &q );
+
+      if( reg_id == 0xffffffff ) reg_id = 0;
+      localplayer.playermodel_view_slot = 
+         addon_cache_create_viewer( k_addon_type_player, reg_id );
+   }
+
+   vg_msg world = sav;
+   if( vg_msg_seekframe( &world, "world", 0 ) ){
+      addon_alias q;
+
+      /* world */
+      skaterift_read_addon_alias( &world, "alias", k_addon_type_world, &q );
+      u32 reg_id = addon_match( &q );
+      if( reg_id != 0xffffffff ){
+         addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
+
+         world_loader.generate_point_cloud = 0;
+         world_loader.reg = reg;
+         world_loader.state = k_world_loader_load;
+         skaterift_world_changer_thread(NULL);
+
+         world_static.active_world = vg_msg_seekkvu32( &world, "index", 0 );
+         world_static.active_trigger_volume_count = 0;
+         localplayer.viewable_world = world_current_instance();
+
+         vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
+         vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3,
+                             localplayer.rb.co );
+      }
+   }
+}
+
 VG_STATIC void vg_load(void)
 {
    vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL );
@@ -151,11 +175,9 @@ VG_STATIC void vg_load(void)
   
    /* player setup */
    player__create( &localplayer );
-   player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" );
+   player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" );
    player__use_avatar( &localplayer, &localplayer_avatar );
-#if 0
-   player__use_model( &localplayer, &localplayer_models[k_playermdl_id] );
-#endif
+   player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
    player__bind( &localplayer );
 
    /* --------------------- */
@@ -172,13 +194,16 @@ VG_STATIC void vg_load(void)
    world_loader.world_index = 0;
    world_load_mdl( "maps/mp_spawn/main.mdl" );
 
+   vg_async_call( async_skaterift_player_start, NULL, 0 );
+   vg_async_stall();
+
    /* Completing addon registrations
     * -------------------------------------
     */
 
    /* understate diy. */
    addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn", 
-                                                k_workshop_file_type_world, 
+                                                k_addon_type_world, 
                                                 ".mdl" );
    {
       vg_msg msg = {0};
@@ -193,7 +218,7 @@ VG_STATIC void vg_load(void)
 
    /* mtzero island */
    addon_reg *mtzero = addon_mount_local_addon( "maps/mp_mtzero",
-                                                k_workshop_file_type_world,
+                                                k_addon_type_world,
                                                 ".mdl" );
    {
       vg_msg msg = {0};
@@ -208,58 +233,25 @@ VG_STATIC void vg_load(void)
 
    global_skateshop.selected_world_id=1;
    global_skateshop.pointcloud_world_id=1;
-   skateshop_preview_loader_thread( mtzero ); /* HACK */
+   skateshop_world_preview_loader_thread( mtzero ); /* HACK */
 
-   vg_async_call( async_addon_reg_update, NULL, 0 );
    vg_console_load_autos();
    menu_link();
-   temp_update_playermodel();
-
-	//vg_mem_log( vg_mem.rtmemory, 0, "Root" );
-   
-   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, 
+   addon_mount_content_folder( k_addon_type_player, 
                                "playermodels", ".mdl" );
-   addon_mount_content_folder( k_workshop_file_type_board, "boards", ".mdl" );
+   addon_mount_content_folder( k_addon_type_board, "boards", ".mdl" );
+   addon_mount_content_folder( k_addon_type_world, "maps", ".mdl" );
    addon_mount_workshop_items();
    vg_async_call( async_addon_reg_update, NULL, 0 );
    vg_async_stall();
 
    /* and now */
+   skaterift_restore_state();
+   vg_loader_step( NULL, skaterift_write_savedata );
 
-   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 );
-   }
-
-#if 0
-   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 );
-   }
-#endif
-
-   board_processview_thread(NULL); /* END_OP!! */
+   board_processview_thread(NULL);
+   vg_async_call( async_call_ready, NULL, 0 );
 }
 
 VG_STATIC void draw_origin_axis(void)
@@ -274,8 +266,9 @@ VG_STATIC void vg_update(void)
 {
    steam_update();
    skaterift_preupdate_inputs();
-   if( skaterift.async_op == k_async_op_clientloading ) return;
-   if( skaterift.async_op == k_async_op_world_preloading ){
+   if( skaterift.op == k_async_op_clientloading ) return;
+
+   if( world_loader.state == k_world_loader_preload ){
       skaterift_change_world_preupdate();
    }
 
@@ -292,7 +285,7 @@ VG_STATIC void vg_update(void)
 
 VG_STATIC void vg_update_fixed(void)
 {
-   if( skaterift.async_op == k_async_op_clientloading ) return;
+   if( skaterift.op == k_async_op_clientloading ) return;
 
    world_routes_fixedupdate( world_current_instance() );
    player__update( &localplayer );
@@ -301,7 +294,7 @@ VG_STATIC void vg_update_fixed(void)
 
 VG_STATIC void vg_update_post(void)
 {
-   if( skaterift.async_op == k_async_op_clientloading ) return;
+   if( skaterift.op == k_async_op_clientloading ) return;
 
    player__post_update( &localplayer );
 
@@ -475,7 +468,7 @@ VG_STATIC void render_main_game(void)
 
 VG_STATIC void vg_render(void)
 {
-   if( skaterift.async_op == k_async_op_clientloading ){
+   if( skaterift.op == k_async_op_clientloading ){
       _vg_loader_render();
       return;
    }
@@ -503,7 +496,7 @@ VG_STATIC void vg_render(void)
 
 VG_STATIC void vg_gui(void)
 {
-   if( skaterift.async_op == k_async_op_clientloading ) return;
+   if( skaterift.op == k_async_op_clientloading ) return;
 
    menu_update();
    if( menu.active ){