X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=91947fbe2893dc3ecf55741270ec0ff5a366e902;hb=f0677217ae486c01f0aba78aa5053e2a6273e4cc;hp=7898f5877d33d7fe185c70a0124d915a0d69963f;hpb=7b1e8a237acc3121c86fab9b5946da6a8d3bf6c4;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 7898f58..91947fb 100644
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -14,6 +14,7 @@
 #include "highscores.h"
 #include "steam.h"
 #include "addon.h"
+#include "save.h"
 
 /*
  * Checks string equality but does a hash check first
@@ -145,12 +146,13 @@ VG_STATIC void workshop_visibile_load_loop(void)
 
          /* continue with the request */
          SDL_AtomicUnlock( &global_skateshop.sl_cache_access );
-         cache_ptr->reg_ptr = get_addon_from_index( k_workshop_file_type_board,
-                                                    cache_ptr->reg_index );
+         addon_reg *reg = get_addon_from_index( k_workshop_file_type_board,
+                                                cache_ptr->reg_index );
+         cache_ptr->reg_ptr = reg;
 
          vg_str folder;
          vg_strnull( &folder, path_buf, 4096 );
-         if( !addon_get_content_folder( cache_ptr->reg_ptr, &folder ) )
+         if( !addon_get_content_folder( reg, &folder ) )
             goto file_is_broken;
 
 
@@ -159,9 +161,11 @@ VG_STATIC void workshop_visibile_load_loop(void)
 
          vg_str content_path = folder;
 
-         vg_msg root;
-         vg_msg_init( &root, cache_ptr->reg_ptr->metadata, 
-                      cache_ptr->reg_ptr->metadata_len );
+
+         vg_msg root = {0};
+         root.buf = reg->metadata;
+         root.len = reg->metadata_len;
+         root.max = sizeof(reg->metadata);
 
          const char *kv_content = vg_msg_seekkvstr( &root, "content", 0 );
          if( kv_content ){
@@ -300,14 +304,12 @@ VG_STATIC struct cache_board *skateshop_selected_cache_if_loaded(void)
 VG_STATIC void pointcloud_async_end(void *_, u32 __)
 {
    pointcloud_animate( k_pointcloud_anim_opening );
-   skaterift_end_op();
 }
 
 VG_STATIC void pointcloud_clear_async(void *_, u32 __)
 {
    pointcloud.count = 0;
    pointcloud_animate( k_pointcloud_anim_opening );
-   skaterift_end_op();
 }
 
 VG_STATIC void skateshop_preview_loader_thread( void *_data )
@@ -348,10 +350,15 @@ VG_STATIC void skateshop_preview_loader_thread( void *_data )
    }
 }
 
+VG_STATIC void skateshop_preview_loader_thread_and_end( void *_data ){
+   skateshop_preview_loader_thread( _data );
+   skaterift_end_op();
+}
+
 VG_STATIC void skateshop_load_world_preview( addon_reg *reg )
 {
    skaterift_begin_op( k_async_op_world_load_preview );
-   vg_loader_start( skateshop_preview_loader_thread, reg );
+   vg_loader_start( skateshop_preview_loader_thread_and_end, reg );
 }
 
 /*
@@ -450,6 +457,7 @@ VG_STATIC void global_skateshop_preupdate(void)
          localplayer.board_view_slot = selected_cache;
          watch_cache_board( localplayer.board_view_slot );
          global_skateshop_exit();
+         skaterift_write_savedata();
          return;
       }
    }
@@ -459,21 +467,21 @@ VG_STATIC void global_skateshop_preupdate(void)
       gui_helper_action( button_display_string( k_srbind_maccept ), "pick" );
 
       if( button_down( k_srbind_mleft ) ){
-         if( cl_playermdl_id > 0 ){
-            cl_playermdl_id --;
+         if( k_playermdl_id > 0 ){
+            k_playermdl_id --;
          }
          else{
-            cl_playermdl_id = 2; /* HACK */
+            k_playermdl_id = 2; /* HACK */
          }
          temp_update_playermodel(); /* HACK */
       }
 
       if( button_down( k_srbind_mright ) ){
-         if( cl_playermdl_id+1 < 3 ){
-            cl_playermdl_id ++;
+         if( k_playermdl_id+1 < 3 ){
+            k_playermdl_id ++;
          }
          else{
-            cl_playermdl_id = 0;  /* HACK */
+            k_playermdl_id = 0;  /* HACK */
          }
          temp_update_playermodel(); /* HACK */
          /*lol*/
@@ -686,8 +694,10 @@ fade_out:;
       global_skateshop.render.item_title = "";
       global_skateshop.render.item_desc = "";
       addon_reg *reg = cache_ptr->reg_ptr;
-      vg_msg root;
-      vg_msg_init( &root, reg->metadata, reg->metadata_len );
+      vg_msg root = {0};
+      root.buf = reg->metadata;
+      root.len = reg->metadata_len;
+      root.max = sizeof(reg->metadata);
 
       vg_msg workshop = root;
       if( vg_msg_seekframe( &workshop, "workshop", 0 ) ){
@@ -749,8 +759,10 @@ VG_STATIC void skateshop_render_worldshop(void)
 
       addon_reg *reg = get_addon_from_index( k_workshop_file_type_world,
                                        global_skateshop.selected_world_id );
-      vg_msg root;
-      vg_msg_init( &root, reg->metadata, reg->metadata_len );
+      vg_msg root = {0};
+      root.buf = reg->metadata;
+      root.len = reg->metadata_len;
+      root.max = sizeof(reg->metadata);
       vg_msg workshop = root;
       if( vg_msg_seekframe( &workshop, "workshop", 0 ) ){
          global_skateshop.render.world_title = vg_msg_seekkvstr( &workshop,