[Refactor] #37353 グローバル変数 dungeon_type を他の慣例に従い dungeon_idx に改名。 / Rename dungeon_typ...

[hengband/hengband.git] / src / monster-process.c

diff --git a/src/monster-process.c b/src/monster-process.c
index c0c616a..36fbf74 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -17,6 +17,11 @@
 #include "cmd-pet.h"
 #include "monsterrace-hook.h"
 #include "melee.h"
+#include "projection.h"
+#include "spells-summon.h"
+#include "quest.h"
+#include "avatar.h"
+#include "realm-hex.h"
 
 
 /*!
@@ -1448,7 +1453,7 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
        /* Not allowed to attack */
        if (r_ptr->flags1 & RF1_NEVER_BLOW) return FALSE;
 
-       if (d_info[dungeon_type].flags1 & DF1_NO_MELEE) return (FALSE);
+       if (d_info[dungeon_idx].flags1 & DF1_NO_MELEE) return (FALSE);
 
        /* Total armor */
        ac = tr_ptr->ac;
@@ -2844,7 +2849,7 @@ void process_monster(MONSTER_IDX m_idx)
                        }
 
                        /* In anti-melee dungeon, stupid or confused monster takes useless turn */
-                       if (do_move && (d_info[dungeon_type].flags1 & DF1_NO_MELEE))
+                       if (do_move && (d_info[dungeon_idx].flags1 & DF1_NO_MELEE))
                        {
                                if (!MON_CONFUSED(m_ptr))
                                {
@@ -2900,7 +2905,7 @@ void process_monster(MONSTER_IDX m_idx)
                                                if (monst_attack_monst(m_idx, c_ptr->m_idx)) return;
 
                                                /* In anti-melee dungeon, stupid or confused monster takes useless turn */
-                                               else if (d_info[dungeon_type].flags1 & DF1_NO_MELEE)
+                                               else if (d_info[dungeon_idx].flags1 & DF1_NO_MELEE)
                                                {
                                                        if (MON_CONFUSED(m_ptr)) return;
                                                        else if (r_ptr->flags2 & RF2_STUPID)
@@ -3040,8 +3045,6 @@ void process_monster(MONSTER_IDX m_idx)
                        else
                        {
                                /* sound(SOUND_WALK); */
-
-                               /* Move the player */
                                if (!move_player_effect(ny, nx, MPE_DONT_PICKUP)) break;
                        }