[Refactor] #37353 tsuri_dir を fishing_dir に改名して player_type 構造体に移動。

Change tsuri_dir to fishing_dir in player_type structure.

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index 64d2948..4ab06b7 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -1632,7 +1632,7 @@ bool activate_artifact(object_type *o_ptr)
                if (!get_direction(&dir, FALSE, FALSE)) return FALSE;
                y = p_ptr->y + ddy[dir];
                x = p_ptr->x + ddx[dir];
-               tsuri_dir = dir;
+               p_ptr->fishing_dir = dir;
                if (!cave_have_flag_bold(y, x, FF_WATER))
                {
                        msg_print(_("そこは水辺ではない。", "There is no fishing place."));

diff --git a/src/dungeon.c b/src/dungeon.c
index a824062..beb0c1c 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -4769,8 +4769,8 @@ static void process_player(void)
                        if (r_idx && one_in_(2))
                        {
                                POSITION y, x;
-                               y = p_ptr->y + ddy[tsuri_dir];
-                               x = p_ptr->x + ddx[tsuri_dir];
+                               y = p_ptr->y + ddy[p_ptr->fishing_dir];
+                               x = p_ptr->x + ddx[p_ptr->fishing_dir];
                                if (place_monster_aux(0, y, x, r_idx, PM_NO_KAGE))
                                {
                                        char m_name[80];

diff --git a/src/externs.h b/src/externs.h
index da08f8f..ec4ce37 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -385,7 +385,6 @@ extern MONRACE_IDX today_mon;
 extern bool write_level;
 extern u32b playtime;
 extern u32b start_time;
-extern int tsuri_dir;
 extern bool sukekaku;
 extern bool new_mane;
 extern bool mon_fight;

diff --git a/src/types.h b/src/types.h
index d41dd9c..7eec923 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -1218,6 +1218,7 @@ struct player_type
        ALIGNMENT align;                                /* Good/evil/neutral */
        POSITION run_py;
        POSITION run_px;
+       DIRECTION fishing_dir;
 
 
        /*** Extracted fields ***/

diff --git a/src/variable.c b/src/variable.c
index 5bd2d32..ce77189 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -876,8 +876,6 @@ bool write_level;
 u32b playtime;
 u32b start_time;
 
-int tsuri_dir;
-
 bool sukekaku;
 bool new_mane;