[Refactor] #38993 mon_fight を floor_type の monster_noise に置換．

diff --git a/src/core.c b/src/core.c
index 739f0c9..80e85ed 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3169,7 +3169,7 @@ static void process_world(void)
                        do_cmd_save_game(TRUE);
        }
 
-       if (mon_fight && !ignore_unview)
+       if (current_floor_ptr->monster_noise && !ignore_unview)
        {
                msg_print(_("何かが聞こえた。", "You hear noise."));
        }

diff --git a/src/externs.h b/src/externs.h
index 84474b4..8024564 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -183,7 +183,6 @@ extern bool write_level;
 extern u32b start_time;
 extern bool sukekaku;
 extern bool new_mane;
-extern bool mon_fight;
 extern bool generate_encounter;
 extern concptr screen_dump;
 

diff --git a/src/floor.h b/src/floor.h
index f9bec73..564ab58 100644 (file)
--- a/src/floor.h
+++ b/src/floor.h
@@ -44,6 +44,8 @@ typedef struct {
        POSITION redraw_y[REDRAW_MAX];
        POSITION redraw_x[REDRAW_MAX];
 
+       bool monster_noise;
+
 } floor_type;
 
 #define DUNGEON_MODE_NONE       0

diff --git a/src/melee1.c b/src/melee1.c
index cf102c8..72d62d6 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -4197,7 +4197,7 @@ void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear,
                                /* Unseen death by normal attack */
                                if (!seen)
                                {
-                                       mon_fight = TRUE;
+                                       current_floor_ptr->monster_noise = TRUE;
                                }
                                /* Death by special attack */
                                else if (note)

diff --git a/src/monster-process.c b/src/monster-process.c
index 4256b41..ba60cc9 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -1292,7 +1292,7 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
 
        if (!see_either && known)
        {
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
        }
 
        if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(TRUE, TRUE);
@@ -1837,7 +1837,7 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
                        }
                        else if (known)
                        {
-                               mon_fight = TRUE;
+                               current_floor_ptr->monster_noise = TRUE;
                        }
                }
                else
@@ -1848,7 +1848,7 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
                        }
                        else if (known)
                        {
-                               mon_fight = TRUE;
+                               current_floor_ptr->monster_noise = TRUE;
                        }
 
                        teleport_away(m_idx, MAX_SIGHT * 2 + 5, 0L);
@@ -3145,7 +3145,7 @@ void process_monsters(void)
        SPEED speed;
 
        /* Clear monster fighting indicator */
-       mon_fight = FALSE;
+       current_floor_ptr->monster_noise = FALSE;
 
        /* Memorize old race */
        old_monster_race_idx = p_ptr->monster_race_idx;

diff --git a/src/mspells4.c b/src/mspells4.c
index 4db052c..06accd3 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -122,7 +122,7 @@ static void monspell_message_base(MONSTER_IDX m_idx, MONSTER_IDX t_idx, concptr
        }
 
        if (mon_to_mon && known && !see_either)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -464,7 +464,7 @@ HIT_POINT spell_RF4_BREATH(int GF_TYPE, POSITION y, POSITION x, MONSTER_IDX m_id
        }
 
        if (mon_to_mon && known && !see_either)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 
        sound(SOUND_BREATH);
        breath(y, x, m_idx, GF_TYPE, dam, 0, TRUE, ms_type, TARGET_TYPE);
@@ -946,7 +946,7 @@ void spell_RF5_CAUSE(int GF_TYPE, HIT_POINT dam, POSITION y, POSITION x, MONSTER
                }
                else
                {
-                       mon_fight = TRUE;
+                       current_floor_ptr->monster_noise = TRUE;
                }
        }
        breath(y, x, m_idx, GF_TYPE, dam, 0, FALSE, MS_TYPE, TARGET_TYPE);
@@ -1405,7 +1405,7 @@ void spell_badstatus_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, concptr msg1,
                        }
                        else
                        {
-                               mon_fight = TRUE;
+                               current_floor_ptr->monster_noise = TRUE;
                        }
                }
 
@@ -2709,7 +2709,7 @@ void spell_RF6_S_KIN(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_id
                }
 
                if (mon_to_mon && known && !see_either)
-                       mon_fight = TRUE;
+                       current_floor_ptr->monster_noise = TRUE;
        }
 
        switch (m_ptr->r_idx)
@@ -2746,7 +2746,7 @@ void spell_RF6_S_KIN(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_id
                msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby."));
 
        if (known && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -2785,7 +2785,7 @@ void spell_RF6_S_CYBER(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_
                msg_print(_("重厚な足音が近くで聞こえる。", "You hear heavy steps nearby."));
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -2823,7 +2823,7 @@ void spell_RF6_S_MONSTER(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX
                msg_print(_("何かが間近に現れた音がする。", "You hear something appear nearby."));
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -2861,7 +2861,7 @@ void spell_RF6_S_MONSTERS(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX
                msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby."));
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -2895,7 +2895,7 @@ void spell_RF6_S_ANT(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_id
                msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby."));
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -2929,7 +2929,7 @@ void spell_RF6_S_SPIDER(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t
                msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby."));
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -2963,7 +2963,7 @@ void spell_RF6_S_HOUND(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_
                msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby."));
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -2997,7 +2997,7 @@ void spell_RF6_S_HYDRA(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_
                msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby."));
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -3046,7 +3046,7 @@ void spell_RF6_S_ANGEL(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_
        }
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -3079,7 +3079,7 @@ void spell_RF6_S_DEMON(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_
                msg_print(_("何かが間近に現れた音がする。", "You hear something appear nearby."));
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -3112,7 +3112,7 @@ void spell_RF6_S_UNDEAD(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t
                msg_print(_("何かが間近に現れた音がする。", "You hear something appear nearby."));
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -3145,7 +3145,7 @@ void spell_RF6_S_DRAGON(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t
                msg_print(_("何かが間近に現れた音がする。", "You hear something appear nearby."));
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -3256,7 +3256,7 @@ void spell_RF6_S_HI_UNDEAD(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_ID
        }
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -3296,7 +3296,7 @@ void spell_RF6_S_HI_DRAGON(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_ID
        }
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -3332,7 +3332,7 @@ void spell_RF6_S_AMBERITES(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_ID
        }
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 /*!
@@ -3384,7 +3384,7 @@ void spell_RF6_S_UNIQUE(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t
        }
        
        if (monster_near_player(m_idx, t_idx) && !see_monster(t_idx) && count && mon_to_mon)
-               mon_fight = TRUE;
+               current_floor_ptr->monster_noise = TRUE;
 }
 
 

diff --git a/src/spells1.c b/src/spells1.c
index a961774..37dcf05 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -3796,7 +3796,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                }
                                else
                                {
-                                       mon_fight = TRUE;
+                                       current_floor_ptr->monster_noise = TRUE;
                                }
                        }
 
@@ -3827,7 +3827,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        }
                        else
                        {
-                               mon_fight = TRUE;
+                               current_floor_ptr->monster_noise = TRUE;
                        }
 
                        /* Hack -- handle sleep */

diff --git a/src/variable.c b/src/variable.c
index 4e39864..bd97dfb 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -412,8 +412,6 @@ u32b start_time;
 bool sukekaku;
 bool new_mane;
 
-bool mon_fight;
-
 bool generate_encounter;
 
 concptr screen_dump = NULL;