fix long standing grind bug

[carveJwlIkooP6JGAAIwe30JlM.git] / ent_skateshop.h

diff --git a/ent_skateshop.h b/ent_skateshop.h
index 7e2fcf220ac335be03bf5c9365aa61456871a21f..ceefc8bd74d08b231b225cfb52ecb65fd2c0274b 100644 (file)
--- a/ent_skateshop.h
+++ b/ent_skateshop.h
@@ -2,11 +2,14 @@
 #define ENT_SKATESHOP_H
 
 #include "world.h"
+#include "world_load.h"
 #include "player.h"
+#include "vg/vg_steam_remote_storage.h"
+#include "workshop.h"
+#include "addon.h"
 
-#define MAX_LOCAL_BOARDS 64
-#define BILL_TIN_BOARDS  1
-#define MAX_DYNAMIC_BOARDS 9
+#define SKATESHOP_BOARD_CACHE_MAX  10
+#define SKATESHOP_VIEW_SLOT_MAX    6
 
 struct{
    v3f look_target;
@@ -15,63 +18,47 @@ struct{
    int active;
    float factive;
 
-   enum skateshop_loc{
-      k_skateshop_loc_page__viewing,
-
-      k_skateshop_loc_select_use,
-      k_skateshop_loc_select_cancel,
-      k_skateshop_loc_select_upload,
-      k_skateshop_loc_page__selected,
-
-      k_skateshop_loc_page__upload,
-   }
-   interface_loc;
-
-   struct dynamic_board
-   {
-      enum dynamic_board_state{
-         k_dynamic_board_state_none,
-         k_dynamic_board_state_loaded,
-         k_dynamic_board_state_loading,
+   struct cache_board{
+      enum cache_board_state{
+         k_cache_board_state_none,
+         k_cache_board_state_loaded,
+         k_cache_board_state_load_request
       }
       state;
 
-      u32 ref_count;
-
       struct player_board board;
+      u32 reg_index;
+      addon_reg *reg_ptr;
 
-      u32 registry_id;
+      u32 ref_count;
       double last_use_time;
    }
-   *dynamic_boards;
+   *cache;
+   SDL_SpinLock sl_cache_access;
 
-   struct shop_view_slot
-   {
-      struct dynamic_board *db;
+   struct shop_view_slot{
+      struct cache_board *cache_ptr;
       float view_blend;
    }
-   shop_view_slots[6];
-
-   struct board_registry
-   {
-      int workshop;
-      u64 uid;
-
-      struct dynamic_board *dynamic;
+   shop_view_slots[ SKATESHOP_VIEW_SLOT_MAX ];
 
-      char filename[64];   /* if workshop, string version of uid. */
-      u32 filename_hash;
+   u32 selected_world_id,
+       selected_board_id,
+       pointcloud_world_id;
 
-      int ghost;
-   } 
-   *registry;
-   u32 registry_count;
+   struct {
+      const char *item_title, *item_desc;
+      u32 reg_id;
 
-   int loading;
-   float interaction_cooldown;
-
-   u32 selected_registry_id;
+      const char *world_title, *world_loc;
+      u32 world_reg;
+   }
+   render;
 }
-static global_skateshop;
+static global_skateshop={.render={.reg_id=0xffffffff,.world_reg=0xffffffff}};
+
+VG_STATIC void global_skateshop_exit(void);
+VG_STATIC void watch_cache_board( struct cache_board *ptr );
+VG_STATIC void unwatch_cache_board( struct cache_board *ptr );
 
 #endif /* ENT_SKATESHOP_H */