#include "system/floor-type-definition.h"
#include "system/monster-type-definition.h"
#include "target/target-preparation.h"
+#include "target/target-setter.h"
#include "target/target-types.h"
#include "term/gameterm.h"
#include "term/screen-processor.h"
MONRACE_IDX r_idx = m_ptr->ap_r_idx;
monster_race *r_ptr = &r_info[r_idx];
+ term_erase(0, y, 255);
term_gotoxy(x, y);
if (!r_ptr)
return;
}
if (line - y - 1 == max_lines && i != tmp_pos.n) {
+ term_erase(0, line, 255);
term_gotoxy(x, line);
term_addstr(-1, TERM_WHITE, "-- and more --");
} else {
if (last_mons)
print_monster_line(x, line++, last_mons, n_same);
+ for (; line < max_lines; line++)
+ term_erase(0, line, 255);
}
}
continue;
if (!(window_flag[j] & PW_MONSTER_LIST))
continue;
+ if (angband_term[j]->never_fresh)
+ continue;
term_activate(angband_term[j]);
int w, h;
term_get_size(&w, &h);
- term_clear();
target_set_prepare(player_ptr, TARGET_LOOK);
print_monster_list(player_ptr->current_floor_ptr, 0, 0, h);
+ target_clear(player_ptr);
term_fresh();
term_activate(old);
}
TERM_COLOR attr = TERM_WHITE;
char tmp_val[80];
GAME_TEXT o_name[MAX_NLEN];
- for (inventory_slot_type i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+ for (inventory_slot_type i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
object_type *o_ptr;
o_ptr = &owner_ptr->inventory_list[i];
tmp_val[0] = tmp_val[1] = tmp_val[2] = ' ';
tmp_val[1] = ')';
}
- term_putstr(0, i - INVEN_RARM, 3, TERM_WHITE, tmp_val);
- if ((((i == INVEN_RARM) && has_left_hand_weapon(owner_ptr)) || ((i == INVEN_LARM) && has_right_hand_weapon(owner_ptr))) && has_two_handed_weapons(owner_ptr)) {
+ term_putstr(0, i - INVEN_MAIN_HAND, 3, TERM_WHITE, tmp_val);
+ if ((((i == INVEN_MAIN_HAND) && can_attack_with_sub_hand(owner_ptr)) || ((i == INVEN_SUB_HAND) && can_attack_with_main_hand(owner_ptr)))
+ && has_two_handed_weapons(owner_ptr)) {
strcpy(o_name, _("(武器を両手持ち)", "(wielding with two-hands)"));
attr = TERM_WHITE;
} else {
if (o_ptr->timeout)
attr = TERM_L_DARK;
- term_putstr(3, i - INVEN_RARM, n, attr, o_name);
- term_erase(3 + n, i - INVEN_RARM, 255);
+ term_putstr(3, i - INVEN_MAIN_HAND, n, attr, o_name);
+ term_erase(3 + n, i - INVEN_MAIN_HAND, 255);
if (show_weights) {
int wgt = o_ptr->weight * o_ptr->number;
sprintf(tmp_val, _("%3d.%1d kg", "%3d.%1d lb"), _(lbtokg1(wgt), wgt / 10), _(lbtokg2(wgt), wgt % 10));
- prt(tmp_val, i - INVEN_RARM, wid - (show_labels ? 28 : 9));
+ prt(tmp_val, i - INVEN_MAIN_HAND, wid - (show_labels ? 28 : 9));
}
if (show_labels) {
- term_putstr(wid - 20, i - INVEN_RARM, -1, TERM_WHITE, " <-- ");
- prt(mention_use(owner_ptr, i), i - INVEN_RARM, wid - 15);
+ term_putstr(wid - 20, i - INVEN_MAIN_HAND, -1, TERM_WHITE, " <-- ");
+ prt(mention_use(owner_ptr, i), i - INVEN_MAIN_HAND, wid - 15);
}
}
- for (int i = INVEN_TOTAL - INVEN_RARM; i < hgt; i++)
+ for (int i = INVEN_TOTAL - INVEN_MAIN_HAND; i < hgt; i++)
term_erase(0, i, 255);
}
if (window_flag[j] & (PW_INVEN)) {
window_flag[j] &= ~(PW_INVEN);
window_flag[j] |= (PW_EQUIP);
- owner_ptr->window |= (PW_EQUIP);
+ owner_ptr->window_flags |= (PW_EQUIP);
continue;
}
if (window_flag[j] & PW_EQUIP) {
window_flag[j] &= ~(PW_EQUIP);
window_flag[j] |= PW_INVEN;
- owner_ptr->window |= PW_INVEN;
+ owner_ptr->window_flags |= PW_INVEN;
}
}
}