[Feature] fresh_afterコマンドの分割

[hengbandforosx/hengbandosx.git] / src / spell-kind / spells-genocide.c

diff --git a/src/spell-kind/spells-genocide.c b/src/spell-kind/spells-genocide.c
index 1b39b91..54dcf7e 100644 (file)
--- a/src/spell-kind/spells-genocide.c
+++ b/src/spell-kind/spells-genocide.c
@@ -1,20 +1,30 @@
 #include "spell-kind/spells-genocide.h"
+#include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "dungeon/quest.h"
-#include "floor/floor.h"
+#include "game-option/map-screen-options.h"
+#include "game-option/play-record-options.h"
+#include "game-option/special-options.h"
+#include "grid/grid.h"
+#include "io/cursor.h"
 #include "io/write-diary.h"
+#include "monster-floor/monster-remover.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"
-#include "monster/monster-status.h"
 #include "monster/monster-info.h"
-#include "monster/monster2.h"
-#include "player/avatar.h"
+#include "monster/monster-status-setter.h"
+#include "monster/monster-status.h"
+#include "player-info/avatar.h"
 #include "player/player-damage.h"
-#include "view/display-main-window.h"
+#include "system/floor-type-definition.h"
+#include "view/display-messages.h"
 
 /*!
  * @brief モンスターへの単体抹殺処理サブルーチン / Delete a non-unique/non-quest monster
@@ -57,7 +67,7 @@ bool genocide_aux(player_type *caster_ptr, MONSTER_IDX m_idx, int power, bool pl
     }
 
     if (resist && player_cast) {
-        bool see_m = is_seen(m_ptr);
+        bool see_m = is_seen(caster_ptr, m_ptr);
         GAME_TEXT m_name[MAX_NLEN];
         monster_desc(caster_ptr, m_name, m_ptr, 0);
         if (see_m) {
@@ -89,12 +99,12 @@ bool genocide_aux(player_type *caster_ptr, MONSTER_IDX m_idx, int power, bool pl
 
     move_cursor_relative(caster_ptr->y, caster_ptr->x);
     caster_ptr->redraw |= (PR_HP);
-    caster_ptr->window |= (PW_PLAYER);
+    caster_ptr->window_flags |= (PW_PLAYER);
     handle_stuff(caster_ptr);
-    Term_fresh();
+    term_fresh();
 
     int msec = delay_factor * delay_factor * delay_factor;
-    Term_xtra(TERM_XTRA_DELAY, msec);
+    term_xtra(TERM_XTRA_DELAY, msec);
 
     return !resist;
 }
@@ -112,7 +122,7 @@ bool symbol_genocide(player_type *caster_ptr, int power, bool player_cast)
     is_special_floor |= caster_ptr->current_floor_ptr->inside_arena;
     is_special_floor |= caster_ptr->phase_out;
     if (is_special_floor) {
-        msg_print(_("何も起きないようだ……", "It seems nothing happen here..."));
+        msg_print(_("何も起きないようだ……", "Nothing seems to happen..."));
         return FALSE;
     }