more refactors..

[carveJwlIkooP6JGAAIwe30JlM.git] / ent_skateshop.h

diff --git a/ent_skateshop.h b/ent_skateshop.h
index 03f05441bc223937d08653ec7914d3fcb9df3c3d..ff52db0f1380530b4d0c9f6d2c86622dbddf35c7 100644 (file)
--- a/ent_skateshop.h
+++ b/ent_skateshop.h
@@ -8,7 +8,6 @@
 #include "workshop.h"
 #include "addon.h"
 
-#define SKATESHOP_BOARD_CACHE_MAX  10
 #define SKATESHOP_VIEW_SLOT_MAX    6
 
 struct{
@@ -18,24 +17,6 @@ struct{
    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;
-
    struct shop_view_slot{
       struct cache_board *cache_ptr;
       float view_blend;
@@ -49,13 +30,14 @@ struct{
    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 );
 
 #endif /* ENT_SKATESHOP_H */