molko: libmlk-rpg/mlk/rpg/battle-bar-default.c annotate

annotate libmlk-rpg/mlk/rpg/battle-bar-default.c @ 504:52a305833381

ui: rework styles

author	David Demelier <markand@malikania.fr>
date	Wed, 01 Mar 2023 14:07:10 +0100
parents	2af25db99273
children	6100c643dba0

rev	line source
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	1 /*
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	2 * battle-bar-default.c -- default battle status bar and menu implementation
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	3 *
445 773a082f0b91 misc: update copyright years David Demelier <markand@malikania.fr> parents: 442 diff changeset	4 * Copyright (c) 2020-2023 David Demelier <markand@malikania.fr>
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	5 *
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	6 * Permission to use, copy, modify, and/or distribute this software for any
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	7 * purpose with or without fee is hereby granted, provided that the above
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	8 * copyright notice and this permission notice appear in all copies.
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	9 *
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	17 */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	18
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	19 #include <assert.h>
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	20 #include <stdio.h>
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	21 #include <stdlib.h>
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	22 #include <string.h>
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	23
431 8f59201dc76b core: cleanup hierarchy David Demelier <markand@malikania.fr> parents: 413 diff changeset	24 #include <mlk/core/alloc.h>
8f59201dc76b core: cleanup hierarchy David Demelier <markand@malikania.fr> parents: 413 diff changeset	25 #include <mlk/core/event.h>
8f59201dc76b core: cleanup hierarchy David Demelier <markand@malikania.fr> parents: 413 diff changeset	26 #include <mlk/core/font.h>
8f59201dc76b core: cleanup hierarchy David Demelier <markand@malikania.fr> parents: 413 diff changeset	27 #include <mlk/core/sprite.h>
8f59201dc76b core: cleanup hierarchy David Demelier <markand@malikania.fr> parents: 413 diff changeset	28 #include <mlk/core/trace.h>
8f59201dc76b core: cleanup hierarchy David Demelier <markand@malikania.fr> parents: 413 diff changeset	29 #include <mlk/core/util.h>
8f59201dc76b core: cleanup hierarchy David Demelier <markand@malikania.fr> parents: 413 diff changeset	30 #include <mlk/core/window.h>
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	31
433 862b15c3a3ae ui: cleanup hierarchy David Demelier <markand@malikania.fr> parents: 431 diff changeset	32 #include <mlk/ui/align.h>
862b15c3a3ae ui: cleanup hierarchy David Demelier <markand@malikania.fr> parents: 431 diff changeset	33 #include <mlk/ui/theme.h>
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	34
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	35 #include "battle-bar-default.h"
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	36 #include "battle-bar.h"
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	37 #include "battle-state-item.h"
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	38 #include "battle-state-selection.h"
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	39 #include "battle.h"
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	40 #include "character.h"
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	41 #include "inventory.h"
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	42 #include "item.h"
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	43 #include "spell.h"
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	44
504 52a305833381 ui: rework styles David Demelier <markand@malikania.fr> parents: 495 diff changeset	45 #define THEME(bar) ((bar)->theme ? (bar)->theme : &mlk_theme)
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	46
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	47 struct geo {
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	48 int x, y;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	49 unsigned int w, h;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	50 };
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	51
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	52 static inline void
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	53 dimensions(struct geo geo[2], const struct battle_bar_default *bar)
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	54 {
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	55 /* 0 == main menu */
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	56 geo[0].w = bar->w * 0.2;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	57 geo[0].h = bar->h;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	58 geo[0].x = bar->x + (bar->w / 2) - (geo[0].w / 2);
485 3ff1fe64d0cd core: window -> mlk_window David Demelier <markand@malikania.fr> parents: 474 diff changeset	59 geo[0].y = mlk_window.h - bar->h;
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	60
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	61 /* 1 == status frame */
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	62 geo[1].x = geo[0].x + geo[0].w;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	63 geo[1].y = geo[0].y;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	64 geo[1].w = (bar->w - geo[0].w) / 2;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	65 geo[1].h = bar->h;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	66 }
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	67
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	68 /*
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	69 * The following validate_* functions are called when the user has validated a
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	70 * selection depending on the current menu (e.g. Magic, Items).
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	71 *
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	72 * They change the battle state to the appropriate one.
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	73 */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	74
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	75 static void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	76 validate_attack(struct battle_bar_default bar, struct battle bt, const struct selection *sel)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	77 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	78 (void)bar;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	79
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	80 struct character *target;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	81
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	82 if (sel->index_side == 0)
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	83 target = bt->enemies[sel->index_character]->ch;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	84 else
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	85 target = bt->team[sel->index_character]->ch;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	86
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	87 battle_attack(bt, battle_current(bt)->ch, target);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	88 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	89
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	90 static void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	91 validate_magic(struct battle_bar_default bar, struct battle bt, const struct selection *sel)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	92 {
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	93 struct character *source = battle_current(bt)->ch;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	94 const struct spell *spell = source->spells[bar->grid.selected];
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	95
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	96 battle_cast(bt, source, spell, sel);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	97 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	98
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	99 static void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	100 validate_item(struct battle_bar_default bar, struct battle bt, const struct selection *sel)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	101 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	102 struct inventory_slot *slot;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	103 struct battle_entity source, target;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	104
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	105 if (bar->grid.selected >= INVENTORY_ITEM_MAX)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	106 return;
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	107 if (!(slot = &bt->inventory->items[bar->grid.selected]))
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	108 return;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	109
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	110 source = battle_current(bt);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	111 target = sel->index_side == 0
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	112 ? bt->enemies[sel->index_character]
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	113 : bt->team[sel->index_character];
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	114
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	115 /* TODO: battle_use? */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	116 battle_state_item(bt, source, target, slot);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	117 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	118
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	119 /*
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	120 * The following functions are used to switch to the battle selection state
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	121 * using the appropriate selector algorithm. For example, an item can only be
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	122 * used on a unique target while a spell can have multiple choices.
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	123 */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	124
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	125 static void
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	126 switch_selection_attack(struct battle_bar_default bar, struct battle bt)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	127 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	128 struct selection sel = {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	129 .allowed_kinds = SELECTION_KIND_ONE,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	130 .allowed_sides = SELECTION_SIDE_ENEMY,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	131 .index_side = 0
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	132 };
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	133
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	134 /* Disable handling anymore. */
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	135 bar->state = BATTLE_BAR_DEFAULT_STATE_NONE;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	136
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	137 selection_first(&sel, bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	138 battle_state_selection(bt, &sel);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	139 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	140
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	141 static void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	142 switch_selection_spell(struct battle_bar_default bar, struct battle bt)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	143 {
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	144 const struct character *ch = battle_current(bt)->ch;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	145 const struct spell *sp = ch->spells[bar->grid.selected];
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	146 struct selection sel = {0};
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	147
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	148 if (bar->grid.selected > CHARACTER_SPELL_MAX)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	149 return;
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	150 if (!(sp = ch->spells[bar->grid.selected]) \|\| sp->mp > (unsigned int)ch->mp)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	151 return;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	152
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	153 /* Use the spell selection algorithm to fill default values. */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	154 spell_select(sp, bt, &sel);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	155 battle_state_selection(bt, &sel);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	156
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	157 /* A cursor should be present. */
495 2af25db99273 ui: theme -> mlk_theme David Demelier <markand@malikania.fr> parents: 493 diff changeset	158 if (!mlk_sprite_ok(BATTLE_THEME(bt)->sprites[MLK_THEME_SPRITE_CURSOR]))
473 02b16dd49b54 core: trace -> mlk_trace David Demelier <markand@malikania.fr> parents: 468 diff changeset	159 mlk_tracef("battle: no cursor sprite in theme");
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	160 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	161
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	162 static void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	163 switch_selection_item(struct battle *bt)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	164 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	165 const struct selection slt = {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	166 .allowed_kinds = SELECTION_KIND_ONE,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	167 .allowed_sides = SELECTION_SIDE_TEAM \| SELECTION_SIDE_ENEMY,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	168 .index_side = 1,
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	169 .index_character = battle_index(bt)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	170 };
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	171
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	172 battle_state_selection(bt, &slt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	173 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	174
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	175 /*
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	176 * The following functions actually draw the bar and their components depending
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	177 * on the current selected menu.
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	178 */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	179
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	180 static void
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	181 draw_help(const struct battle_bar_default bar, const char what)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	182 {
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	183 struct mlk_label label = {0};
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	184 unsigned int lw = 0, lh = 0;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	185
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	186 label.flags = MLK_LABEL_FLAGS_SHADOW;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	187 label.text = what;
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	188 mlk_label_query(&label, &lw, &lh);
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	189 label.x = bar->grid.x + (bar->grid.w / 2) - (lw / 2);
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	190 label.y = bar->grid.y - lh - THEME(bar)->padding;
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	191 mlk_label_draw(&label);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	192 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	193
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	194 static void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	195 draw_spell_help(const struct battle_bar_default bar, const struct battle bt)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	196 {
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	197 const struct character *ch = battle_current(bt)->ch;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	198 const struct spell *sp;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	199
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	200 if (bar->grid.selected >= CHARACTER_SPELL_MAX)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	201 return;
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	202 if (!(sp = ch->spells[bar->grid.selected]))
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	203 return;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	204
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	205 draw_help(bar, sp->description);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	206 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	207
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	208 static void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	209 draw_item_help(const struct battle_bar_default bar, const struct battle bt)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	210 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	211 const struct inventory_slot *slot;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	212
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	213 if (bar->grid.selected >= INVENTORY_ITEM_MAX)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	214 return;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	215
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	216 slot = &bt->inventory->items[bar->grid.selected];
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	217
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	218 if (!slot->item)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	219 return;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	220
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	221 draw_help(bar, slot->item->description);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	222 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	223
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	224 static void
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	225 draw_status_character_stats(const struct battle_bar_default *bar,
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	226 const struct character *ch,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	227 int x,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	228 int y,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	229 unsigned int h)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	230 {
495 2af25db99273 ui: theme -> mlk_theme David Demelier <markand@malikania.fr> parents: 493 diff changeset	231 const struct mlk_theme *theme = THEME(bar);
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	232 struct mlk_label label;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	233 unsigned int spacing, lw, lh;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	234 char line[64];
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	235
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	236 /* Compute spacing between elements. */
495 2af25db99273 ui: theme -> mlk_theme David Demelier <markand@malikania.fr> parents: 493 diff changeset	237 spacing = h - (mlk_font_height(theme->fonts[MLK_THEME_FONT_INTERFACE]) * 3);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	238 spacing /= 4;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	239
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	240 /* Reuse the same label. */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	241 label.text = line;
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	242 label.flags = MLK_LABEL_FLAGS_SHADOW;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	243
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	244 /* Name. */
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	245 snprintf(line, sizeof (line), "%s", ch->name);
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	246 mlk_label_query(&label, &lw, &lh);
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	247 label.x = x + theme->padding;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	248 label.y = y + spacing;
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	249 mlk_label_draw(&label);
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	250
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	251 /* HP. */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	252 snprintf(line, sizeof (line), "%d/%u", ch->hp, ch->hpmax);
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	253 mlk_label_query(&label, &lw, &lh);
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	254 label.x = x + theme->padding;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	255 label.y = label.y + lh + spacing;
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	256 mlk_label_draw(&label);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	257
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	258 /* MP. */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	259 snprintf(line, sizeof (line), "%d/%u", ch->mp, ch->mpmax);
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	260 mlk_label_query(&label, &lw, &lh);
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	261 label.x = x + theme->padding;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	262 label.y = label.y + lh + spacing;
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	263 mlk_label_draw(&label);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	264
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	265 /* Status. */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	266 /* TODO: list all status. */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	267 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	268
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	269 static void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	270 draw_status_character(const struct battle_bar_default *bar,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	271 const struct battle *bt,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	272 const struct character *ch,
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	273 const struct geo *geo,
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	274 unsigned int index)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	275 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	276 int x, y;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	277 unsigned int w, h;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	278
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	279 /* Compute bounding box for rendering. */
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	280 w = geo->w / bt->teamsz;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	281 h = geo->h;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	282 x = geo->x + (index * w);
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	283 y = geo->y;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	284
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	285 draw_status_character_stats(bar, ch, x, y, h);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	286 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	287
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	288 static void
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	289 draw_status_characters(const struct battle_bar_default *bar,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	290 const struct battle *bt,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	291 const struct geo *geo)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	292 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	293 const struct battle_entity *et;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	294 unsigned int index = 0;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	295
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	296 BATTLE_TEAM_FOREACH(bt, et) {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	297 if (character_ok(et->ch))
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	298 draw_status_character(bar, bt, et->ch, geo, index);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	299
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	300 ++index;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	301 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	302 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	303
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	304 static void
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	305 draw_status(const struct battle_bar_default bar, const struct battle bt, const struct geo *geo)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	306 {
491 734b598534c4 ui: frame -> mlk_frame David Demelier <markand@malikania.fr> parents: 487 diff changeset	307 mlk_frame_draw(&(const struct mlk_frame) {
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	308 .x = geo->x,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	309 .y = geo->y,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	310 .w = geo->w,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	311 .h = geo->h
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	312 });
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	313
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	314 draw_status_characters(bar, bt, geo);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	315 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	316
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	317 static void
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	318 draw_menu(const struct battle_bar_default bar, const struct geo geo)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	319 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	320 struct {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	321 unsigned int w, h;
487 f2d3c5a97884 ui: align -> mlk_align David Demelier <markand@malikania.fr> parents: 485 diff changeset	322 enum mlk_align align;
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	323 struct mlk_label label;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	324 } buttons[] = {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	325 {
487 f2d3c5a97884 ui: align -> mlk_align David Demelier <markand@malikania.fr> parents: 485 diff changeset	326 .align = MLK_ALIGN_TOP,
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	327 .label = {
411 d74f53299252 make: add basic GNU make support David Demelier <markand@malikania.fr> parents: 401 diff changeset	328 .text = "Attack",
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	329 .flags = MLK_LABEL_FLAGS_SHADOW
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	330 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	331 },
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	332 {
487 f2d3c5a97884 ui: align -> mlk_align David Demelier <markand@malikania.fr> parents: 485 diff changeset	333 .align = MLK_ALIGN_RIGHT,
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	334 .label = {
411 d74f53299252 make: add basic GNU make support David Demelier <markand@malikania.fr> parents: 401 diff changeset	335 .text = "Magic",
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	336 .flags = MLK_LABEL_FLAGS_SHADOW
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	337 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	338 },
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	339 {
487 f2d3c5a97884 ui: align -> mlk_align David Demelier <markand@malikania.fr> parents: 485 diff changeset	340 .align = MLK_ALIGN_BOTTOM,
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	341 .label = {
411 d74f53299252 make: add basic GNU make support David Demelier <markand@malikania.fr> parents: 401 diff changeset	342 .text = "Objects",
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	343 .flags = MLK_LABEL_FLAGS_SHADOW
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	344 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	345 },
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	346 {
487 f2d3c5a97884 ui: align -> mlk_align David Demelier <markand@malikania.fr> parents: 485 diff changeset	347 .align = MLK_ALIGN_LEFT,
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	348 .label = {
411 d74f53299252 make: add basic GNU make support David Demelier <markand@malikania.fr> parents: 401 diff changeset	349 .text = "Special",
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	350 .flags = MLK_LABEL_FLAGS_SHADOW
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	351 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	352 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	353 };
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	354
495 2af25db99273 ui: theme -> mlk_theme David Demelier <markand@malikania.fr> parents: 493 diff changeset	355 const struct mlk_theme *theme = THEME(bar);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	356 int bx, by;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	357 unsigned int bw, bh;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	358
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	359 /* Compute bounding box with margins removed. */
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	360 bx = geo->x + theme->padding;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	361 by = geo->y + theme->padding;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	362 bw = geo->w - theme->padding * 2;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	363 bh = geo->h - theme->padding * 2;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	364
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	365 /* Draw menu frame. */
491 734b598534c4 ui: frame -> mlk_frame David Demelier <markand@malikania.fr> parents: 487 diff changeset	366 mlk_frame_draw(&(const struct mlk_frame) {
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	367 .x = geo->x,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	368 .y = geo->y,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	369 .w = geo->w,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	370 .h = geo->h
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	371 });
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	372
474 ca30ff96bbe0 core: util -> mlk_util David Demelier <markand@malikania.fr> parents: 473 diff changeset	373 for (size_t i = 0; i < MLK_UTIL_SIZE(buttons); ++i) {
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	374 mlk_label_query(&buttons[i].label, &buttons[i].w, &buttons[i].h);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	375
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	376 /* Change theme if it's selected. */
504 52a305833381 ui: rework styles David Demelier <markand@malikania.fr> parents: 495 diff changeset	377 #if 0
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	378 if ((size_t)bar->menu == i)
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	379 buttons[i].label.flags \|= MLK_LABEL_FLAGS_SELECTED;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	380 else
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	381 buttons[i].label.flags &= ~MLK_LABEL_FLAGS_SELECTED;
504 52a305833381 ui: rework styles David Demelier <markand@malikania.fr> parents: 495 diff changeset	382 #endif
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	383
487 f2d3c5a97884 ui: align -> mlk_align David Demelier <markand@malikania.fr> parents: 485 diff changeset	384 mlk_align(buttons[i].align,
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	385 &buttons[i].label.x, &buttons[i].label.y, buttons[i].w, buttons[i].h,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	386 bx, by, bw, bh);
493 fce3b3c4b496 ui: label -> mlk_label David Demelier <markand@malikania.fr> parents: 492 diff changeset	387 mlk_label_draw(&buttons[i].label);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	388 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	389 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	390
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	391 /*
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	392 * This function is called only in the first level of the bar menu: selecting
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	393 * one of the Attack, Magic, Item and Special items.
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	394 */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	395 static void
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	396 handle_keydown_menu(struct battle_bar_default bar, struct battle bt, const union mlk_event *ev)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	397 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	398 (void)bt;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	399
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	400 switch (ev->key.key) {
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	401 case MLK_KEY_UP:
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	402 bar->menu = BATTLE_BAR_DEFAULT_MENU_ATTACK;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	403 break;
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	404 case MLK_KEY_RIGHT:
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	405 bar->menu = BATTLE_BAR_DEFAULT_MENU_MAGIC;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	406 break;
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	407 case MLK_KEY_DOWN:
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	408 bar->menu = BATTLE_BAR_DEFAULT_MENU_ITEM;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	409 break;
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	410 case MLK_KEY_LEFT:
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	411 bar->menu = BATTLE_BAR_DEFAULT_MENU_SPECIAL;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	412 break;
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	413 case MLK_KEY_ENTER:
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	414 /*
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	415 * At this step, attack does not require opening the sub menu so
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	416 * we change selection state immediately if needed.
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	417 */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	418 switch (bar->menu) {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	419 case BATTLE_BAR_DEFAULT_MENU_ATTACK:
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	420 switch_selection_attack(bar, bt);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	421 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	422 case BATTLE_BAR_DEFAULT_MENU_ITEM:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	423 battle_bar_default_open_item(bar, bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	424 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	425 case BATTLE_BAR_DEFAULT_MENU_MAGIC:
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	426 battle_bar_default_open_magic(bar, bt, battle_current(bt)->ch);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	427 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	428 default:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	429 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	430 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	431 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	432 default:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	433 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	434 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	435 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	436
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	437 /*
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	438 * This function is called when we're selecting a submenu entry from Items
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	439 * and Magic.
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	440 */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	441 static void
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	442 handle_keydown_grid(struct battle_bar_default bar, struct battle bt, const union mlk_event *ev)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	443 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	444 /* Go back to main menu if I press escape. */
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	445 if (ev->key.key == MLK_KEY_ESCAPE)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	446 bar->state = BATTLE_BAR_DEFAULT_STATE_MENU;
492 c7b18475f640 ui: gridmenu -> mlk_gridmenu David Demelier <markand@malikania.fr> parents: 491 diff changeset	447 else if (mlk_gridmenu_handle(&bar->grid, ev)) {
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	448 switch (bar->menu) {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	449 case BATTLE_BAR_DEFAULT_MENU_MAGIC:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	450 switch_selection_spell(bar, bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	451 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	452 case BATTLE_BAR_DEFAULT_MENU_ITEM:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	453 switch_selection_item(bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	454 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	455 default:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	456 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	457 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	458 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	459 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	460
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	461 static void
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	462 handle_keydown(struct battle_bar_default bar, struct battle bt, const union mlk_event *ev)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	463 {
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	464 assert(ev->type == MLK_EVENT_KEYDOWN);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	465
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	466 static void (handlers[])(struct battle_bar_default , struct battle , const union mlk_event ) = {
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	467 [BATTLE_BAR_DEFAULT_STATE_MENU] = handle_keydown_menu,
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	468 [BATTLE_BAR_DEFAULT_STATE_GRID] = handle_keydown_grid
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	469 };
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	470
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	471 if (handlers[bar->state])
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	472 handlers[bar->state](bar, bt, ev);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	473 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	474
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	475 #if 0
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	476
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	477 static void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	478 handle_clickdown(struct battle_bar_default bar, struct battle bt, const union event *ev)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	479 {
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	480 assert(ev->type == EVENT_CLICKDOWN);
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	481
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	482 (void)bar;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	483 (void)bt;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	484
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	485 switch (bar->state) {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	486 case BATTLE_BAR_DEFAULT_STATE_MENU:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	487 /* We are selecting a main menu entry. */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	488 /* TODO: implement click here too. */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	489 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	490 case BATTLE_BAR_DEFAULT_STATE_SUB:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	491 /* We are in the sub menu (objects/spells). */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	492 if (bar->sub_grid.state == GRIDMENU_STATE_ACTIVATED)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	493 default:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	494 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	495 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	496
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	497 return 0;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	498 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	499
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	500 #endif
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	501
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	502 static void
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	503 self_start(struct battle_bar bar, struct battle bt)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	504 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	505 (void)bt;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	506
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	507 battle_bar_default_start(bar->data);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	508 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	509
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	510 static void
395 ef2fc4442ed5 ui: don't use fixed size arrays David Demelier <markand@malikania.fr> parents: 386 diff changeset	511 self_select(struct battle_bar bar, struct battle bt, const struct selection *sel)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	512 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	513 battle_bar_default_select(bar->data, bt, sel);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	514 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	515
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	516 static void
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	517 self_handle(struct battle_bar bar, struct battle bt, const union mlk_event *ev)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	518 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	519 battle_bar_default_handle(bar->data, bt, ev);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	520 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	521
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	522 static void
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	523 self_draw(const struct battle_bar bar, const struct battle bt)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	524 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	525 battle_bar_default_draw(bar->data, bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	526 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	527
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	528 void
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	529 battle_bar_default_init(struct battle_bar_default *bar)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	530 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	531 assert(bar);
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	532
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	533 struct geo geo[2];
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	534
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	535 memset(bar, 0, sizeof (*bar));
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	536
485 3ff1fe64d0cd core: window -> mlk_window David Demelier <markand@malikania.fr> parents: 474 diff changeset	537 bar->w = mlk_window.w;
3ff1fe64d0cd core: window -> mlk_window David Demelier <markand@malikania.fr> parents: 474 diff changeset	538 bar->h = mlk_window.h * 0.12;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	539 bar->x = 0;
485 3ff1fe64d0cd core: window -> mlk_window David Demelier <markand@malikania.fr> parents: 474 diff changeset	540 bar->y = mlk_window.h - bar->h;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	541
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	542 dimensions(geo, bar);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	543
492 c7b18475f640 ui: gridmenu -> mlk_gridmenu David Demelier <markand@malikania.fr> parents: 491 diff changeset	544 mlk_gridmenu_init(&bar->grid, 2, 2, NULL, 0);
c7b18475f640 ui: gridmenu -> mlk_gridmenu David Demelier <markand@malikania.fr> parents: 491 diff changeset	545 mlk_gridmenu_resize(&bar->grid, bar->x, geo[0].y, geo[1].w, bar->h);
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	546 bar->grid.theme = bar->theme;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	547 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	548
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	549 void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	550 battle_bar_default_open_magic(struct battle_bar_default bar, const struct battle bt, struct character *ch)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	551 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	552 assert(bar);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	553 assert(bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	554 assert(ch);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	555
413 222045c513ec misc: fix some warnings David Demelier <markand@malikania.fr> parents: 411 diff changeset	556 (void)bt;
222045c513ec misc: fix some warnings David Demelier <markand@malikania.fr> parents: 411 diff changeset	557
460 8fa69c770569 examples: fix David Demelier <markand@malikania.fr> parents: 451 diff changeset	558 if (!bar->items)
8fa69c770569 examples: fix David Demelier <markand@malikania.fr> parents: 451 diff changeset	559 bar->items = mlk_alloc_new0(CHARACTER_SPELL_MAX, sizeof (*bar->items));
8fa69c770569 examples: fix David Demelier <markand@malikania.fr> parents: 451 diff changeset	560 else
8fa69c770569 examples: fix David Demelier <markand@malikania.fr> parents: 451 diff changeset	561 bar->items = mlk_alloc_renew0(bar->items, CHARACTER_SPELL_MAX);
504 52a305833381 ui: rework styles David Demelier <markand@malikania.fr> parents: 495 diff changeset	562
401 df5e1fea1d2e ui: gridmenu should be fully constified David Demelier <markand@malikania.fr> parents: 398 diff changeset	563 bar->itemsz = CHARACTER_SPELL_MAX;
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	564 bar->state = BATTLE_BAR_DEFAULT_STATE_GRID;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	565
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	566 for (size_t i = 0; i < CHARACTER_SPELL_MAX; ++i)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	567 if (ch->spells[i])
401 df5e1fea1d2e ui: gridmenu should be fully constified David Demelier <markand@malikania.fr> parents: 398 diff changeset	568 bar->items[i] = ch->spells[i]->name;
df5e1fea1d2e ui: gridmenu should be fully constified David Demelier <markand@malikania.fr> parents: 398 diff changeset	569
df5e1fea1d2e ui: gridmenu should be fully constified David Demelier <markand@malikania.fr> parents: 398 diff changeset	570 bar->grid.items = bar->items;
df5e1fea1d2e ui: gridmenu should be fully constified David Demelier <markand@malikania.fr> parents: 398 diff changeset	571 bar->grid.itemsz = bar->itemsz;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	572 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	573
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	574 void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	575 battle_bar_default_open_item(struct battle_bar_default bar, const struct battle bt)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	576 {
386 7d5032755b7d rpg: cleanup leftovers David Demelier <markand@malikania.fr> parents: 385 diff changeset	577 assert(bar);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	578 assert(bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	579
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	580 /* TODO: not implemented yet. */
413 222045c513ec misc: fix some warnings David Demelier <markand@malikania.fr> parents: 411 diff changeset	581 (void)bar;
222045c513ec misc: fix some warnings David Demelier <markand@malikania.fr> parents: 411 diff changeset	582 (void)bt;
395 ef2fc4442ed5 ui: don't use fixed size arrays David Demelier <markand@malikania.fr> parents: 386 diff changeset	583 #if 0
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	584 for (size_t i = 0; i < INVENTORY_ITEM_MAX; ++i) {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	585 if (bt->inventory->items[i].item) {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	586 snprintf(bar->sub_items[i], sizeof (bar->sub_items[i]), "%-16s %u",
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	587 bt->inventory->items[i].item->name, bt->inventory->items[i].amount);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	588 bar->sub_grid.menu[i] = bar->sub_items[i];
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	589 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	590 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	591
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	592 bar->state = BATTLE_BAR_DEFAULT_STATE_GRID;
395 ef2fc4442ed5 ui: don't use fixed size arrays David Demelier <markand@malikania.fr> parents: 386 diff changeset	593 #endif
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	594 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	595
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	596 void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	597 battle_bar_default_start(struct battle_bar_default *bar)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	598 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	599 assert(bar);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	600
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	601 bar->menu = BATTLE_BAR_DEFAULT_MENU_ATTACK;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	602 bar->state = BATTLE_BAR_DEFAULT_STATE_MENU;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	603 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	604
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	605 /*
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	606 * Apply the battle selection for the current menu item. This function is called
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	607 * from the battle-state-selection state when the user validated the selection.
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	608 */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	609 void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	610 battle_bar_default_select(struct battle_bar_default bar, struct battle bt, const struct selection *sel)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	611 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	612 assert(bar);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	613 assert(bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	614 assert(sel);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	615
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	616 static void (validate[])(struct battle_bar_default , struct battle , const struct selection ) = {
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	617 [BATTLE_BAR_DEFAULT_MENU_ATTACK] = validate_attack,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	618 [BATTLE_BAR_DEFAULT_MENU_ITEM] = validate_item,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	619 [BATTLE_BAR_DEFAULT_MENU_MAGIC] = validate_magic,
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	620 [BATTLE_BAR_DEFAULT_MENU_SPECIAL] = NULL
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	621 };
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	622
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	623 if (validate[bar->menu])
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	624 validate[bar->menu](bar, bt, sel);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	625 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	626
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	627 void
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	628 battle_bar_default_handle(struct battle_bar_default bar, struct battle bt, const union mlk_event *ev)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	629 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	630 assert(bar);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	631 assert(bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	632 assert(ev);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	633
450 b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	634 static void (handlers[])(struct battle_bar_default , struct battle , const union mlk_event ) = {
b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	635 [MLK_EVENT_KEYDOWN] = handle_keydown,
b26dd49f69ff core: event -> mlk_event (and friends) David Demelier <markand@malikania.fr> parents: 445 diff changeset	636 [MLK_EVENT_NUM] = NULL
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	637 };
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	638
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	639 if (handlers[ev->type])
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	640 handlers[ev->type](bar, bt, ev);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	641 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	642
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	643 void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	644 battle_bar_default_draw(const struct battle_bar_default bar, const struct battle bt)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	645 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	646 assert(bar);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	647 assert(bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	648
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	649 struct geo geo[2];
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	650
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	651 dimensions(geo, bar);
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	652 draw_menu(bar, &geo[0]);
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	653 draw_status(bar, bt, &geo[1]);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	654
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	655 if (bar->state == BATTLE_BAR_DEFAULT_STATE_GRID) {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	656 switch (bar->menu) {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	657 case BATTLE_BAR_DEFAULT_MENU_MAGIC:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	658 draw_spell_help(bar, bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	659 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	660 case BATTLE_BAR_DEFAULT_MENU_ITEM:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	661 draw_item_help(bar, bt);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	662 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	663 default:
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	664 break;
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	665 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	666 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	667
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	668 /* Sub menu is only shown if state is set to it. */
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	669 if (bar->state == BATTLE_BAR_DEFAULT_STATE_GRID)
492 c7b18475f640 ui: gridmenu -> mlk_gridmenu David Demelier <markand@malikania.fr> parents: 491 diff changeset	670 mlk_gridmenu_draw(&bar->grid);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	671 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	672
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	673 void
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	674 battle_bar_default_finish(struct battle_bar_default *bar)
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	675 {
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	676 assert(bar);
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	677
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	678 free(bar->items);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	679 memset(bar, 0, sizeof (*bar));
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	680 }
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	681
3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	682 void
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	683 battle_bar_default(struct battle_bar_default self, struct battle_bar bar)
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	684 {
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	685 assert(self);
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	686 assert(bar);
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	687
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	688 memset(bar, 0, sizeof (*bar));
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	689
398 14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	690 bar->data = self;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	691 bar->start = self_start;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	692 bar->select = self_select;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	693 bar->handle = self_handle;
14ce7c4871e3 rpg: overhaul of battle bar David Demelier <markand@malikania.fr> parents: 395 diff changeset	694 bar->draw = self_draw;
385 3f13dc6c0e37 rpg: separate battle and the bar, closes #2522 David Demelier <markand@malikania.fr> parents: diff changeset	695 }

Mercurial > molko

annotate libmlk-rpg/mlk/rpg/battle-bar-default.c @ 504:52a305833381