EliasFleckenstein03
/
dungeon_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add inventory_find

master
Elias Fleckenstein 2021-06-14 11:17:53 +02:00
parent a084f521e9
commit eaa7e66f3c
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/inventory/inventory.c
View File

@ -75,8 +75,10 @@ bool inventory_remove(struct inventory *self, struct itemstack *stack)
*/
static void decrease_item_count(struct list **ptr, struct itemstack *stack)
static void decrease_item_count(struct list **ptr)
{
struct itemstack *stack = (*ptr)->element;
stack->count--;
if (stack->count == 0) {
@ -95,21 +97,36 @@ static void decrease_item_count(struct list **ptr, struct itemstack *stack)
}
}
bool inventory_remove(struct inventory *self, struct item *item)
static struct list **find_item(struct inventory *self, struct item *item)
{
for (struct list **ptr = &self->stacks; *ptr != NULL; ptr = &(*ptr)->next) {
struct itemstack *stack = (*ptr)->element;
if (stack->item == item) {
decrease_item_count(ptr, stack);
if (stack->item == item)
return ptr;
}
return true;
}
return NULL;
}
bool inventory_remove(struct inventory *self, struct item *item)
{
struct list **ptr = find_item(self, item);
if (ptr) {
decrease_item_count(ptr);
return true;
}
return false;
}
struct itemstack *inventory_find(struct inventory *self, struct item *item)
{
struct list **ptr = find_item(self, item);
return ptr ? (*ptr)->element : NULL;
}
static void handle_enter()
{
int i = 0;
@ -119,7 +136,7 @@ static void handle_enter()
struct itemstack *stack = (*ptr)->element;
if (stack->item->on_use && stack->item->on_use(stack))
decrease_item_count(ptr, stack);
decrease_item_count(ptr);
return;
}

1
plugins/inventory/inventory.h
View File

@ -26,6 +26,7 @@ struct inventory
void inventory_add(struct inventory *self, struct itemstack stack);
bool inventory_remove(struct inventory *self, struct item *item);
struct itemstack *inventory_find(struct inventory *self, struct item *item);
extern struct inventory player_inventory;
#endif