X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.h;h=23e43c07fb2f6196eaa2b5cfca78822ccd556431;hb=1d06671f87a9d24596fc6808d8e0db889a818750;hp=03f05441bc223937d08653ec7914d3fcb9df3c3d;hpb=fee9867cee40c393a7142178039e8bcda964e004;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_skateshop.h b/ent_skateshop.h
index 03f0544..23e43c0 100644
--- a/ent_skateshop.h
+++ b/ent_skateshop.h
@@ -8,54 +8,40 @@
 #include "workshop.h"
 #include "addon.h"
 
-#define SKATESHOP_BOARD_CACHE_MAX  10
-#define SKATESHOP_VIEW_SLOT_MAX    6
+#define SKATESHOP_VIEW_SLOT_MAX    5
 
 struct{
    v3f look_target;
-   ent_skateshop *ptr_ent;
 
-   int active;
-   float factive;
-
-   struct cache_board{
-      enum cache_board_state{
-         k_cache_board_state_none,
-         k_cache_board_state_loaded,
-         k_cache_board_state_load_request
-      }
-      state;
-
-      struct player_board board;
-      u32 reg_index;
-      addon_reg *reg_ptr;
-
-      u32 ref_count;
-      double last_use_time;
-   }
-   *cache;
-   SDL_SpinLock sl_cache_access;
+#if 0
+   ent_skateshop *ptr_ent;    /* TODO */
+   float factive;             /* TODO */
+   camera cam;
+#endif
 
    struct shop_view_slot{
-      struct cache_board *cache_ptr;
+      u16 cache_id;
       float view_blend;
    }
    shop_view_slots[ SKATESHOP_VIEW_SLOT_MAX ];
 
    u32 selected_world_id,
        selected_board_id,
+       selected_player_id,
        pointcloud_world_id;
 
    struct {
       const char *item_title, *item_desc;
       u32 reg_id;
+
+      const char *world_title, *world_loc;
+      u32 world_reg;
    }
    render;
 }
-static global_skateshop={.render={.reg_id=0xffffffff}};
+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 );
+VG_STATIC void ent_skateshop_preupdate( ent_skateshop *shop );
+VG_STATIC void skateshop_render( ent_skateshop *shop );
 
 #endif /* ENT_SKATESHOP_H */