diff --git a/engine/EC/components.h b/engine/EC/components.h index cd4dec7..e630444 100644 --- a/engine/EC/components.h +++ b/engine/EC/components.h @@ -4,7 +4,7 @@ #include // TODO: Look at sc to use macros to auto generate functions -#define N_COMPONENTS 9 +#define N_COMPONENTS 7 enum ComponentEnum { CBBOX_COMP_T, @@ -14,8 +14,6 @@ enum ComponentEnum CJUMP_COMP_T, CPLAYERSTATE_T, CCONTAINER_T, - CSELECTABLE_T, - CSELECTION_T, }; typedef enum ComponentEnum ComponentEnum_t; @@ -97,22 +95,6 @@ typedef struct _CContainer_t ContainerItem_t item; }CContainer_t; -typedef struct _CSelection_t -{ - uint8_t max_choices; - uint8_t curr_choice; - void * data_arr; - unsigned int elem_size; -}CSelection_t; - -typedef struct _CSelectable_t CSelectable_t; -typedef void(*selected_callback_t)(CSelectable_t *); - -struct _CSelectable_t -{ - selected_callback_t callback; -}; - static inline void set_bbox(CBBox_t* p_bbox, unsigned int x, unsigned int y) { p_bbox->size.x = x; diff --git a/engine/EC/mempool.c b/engine/EC/mempool.c index fdfec19..9c573a5 100644 --- a/engine/EC/mempool.c +++ b/engine/EC/mempool.c @@ -11,8 +11,6 @@ static CMovementState_t cmstate_buffer[MAX_COMP_POOL_SIZE]; static CJump_t cjump_buffer[1]; // Only player is expected to have this static CPlayerState_t cplayerstate_buffer[1]; // Only player is expected to have this static CContainer_t ccontainer_buffer[MAX_COMP_POOL_SIZE]; -static CSelectable_t cselectable_buffer[32]; -static CSelection_t cselection_buffer[32]; // Use hashmap as a Set // Use list will be used to check if an object exist @@ -39,8 +37,6 @@ static MemPool_t comp_mempools[N_COMPONENTS] = {cjump_buffer, 1, sizeof(CJump_t), NULL, {0}}, {cplayerstate_buffer, 1, sizeof(CPlayerState_t), NULL, {0}}, {ccontainer_buffer, MAX_COMP_POOL_SIZE, sizeof(CContainer_t), NULL, {0}}, - {cselectable_buffer, 32, sizeof(CSelectable_t), NULL, {0}}, - {cselection_buffer, 32, sizeof(CSelection_t), NULL, {0}}, }; static MemPool_t ent_mempool = {entity_buffer, MAX_COMP_POOL_SIZE, sizeof(Entity_t), NULL, {0}};