[Refactor] #37353 メッセージ整理と型の置換 / Refactor messages and type replacement.

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

diff --git a/src/cave.c b/src/cave.c
index fadd537..ab8f673 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -423,7 +423,7 @@ static bool check_local_illumination(POSITION y, POSITION x)
        if (player_has_los_bold((Y), (X))) \
        { \
                /* Update the monster */ \
-               if (cave[(Y)][(X)].m_idx) update_mon(cave[(Y)][(X)].m_idx, FALSE); \
+               if (cave[(Y)][(X)].m_idx) update_monster(cave[(Y)][(X)].m_idx, FALSE); \
 \
                /* Notice and redraw */ \
                note_spot((Y), (X)); \
@@ -626,8 +626,6 @@ bool cave_valid_bold(POSITION y, POSITION x)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -1195,8 +1193,6 @@ void map_info(POSITION y, POSITION x, TERM_COLOR *ap, char *cp, TERM_COLOR *tap,
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -1663,7 +1659,6 @@ void prt_map(void)
 
        int wid, hgt;
 
-       /* Get size */
        Term_get_size(&wid, &hgt);
 
        /* Remove map offset */
@@ -1750,17 +1745,14 @@ void prt_path(POSITION y, POSITION x)
        /* Get projection path */
        path_n = project_path(path_g, (project_length ? project_length : MAX_RANGE), p_ptr->y, p_ptr->x, y, x, PROJECT_PATH|PROJECT_THRU);
 
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
-
-       /* Redraw stuff */
        redraw_stuff();
 
        /* Draw path */
        for (i = 0; i < path_n; i++)
        {
-               int ny = GRID_Y(path_g[i]);
-               int nx = GRID_X(path_g[i]);
+               POSITION ny = GRID_Y(path_g[i]);
+               POSITION nx = GRID_X(path_g[i]);
                cave_type *c_ptr = &cave[ny][nx];
 
                if (panel_contains(ny, nx))
@@ -1768,8 +1760,8 @@ void prt_path(POSITION y, POSITION x)
                        TERM_COLOR a = default_color;
                        char c;
 
-                       TERM_COLOR ta;
-                       char tc;
+                       TERM_COLOR ta = default_color;
+                       char tc = '*';
 
                        if (c_ptr->m_idx && m_list[c_ptr->m_idx].ml)
                        {
@@ -1929,7 +1921,6 @@ void display_map(int *cy, int *cx)
        int **match_autopick_yx;
        object_type ***object_autopick_yx;
 
-       /* Get size */
        Term_get_size(&wid, &hgt);
        hgt -= 2;
        wid -= 14;
@@ -2200,7 +2191,6 @@ void do_cmd_view_map(void)
        /* Note */
        prt(_("お待ち下さい...", "Please wait..."), 0, 0);
 
-       /* Flush */
        Term_fresh();
 
        /* Clear the screen */
@@ -2507,7 +2497,6 @@ void forget_lite(void)
                /* Forget "LITE" flag */
                cave[y][x].info &= ~(CAVE_LITE);
 
-               /* Redraw */
                /* lite_spot(y, x); Perhaps don't need? */
        }
 
@@ -3332,8 +3321,6 @@ void forget_view(void)
        {
                POSITION y = view_y[i];
                POSITION x = view_x[i];
-
-               /* Access the grid */
                c_ptr = &cave[y][x];
 
                /* Forget that the grid is viewable */
@@ -3414,8 +3401,6 @@ static bool update_view_aux(POSITION y, POSITION x, POSITION y1, POSITION x1, PO
        /* Totally blocked by "unviewable neighbors" */
        if (!v1 && !v2) return (TRUE);
 
-
-       /* Access the grid */
        c_ptr = &cave[y][x];
 
 
@@ -3615,8 +3600,6 @@ void update_view(void)
        {
                y = view_y[n];
                x = view_x[n];
-
-               /* Access the grid */
                c_ptr = &cave[y][x];
 
                /* Mark the grid as not in "view" */
@@ -3639,8 +3622,6 @@ void update_view(void)
        /* Now start on the player */
        y = p_ptr->y;
        x = p_ptr->x;
-
-       /* Access the grid */
        c_ptr = &cave[y][x];
 
        /* Assume the player grid is easily viewable */
@@ -3988,8 +3969,6 @@ void update_view(void)
        {
                y = view_y[n];
                x = view_x[n];
-
-               /* Access the grid */
                c_ptr = &cave[y][x];
 
                /* Clear the "CAVE_XTRA" flag */
@@ -4007,8 +3986,6 @@ void update_view(void)
        {
                y = temp_y[n];
                x = temp_x[n];
-
-               /* Access the grid */
                c_ptr = &cave[y][x];
 
                /* No longer in the array */
@@ -4043,8 +4020,6 @@ void delayed_visual_update(void)
        {
                y = redraw_y[i];
                x = redraw_x[i];
-
-               /* Access the grid */
                c_ptr = &cave[y][x];
 
                /* Update only needed grids (prevent multiple updating) */
@@ -4053,11 +4028,10 @@ void delayed_visual_update(void)
                /* If required, note */
                if (c_ptr->info & CAVE_NOTE) note_spot(y, x);
 
-               /* Redraw */
                lite_spot(y, x);
 
                /* Hack -- Visual update of monster on this grid */
-               if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
+               if (c_ptr->m_idx) update_monster(c_ptr->m_idx, FALSE);
 
                /* No longer in the array */
                c_ptr->info &= ~(CAVE_NOTE | CAVE_REDRAW);
@@ -4346,7 +4320,6 @@ void map_area(POSITION range)
                }
        }
 
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
 
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
@@ -4450,12 +4423,8 @@ void wiz_lite(bool ninja)
                }
        }
 
-       /* Update the monsters */
        p_ptr->update |= (PU_MONSTERS);
-
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
-
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
        if (p_ptr->special_defense & NINJA_S_STEALTH)
@@ -4518,18 +4487,10 @@ void wiz_dark(void)
        /* Forget travel route when we have forgotten map */
        forget_travel_flow();
 
-       /* Mega-Hack -- Forget the view and lite */
        p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
-
-       /* Update the view and lite */
        p_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE);
-
-       /* Update the monsters */
        p_ptr->update |= (PU_MONSTERS);
-
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
-
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 }
 
@@ -4590,14 +4551,10 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
 
        /* Check for change to boring grid */
        if (!have_flag(f_ptr->flags, FF_REMEMBER)) c_ptr->info &= ~(CAVE_MARK);
+       if (c_ptr->m_idx) update_monster(c_ptr->m_idx, FALSE);
 
-       /* Update the monster */
-       if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
-
-       /* Notice */
        note_spot(y, x);
 
-       /* Redraw */
        lite_spot(y, x);
 
        /* Check if los has changed */
@@ -4631,13 +4588,10 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
 
                        if (player_has_los_grid(cc_ptr))
                        {
-                               /* Update the monster */
-                               if (cc_ptr->m_idx) update_mon(cc_ptr->m_idx, FALSE);
+                               if (cc_ptr->m_idx) update_monster(cc_ptr->m_idx, FALSE);
 
-                               /* Notice */
                                note_spot(yy, xx);
 
-                               /* Redraw */
                                lite_spot(yy, xx);
                        }
 
@@ -4774,17 +4728,13 @@ void remove_mirror(POSITION y, POSITION x)
        {
                c_ptr->info &= ~(CAVE_GLOW);
                if (!view_torch_grids) c_ptr->info &= ~(CAVE_MARK);
-
-               /* Update the monster */
-               if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
+               if (c_ptr->m_idx) update_monster(c_ptr->m_idx, FALSE);
 
                update_local_illumination(y, x);
        }
 
-       /* Notice */
        note_spot(y, x);
 
-       /* Redraw */
        lite_spot(y, x);
 }
 
@@ -5011,7 +4961,7 @@ void object_kind_track(KIND_OBJECT_IDX k_idx)
  *
  * All disturbance cancels repeated commands, resting, and running.
  */
-void disturb(int stop_search, int stop_travel)
+void disturb(bool stop_search, bool stop_travel)
 {
 #ifndef TRAVEL
        /* Unused */
@@ -5109,7 +5059,6 @@ void glow_deep_lava_and_bldg(void)
        /* Update the view and lite */
        p_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE);
 
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
 }