[Refactor] #37353 spells-floor.c/h 追加。 / Add spells-floor.c/h.

[hengband/hengband.git] / src / dungeon.c

diff --git a/src/dungeon.c b/src/dungeon.c
index 40ba4db..c88b4d2 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -28,6 +28,7 @@
 #include "spells-summon.h"
 #include "spells-object.h"
 #include "spells-status.h"
+#include "spells-floor.h"
 #include "monsterrace-hook.h"
 #include "world.h"
 #include "mutation.h"
@@ -37,6 +38,9 @@
 #include "player-status.h"
 #include "cmd-spell.h"
 #include "realm-hex.h"
+#include "object-hook.h"
+#include "wild.h"
+
 
 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
 static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/
@@ -1177,7 +1181,7 @@ static void check_music(void)
 
        if (p_ptr->anti_magic)
        {
-               stop_singing();
+               stop_singing(p_ptr);
                return;
        }
 
@@ -1192,7 +1196,7 @@ static void check_music(void)
 
        if (s64b_cmp(p_ptr->csp, p_ptr->csp_frac, need_mana, need_mana_frac) < 0)
        {
-               stop_singing();
+               stop_singing(p_ptr);
                return;
        }
        else
@@ -2507,7 +2511,7 @@ static void process_world_aux_mutation(void)
                msg_print(_("胃が痙攣し、食事を失った！", "Your stomach roils, and you lose your lunch!"));
                msg_print(NULL);
                set_food(PY_FOOD_WEAK);
-               if (music_singing_any()) stop_singing();
+               if (music_singing_any()) stop_singing(p_ptr);
                if (hex_spelling_any()) stop_hex_spell_all();
        }
 
@@ -3405,12 +3409,12 @@ static void process_world(void)
                for (i2 = 0; i2 < cur_wid; ++i2)
                        for (j2 = 0; j2 < cur_hgt; j2++)
                        {
-                               grid_type *c_ptr = &grid_array[j2][i2];
+                               grid_type *g_ptr = &grid_array[j2][i2];
 
-                               if ((c_ptr->m_idx > 0) && (c_ptr->m_idx != p_ptr->riding))
+                               if ((g_ptr->m_idx > 0) && (g_ptr->m_idx != p_ptr->riding))
                                {
                                        number_mon++;
-                                       win_m_idx = c_ptr->m_idx;
+                                       win_m_idx = g_ptr->m_idx;
                                }
                        }
 
@@ -3658,7 +3662,7 @@ static void process_world(void)
                                change_wild_mode();
 
                                /* Give first move to monsters */
-                               take_turn(p_ptr, 100);;
+                               take_turn(p_ptr, 100);
 
                                /* HACk -- set the encouter flag for the wilderness generation */
                                generate_encounter = TRUE;
@@ -4997,7 +5001,7 @@ static void process_player(void)
                /* Paralyzed or Knocked Out */
                else if (p_ptr->paralyzed || (p_ptr->stun >= 100))
                {
-                       take_turn(p_ptr, 100);;
+                       take_turn(p_ptr, 100);
                }
 
                /* Resting */
@@ -5013,13 +5017,13 @@ static void process_player(void)
                                p_ptr->redraw |= (PR_STATE);
                        }
 
-                       take_turn(p_ptr, 100);;
+                       take_turn(p_ptr, 100);
                }
 
                /* Fishing */
                else if (p_ptr->action == ACTION_FISH)
                {
-                       take_turn(p_ptr, 100);;
+                       take_turn(p_ptr, 100);
                }
 
                /* Running */