[Refactor] #37353 コメント整理。 / Refactor comments.

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index 82dbc77..c9bb312 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -420,7 +420,6 @@ bool do_riding(bool force)
        p_ptr->redraw |= (PR_MAP | PR_EXTRA);
        p_ptr->redraw |= (PR_UHEALTH);
 
-       /* Move the player */
        (void)move_player_effect(y, x, MPE_HANDLE_STUFF | MPE_ENERGY_USE | MPE_DONT_PICKUP | MPE_DONT_SWAP_MON);
 
        return TRUE;
@@ -1167,7 +1166,6 @@ bool rakuba(HIT_POINT dam, bool force)
                fall_dam = TRUE;
        }
 
-       /* Move the player */
        if (sy && !p_ptr->is_dead)
                (void)move_player_effect(p_ptr->y, p_ptr->x, MPE_DONT_PICKUP | MPE_DONT_SWAP_MON);
 

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index e88f6bf..cf642b5 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -232,7 +232,7 @@ concptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode)
 static int get_spell(SPELL_IDX *sn, concptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX use_realm)\r
 {\r
        int i;\r
-       SPELL_IDX   spell = -1;\r
+       SPELL_IDX spell = -1;\r
        int num = 0;\r
        int ask = TRUE;\r
        MANA_POINT need_mana;\r

diff --git a/src/cmd1.c b/src/cmd1.c
index 7db62c0..204b195 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -555,9 +555,7 @@ void carry(bool pickup)
        verify_panel();
 
        p_ptr->update |= (PU_MONSTERS);
-
        p_ptr->redraw |= (PR_MAP);
-
        p_ptr->window |= (PW_OVERHEAD);
        handle_stuff();
 
@@ -613,7 +611,6 @@ void carry(bool pickup)
 
                        /* Redraw gold */
                        p_ptr->redraw |= (PR_GOLD);
-
                        p_ptr->window |= (PW_PLAYER);
                }
 
@@ -774,8 +771,7 @@ bool pattern_seq(POSITION c_y, POSITION c_x, POSITION n_y, POSITION n_x)
                                        return TRUE; /* Goof-up */
                        }
 
-                       if ((pattern_type_new == ok_move) ||
-                           (pattern_type_new == pattern_type_cur))
+                       if ((pattern_type_new == ok_move) || (pattern_type_new == pattern_type_cur))
                                return TRUE;
                        else
                        {
@@ -839,7 +835,6 @@ bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode)
                MONSTER_IDX om_idx = oc_ptr->m_idx;
                MONSTER_IDX nm_idx = c_ptr->m_idx;
 
-               /* Move the player */
                p_ptr->y = ny;
                p_ptr->x = nx;
 
@@ -1215,10 +1210,8 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
                p_can_enter = FALSE;
        }
 
-       /* Get the monster */
        m_ptr = &m_list[c_ptr->m_idx];
 
-
        if (inventory[INVEN_RARM].name1 == ART_STORMBRINGER) stormbringer = TRUE;
        if (inventory[INVEN_LARM].name1 == ART_STORMBRINGER) stormbringer = TRUE;
 
@@ -1508,7 +1501,6 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
                if (do_pickup != always_pickup) mpe_mode |= MPE_DO_PICKUP;
                if (break_trap) mpe_mode |= MPE_BREAK_TRAP;
 
-               /* Move the player */
                (void)move_player_effect(y, x, mpe_mode);
        }
 }

diff --git a/src/mind.c b/src/mind.c
index 6aa219b..760afe1 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -1516,8 +1516,6 @@ static bool cast_berserk_spell(int spell)
                if (player_can_enter(cave[y][x].feat, 0) && !is_trap(cave[y][x].feat) && !cave[y][x].m_idx)
                {
                        msg_print(NULL);
-
-                       /* Move the player */
                        (void)move_player_effect(y, x, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP);
                }
                break;

diff --git a/src/monster-process.c b/src/monster-process.c
index 7afce50..676f759 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -3044,8 +3044,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;
                        }
 

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index b1c6307..3cdf509 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -202,8 +202,6 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        if (player_can_enter(cave[y][x].feat, 0) && !is_trap(cave[y][x].feat) && !cave[y][x].m_idx)
                        {
                                msg_print(NULL);
-
-                               /* Move the player */
                                (void)move_player_effect(y, x, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP);
                        }
                }
@@ -527,8 +525,6 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                y = p_ptr->y + ddy_ddd[dir];
                                x = p_ptr->x + ddx_ddd[dir];
                                c_ptr = &cave[y][x];
-
-                               /* Get the monster */
                                m_ptr = &m_list[c_ptr->m_idx];
 
                                /* Hack -- attack monsters */
@@ -690,7 +686,6 @@ concptr do_hissatsu_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                /* Player can move forward? */
                                if (player_can_enter(c_ptr->feat, 0))
                                {
-                                       /* Move the player */
                                        if (!move_player_effect(y, x, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP)) break;
                                }
                                else

diff --git a/src/spells3.c b/src/spells3.c
index 1bb37b7..b619ae4 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -361,9 +361,7 @@ bool teleport_player_aux(POSITION dis, BIT_FLAGS mode)
                msg_format("『こっちだぁ、%s』", p_ptr->name);
 #endif
 
-       /* Move the player */
        (void)move_player_effect(y, x, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP);
-
        return TRUE;
 }
 
@@ -505,8 +503,6 @@ void teleport_player_to(POSITION ny, POSITION nx, BIT_FLAGS mode)
        }
 
        sound(SOUND_TELEPORT);
-
-       /* Move the player */
        (void)move_player_effect(y, x, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP);
 }
 
@@ -4566,8 +4562,8 @@ bool eat_magic(int power)
 void massacre(void)
 {
        POSITION x, y;
-       cave_type       *c_ptr;
-       monster_type    *m_ptr;
+       cave_type *c_ptr;
+       monster_type *m_ptr;
        DIRECTION dir;
 
        for (dir = 0; dir < 8; dir++)
@@ -4575,8 +4571,6 @@ void massacre(void)
                y = p_ptr->y + ddy_ddd[dir];
                x = p_ptr->x + ddx_ddd[dir];
                c_ptr = &cave[y][x];
-
-               /* Get the monster */
                m_ptr = &m_list[c_ptr->m_idx];
 
                /* Hack -- attack monsters */
@@ -4641,7 +4635,6 @@ bool eat_lock(void)
        /* Destroy the wall */
        cave_alter_feat(y, x, FF_HURT_ROCK);
 
-       /* Move the player */
        (void)move_player_effect(y, x, MPE_DONT_PICKUP);
        return TRUE;
 }