projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getting stuff working on windows again
[carveJwlIkooP6JGAAIwe30JlM.git]
/
ent_skateshop.h
diff --git
a/ent_skateshop.h
b/ent_skateshop.h
index 3b432c168a506a8bbc9df9f6557998de2ab3c39b..ff11e62f84ff863230358d2eb0fe294b8e68a6c9 100644
(file)
--- a/
ent_skateshop.h
+++ b/
ent_skateshop.h
@@
-6,12
+6,10
@@
#include "player.h"
#include "vg/vg_steam_remote_storage.h"
#include "workshop.h"
#include "player.h"
#include "vg/vg_steam_remote_storage.h"
#include "workshop.h"
+#include "addon.h"
-#define SKATESHOP_REGISTRY_MAX 64
#define SKATESHOP_BOARD_CACHE_MAX 10
#define SKATESHOP_BOARD_CACHE_MAX 10
-#define SKATESHOP_WORLDS_MAX 32
#define SKATESHOP_VIEW_SLOT_MAX 6
#define SKATESHOP_VIEW_SLOT_MAX 6
-#define SKATESHOP_REGISTRYID_NONE 0xffffffff
struct{
v3f look_target;
struct{
v3f look_target;
@@
-29,7
+27,8
@@
struct{
state;
struct player_board board;
state;
struct player_board board;
- u32 registry_id;
+ u32 reg_index;
+ addon_reg *reg_ptr;
u32 ref_count;
double last_use_time;
u32 ref_count;
double last_use_time;
@@
-43,6
+42,7
@@
struct{
}
shop_view_slots[ SKATESHOP_VIEW_SLOT_MAX ];
}
shop_view_slots[ SKATESHOP_VIEW_SLOT_MAX ];
+#if 0
struct registry_board{
PublishedFileId_t workshop_id;
struct registry_board{
PublishedFileId_t workshop_id;
@@
-64,8
+64,6
@@
struct{
u32 t1_registry_count,
registry_count;
u32 t1_registry_count,
registry_count;
- u32 selected_registry_id;
-
/* worlds */
struct registry_world{
PublishedFileId_t workshop_id;
/* worlds */
struct registry_world{
PublishedFileId_t workshop_id;
@@
-81,8
+79,10
@@
struct{
}
*world_registry;
u32 t1_world_registry_count,
}
*world_registry;
u32 t1_world_registry_count,
- world_registry_count,
- selected_world_id,
+ world_registry_count;
+#endif
+ u32 selected_world_id,
+ selected_board_id,
pointcloud_world_id;
}
static global_skateshop;
pointcloud_world_id;
}
static global_skateshop;