#include "core/window-redrawer.h"
#include "dungeon/dungeon-flag-types.h"
#include "dungeon/dungeon.h"
-#include "floor/floor-save.h"
-#include "floor/floor.h"
+#include "floor/cave.h"
+#include "floor/floor-save-util.h"
#include "grid/grid.h"
#include "grid/trap.h"
#include "monster-race/monster-race.h"
#include "realm/realm-song.h"
#include "system/floor-type-definition.h"
#include "system/object-type-definition.h"
-#include "util/bit-flags-calculator.h"
#include "util/string-processor.h"
#include "view/display-messages.h"
}
}
- if (cave_have_flag_grid(g_ptr, flag)) {
+ if (cave_has_flag_grid(g_ptr, flag)) {
disclose_grid(caster_ptr, y, x);
g_ptr->info |= (CAVE_MARK);
lite_spot(caster_ptr, y, x);
continue;
if (!(r_ptr->flags2 & RF2_INVISIBLE) || caster_ptr->see_inv) {
- repair_monsters = TRUE;
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
update_monster(caster_ptr, i, FALSE);
flag = TRUE;
if (r_ptr->flags2 & RF2_INVISIBLE) {
if (caster_ptr->monster_race_idx == m_ptr->r_idx) {
- caster_ptr->window |= (PW_MONSTER);
+ caster_ptr->window_flags |= (PW_MONSTER);
}
- repair_monsters = TRUE;
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
update_monster(caster_ptr, i, FALSE);
flag = TRUE;
if (is_original_ap(m_ptr)) {
r_ptr->r_flags3 |= (RF3_EVIL);
if (caster_ptr->monster_race_idx == m_ptr->r_idx) {
- caster_ptr->window |= (PW_MONSTER);
+ caster_ptr->window_flags |= (PW_MONSTER);
}
}
- repair_monsters = TRUE;
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
update_monster(caster_ptr, i, FALSE);
flag = TRUE;
if (!monster_living(m_ptr->r_idx)) {
if (caster_ptr->monster_race_idx == m_ptr->r_idx) {
- caster_ptr->window |= (PW_MONSTER);
+ caster_ptr->window_flags |= (PW_MONSTER);
}
- repair_monsters = TRUE;
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
update_monster(caster_ptr, i, FALSE);
flag = TRUE;
if (!(r_ptr->flags2 & RF2_EMPTY_MIND)) {
if (caster_ptr->monster_race_idx == m_ptr->r_idx) {
- caster_ptr->window |= (PW_MONSTER);
+ caster_ptr->window_flags |= (PW_MONSTER);
}
- repair_monsters = TRUE;
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
update_monster(caster_ptr, i, FALSE);
flag = TRUE;
if (angband_strchr(Match, r_ptr->d_char)) {
if (caster_ptr->monster_race_idx == m_ptr->r_idx) {
- caster_ptr->window |= (PW_MONSTER);
+ caster_ptr->window_flags |= (PW_MONSTER);
}
- repair_monsters = TRUE;
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
update_monster(caster_ptr, i, FALSE);
flag = TRUE;
if (is_original_ap(m_ptr)) {
r_ptr->r_flags3 |= (match_flag);
if (caster_ptr->monster_race_idx == m_ptr->r_idx) {
- caster_ptr->window |= (PW_MONSTER);
+ caster_ptr->window_flags |= (PW_MONSTER);
}
}
- repair_monsters = TRUE;
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
update_monster(caster_ptr, i, FALSE);
flag = TRUE;