Mercurial > molko
changeset 401:df5e1fea1d2e
ui: gridmenu should be fully constified
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 16 Mar 2022 13:37:56 +0100 |
| parents | 4fb0ce06a43a |
| children | d3fa956cdaf0 |
| files | src/libmlk-rpg/rpg/battle-bar-default.c src/libmlk-ui/ui/gridmenu.c src/libmlk-ui/ui/gridmenu.h |
| diffstat | 3 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libmlk-rpg/rpg/battle-bar-default.c Wed Mar 16 13:32:15 2022 +0100 +++ b/src/libmlk-rpg/rpg/battle-bar-default.c Wed Mar 16 13:37:56 2022 +0100 @@ -555,14 +555,17 @@ assert(bt); assert(ch); - bar->items = bar->grid.items = alloc_rearray0(bar->items, bar->itemsz, + bar->items = alloc_rearray0(bar->items, bar->itemsz, CHARACTER_SPELL_MAX, sizeof (*bar->items)); - bar->itemsz = bar->grid.itemsz = CHARACTER_SPELL_MAX; + bar->itemsz = CHARACTER_SPELL_MAX; bar->state = BATTLE_BAR_DEFAULT_STATE_GRID; for (size_t i = 0; i < CHARACTER_SPELL_MAX; ++i) if (ch->spells[i]) - bar->grid.items[i] = ch->spells[i]->name; + bar->items[i] = ch->spells[i]->name; + + bar->grid.items = bar->items; + bar->grid.itemsz = bar->itemsz; } void
--- a/src/libmlk-ui/ui/gridmenu.c Wed Mar 16 13:32:15 2022 +0100 +++ b/src/libmlk-ui/ui/gridmenu.c Wed Mar 16 13:37:56 2022 +0100 @@ -230,7 +230,7 @@ gridmenu_init(struct gridmenu *menu, unsigned int nr, unsigned int nc, - const char **items, + const char * const *items, size_t itemsz) { assert(menu);
--- a/src/libmlk-ui/ui/gridmenu.h Wed Mar 16 13:32:15 2022 +0100 +++ b/src/libmlk-ui/ui/gridmenu.h Wed Mar 16 13:37:56 2022 +0100 @@ -36,7 +36,7 @@ unsigned int h; size_t selected; const struct theme *theme; - const char **items; + const char * const *items; size_t itemsz; unsigned int nrows; unsigned int ncols; @@ -51,7 +51,7 @@ CORE_BEGIN_DECLS void -gridmenu_init(struct gridmenu *, unsigned int, unsigned int, const char **, size_t); +gridmenu_init(struct gridmenu *, unsigned int, unsigned int, const char * const *, size_t); void gridmenu_resize(struct gridmenu *, int, int, unsigned int, unsigned int);