From f246c5751abe905c2dd1c1513e19337e59f9cb4b Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Wed, 12 Sep 2018 14:45:09 +0200 Subject: [PATCH] Broken commit --- src/menu.c | 27 ++++++++++++++++++++++++++- src/menu.h | 3 +++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/menu.c b/src/menu.c index b64cef8..25ae731 100644 --- a/src/menu.c +++ b/src/menu.c @@ -26,12 +26,13 @@ #include "keyboard.h" #include "mixer.h" #include "collisions.h" +#include "texturecache.h" static SDL_Color C_MENU_DEFAULT = { 255, 255, 0, 255 }; static SDL_Color C_MENU_OUTLINE_DEFAULT = { 0, 0, 0, 255 }; static SDL_Color C_MENU_HOVER = { 255, 0, 0, 255 }; -typedef struct MenuItems { +typedef struct MenuItem { Sprite *sprite; Sprite *hsprite; GuiButton *button; @@ -82,6 +83,30 @@ menu_create_text_menu(Menu **menu, TEXT_MENU_ITEM *menu_items, unsigned int size } } +Menu * +menu_create_character_selector(void (*onCharacterSelect)(const char **)) +{ + const char *spriteSheets[] = { +"Comissions/Warrior.png", + } + Menu *menu = menu_create(); + + Sprite *s1 = sprite_create(); + sprite_set_texture(s1, texturecache_add(), 0); + s1->clip = CLIP16(0, 0); + s1->dim = DIM(32, 32); + + Sprite *s2 = sprite_create(); + sprite_set_texture(s2, texturecache_add("Commissions/Warrior.png"), 1); + s2->clip = CLIP16(0, 48); + s2->dim = DIM(32, 32); + + MenuItem *item + menu_item_add(menu, s1, s2, (void (*)(void *)) onCharacterSelect); + + return menu; +} + static bool handle_keyboard_input(Menu *m, Input *input) { diff --git a/src/menu.h b/src/menu.h index da43d83..9a949c3 100644 --- a/src/menu.h +++ b/src/menu.h @@ -41,6 +41,9 @@ menu_create(void); void menu_create_text_menu(Menu **menu, TEXT_MENU_ITEM *menu_items, unsigned int size, SDL_Renderer *); +Menu * +menu_create_character_selector(void (*onCharacterSelect)(const char **)); + void menu_update(Menu*, Input*);