Mercurial > molko
comparison src/libmlk-rpg/rpg/battle-bar-default.c @ 386:7d5032755b7d
rpg: cleanup leftovers
author | David Demelier <markand@malikania.fr> |
---|---|
date | Tue, 15 Feb 2022 16:01:29 +0100 |
parents | 3f13dc6c0e37 |
children | ef2fc4442ed5 |
comparison
equal
deleted
inserted
replaced
385:3f13dc6c0e37 | 386:7d5032755b7d |
---|---|
414 if (ev->key.key == KEY_ESCAPE) { | 414 if (ev->key.key == KEY_ESCAPE) { |
415 gridmenu_reset(&bar->sub_grid); | 415 gridmenu_reset(&bar->sub_grid); |
416 bar->state = BATTLE_BAR_DEFAULT_STATE_MENU; | 416 bar->state = BATTLE_BAR_DEFAULT_STATE_MENU; |
417 return; | 417 return; |
418 } | 418 } |
419 | 419 |
420 gridmenu_handle(&bar->sub_grid, ev); | 420 gridmenu_handle(&bar->sub_grid, ev); |
421 | 421 |
422 if (bar->sub_grid.state == GRIDMENU_STATE_ACTIVATED) { | 422 if (bar->sub_grid.state == GRIDMENU_STATE_ACTIVATED) { |
423 gridmenu_reset(&bar->sub_grid); | 423 gridmenu_reset(&bar->sub_grid); |
424 | 424 |
425 switch (bar->menu) { | 425 switch (bar->menu) { |
426 case BATTLE_BAR_DEFAULT_MENU_MAGIC: | 426 case BATTLE_BAR_DEFAULT_MENU_MAGIC: |
427 switch_selection_spell(bar, bt); | 427 switch_selection_spell(bar, bt); |
428 break; | 428 break; |
429 case BATTLE_BAR_DEFAULT_MENU_ITEM: | 429 case BATTLE_BAR_DEFAULT_MENU_ITEM: |
571 } | 571 } |
572 | 572 |
573 void | 573 void |
574 battle_bar_default_open_item(struct battle_bar_default *bar, const struct battle *bt) | 574 battle_bar_default_open_item(struct battle_bar_default *bar, const struct battle *bt) |
575 { | 575 { |
576 asssert(bar); | 576 assert(bar); |
577 assert(bt); | 577 assert(bt); |
578 | 578 |
579 init_gridmenu(bar, bt); | 579 init_gridmenu(bar, bt); |
580 | 580 |
581 for (size_t i = 0; i < INVENTORY_ITEM_MAX; ++i) { | 581 for (size_t i = 0; i < INVENTORY_ITEM_MAX; ++i) { |