[Refactor] #37353 monster_living() の引数修正。 / Type replacement of monster_living()...

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

diff --git a/src/cmd2.c b/src/cmd2.c
index 3d7443d..67aa35c 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -2214,8 +2214,6 @@ void do_cmd_rest(void)
 
        /* Redraw the state */
        p_ptr->redraw |= (PR_STATE);
-
-       /* Handle stuff */
        handle_stuff();
 
        /* Refresh */
@@ -2824,8 +2822,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
        /* Start at the player */
        y = p_ptr->y;
        x = p_ptr->x;
-
-       /* Get local object */
        q_ptr = &forge;
 
        /* Obtain a local object */
@@ -2850,8 +2846,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
        }
 
        sound(SOUND_SHOOT);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        /* Save the old location */
@@ -2908,7 +2902,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
 
                        note_spot(ny, nx);
 
-                       /* Redraw */
                        lite_spot(ny, nx);
                }
 
@@ -2948,7 +2941,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
 
                        note_spot(ny, nx);
 
-                       /* Redraw */
                        lite_spot(ny, nx);
                }
 
@@ -3089,15 +3081,12 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
                                if (snipe_type == SP_HOLYNESS)
                                {
                                        cave[ny][nx].info |= (CAVE_GLOW);
-
                                        note_spot(ny, nx);
-
-                                       /* Redraw */
                                        lite_spot(ny, nx);
                                }
 
                                /* Hit the monster, check for death */
-                               if (mon_take_hit(c_mon_ptr->m_idx, tdam, &fear, extract_note_dies(real_r_ptr(m_ptr))))
+                               if (mon_take_hit(c_mon_ptr->m_idx, tdam, &fear, extract_note_dies(real_r_idx(m_ptr))))
                                {
                                        /* Dead monster */
                                }
@@ -3169,7 +3158,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
                                                        m_ptr->fy = ny;
 
                                                        /* Update the monster (new location) */
-                                                       update_mon(c_mon_ptr->m_idx, TRUE);
+                                                       update_monster(c_mon_ptr->m_idx, TRUE);
 
                                                        lite_spot(ny, nx);
                                                        lite_spot(oy, ox);
@@ -3440,8 +3429,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
                }
 
        }
-
-       /* Get local object */
        q_ptr = &forge;
 
        /* Obtain a local object */
@@ -3537,8 +3524,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
        y = p_ptr->y;
        x = p_ptr->x;
 
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        if ((p_ptr->pclass == CLASS_NINJA) && ((q_ptr->tval == TV_SPIKE) || ((have_flag(flgs, TR_THROW)) && (q_ptr->tval == TV_SWORD)))) shuriken = TRUE;
@@ -3692,7 +3677,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
                                        tdam, m_ptr->hp - tdam, m_ptr->maxhp, m_ptr->max_maxhp);
 
                                /* Hit the monster, check for death */
-                               if (mon_take_hit(c_ptr->m_idx, tdam, &fear, extract_note_dies(real_r_ptr(m_ptr))))
+                               if (mon_take_hit(c_ptr->m_idx, tdam, &fear, extract_note_dies(real_r_idx(m_ptr))))
                                {
                                        /* Dead monster */
                                }