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

diff --git a/src/bldg.c b/src/bldg.c
index 59443e1..e3c5c8d 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3125,7 +3125,6 @@ static PRICE repair_broken_weapon_aux(PRICE bcost)
        /* Clear screen */
        clear_bldg(0, 22);
 
-       /* Notice */
        prt(_("修復には材料となるもう1つの武器が必要です。", "Hand one material weapon to repair a broken weapon."), row, 2);
        prt(_("材料に使用した武器はなくなります！", "The material weapon will disappear after repairing!!"), row+1, 2);
 

diff --git a/src/cave.c b/src/cave.c
index fadd537..c8f9d0e 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -4594,7 +4594,6 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
        /* Update the monster */
        if (c_ptr->m_idx) update_mon(c_ptr->m_idx, FALSE);
 
-       /* Notice */
        note_spot(y, x);
 
        /* Redraw */
@@ -4634,7 +4633,6 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat)
                                /* Update the monster */
                                if (cc_ptr->m_idx) update_mon(cc_ptr->m_idx, FALSE);
 
-                               /* Notice */
                                note_spot(yy, xx);
 
                                /* Redraw */
@@ -4781,7 +4779,6 @@ void remove_mirror(POSITION y, POSITION x)
                update_local_illumination(y, x);
        }
 
-       /* Notice */
        note_spot(y, x);
 
        /* Redraw */

diff --git a/src/cmd1.c b/src/cmd1.c
index 68bca05..69dabc8 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -1476,7 +1476,6 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
                        }
                }
 
-               /* Disturb the player */
                disturb(0, 1);
 
                if (!boundary_floor(c_ptr, f_ptr, mimic_f_ptr)) sound(SOUND_HITWALL);

diff --git a/src/cmd2.c b/src/cmd2.c
index 03a6fdb..15a2032 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -2964,7 +2964,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
                {
                        cave[ny][nx].info |= (CAVE_GLOW);
 
-                       /* Notice */
                        note_spot(ny, nx);
 
                        /* Redraw */
@@ -3005,7 +3004,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
                {
                        cave[ny][nx].info &= ~(CAVE_GLOW | CAVE_MARK);
 
-                       /* Notice */
                        note_spot(ny, nx);
 
                        /* Redraw */
@@ -3150,7 +3148,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
                                {
                                        cave[ny][nx].info |= (CAVE_GLOW);
 
-                                       /* Notice */
                                        note_spot(ny, nx);
 
                                        /* Redraw */

diff --git a/src/effects.c b/src/effects.c
index ad8889e..5e160e9 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -3187,7 +3187,6 @@ bool set_stun(TIME_EFFECT v)
                /* Hex */
                if (hex_spelling_any()) stop_hex_spell_all();
 
-               /* Notice */
                notice = TRUE;
        }
 
@@ -3205,7 +3204,6 @@ bool set_stun(TIME_EFFECT v)
                        break;
                }
 
-               /* Notice */
                notice = TRUE;
        }
 
@@ -3380,7 +3378,6 @@ bool set_cut(TIME_EFFECT v)
                        case 7: msg_print(_("致命的な傷を負ってしまった。", "You have been given a mortal wound.")); break;
                }
 
-               /* Notice */
                notice = TRUE;
 
                if (randint1(1000) < v || one_in_(16))
@@ -3407,7 +3404,6 @@ bool set_cut(TIME_EFFECT v)
                        break;
                }
 
-               /* Notice */
                notice = TRUE;
        }
 
@@ -3919,7 +3915,6 @@ bool hp_player(int num)
                        msg_print(_("ひじょうに気分が良くなった。", "You feel very good."));
                }
 
-               /* Notice */
                return (TRUE);
        }
 
@@ -4008,7 +4003,6 @@ bool do_res_stat(int stat)
        {
                msg_format(_("元通りに%sなった気がする。", "You feel less %s."), desc_stat_pos[stat]);
 
-               /* Notice */
                return (TRUE);
        }
 
@@ -4045,7 +4039,6 @@ bool do_inc_stat(int stat)
 
                msg_format(_("ワーオ！とても%sなった！", "Wow!  You feel very %s!"), desc_stat_pos[stat]);
 
-               /* Notice */
                return (TRUE);
        }
 
@@ -4054,7 +4047,6 @@ bool do_inc_stat(int stat)
        {
                msg_format(_("元通りに%sなった気がする。", "You feel less %s."), desc_stat_pos[stat]);
 
-               /* Notice */
                return (TRUE);
        }
 

diff --git a/src/files.c b/src/files.c
index 8c8d5a0..9b439c3 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -6106,7 +6106,6 @@ void do_cmd_save_game(int is_autosave)
        }
        else
        {
-               /* Disturb the player */
                disturb(1, 1);
        }
 

diff --git a/src/melee1.c b/src/melee1.c
index 596a8b8..a2ba996 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -1338,7 +1338,6 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
        char            m_name[80];
 
-       /* Disturb the player */
        disturb(0, 1);
 
        p_ptr->energy_use = 100;
@@ -2350,7 +2349,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                o_ptr->xtra4 -= (s16b)(250 + randint1(250));
                                                if (o_ptr->xtra4 < 1) o_ptr->xtra4 = 1;
 
-                                               /* Notice */
                                                if (!p_ptr->blind)
                                                {
                                                        msg_print(_("明かりが暗くなってしまった。", "Your light dims."));

diff --git a/src/monster-process.c b/src/monster-process.c
index 78d6097..ecb09b1 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -2818,7 +2818,6 @@ void process_monster(MONSTER_IDX m_idx)
                                /* Allow movement */
                                do_move = TRUE;
 
-                               /* Notice */
                                note_spot(ny, nx);
                        }
                }

diff --git a/src/monster2.c b/src/monster2.c
index 1f82bb3..cfc7291 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -3089,7 +3089,6 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I
                        c_ptr->info &= ~(CAVE_OBJECT);
                        c_ptr->mimic = 0;
 
-                       /* Notice */
                        note_spot(y, x);
                }
                else return FALSE;

diff --git a/src/object2.c b/src/object2.c
index 5164bdd..68de8bd 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -4958,7 +4958,6 @@ void place_object(POSITION y, POSITION x, BIT_FLAGS mode)
                /* Place the object */
                c_ptr->o_idx = o_idx;
 
-               /* Notice */
                note_spot(y, x);
 
                /* Redraw */
@@ -5080,7 +5079,6 @@ void place_gold(POSITION y, POSITION x)
                /* Place the object */
                c_ptr->o_idx = o_idx;
 
-               /* Notice */
                note_spot(y, x);
 
                /* Redraw */

diff --git a/src/spells1.c b/src/spells1.c
index be4b48c..f58adf6 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -904,7 +904,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                                c_ptr->mimic = old_mimic;
 
-                               /* Notice */
                                note_spot(y, x);
 
                                /* Redraw */
@@ -996,7 +995,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        c_ptr->info |= CAVE_OBJECT;
                        c_ptr->mimic = feat_glyph;
 
-                       /* Notice */
                        note_spot(y, x);
 
                        /* Redraw */
@@ -1075,7 +1073,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        {
                                c_ptr->info |= (CAVE_GLOW);
 
-                               /* Notice */
                                note_spot(y, x);
 
                                /* Redraw */
@@ -1139,7 +1136,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                        /* Forget */
                                        c_ptr->info &= ~(CAVE_MARK);
 
-                                       /* Notice */
                                        note_spot(y, x);
                                }
 
@@ -1148,7 +1144,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                                update_local_illumination(y, x);
 
-                               /* Notice */
                                if (player_can_see_bold(y, x)) obvious = TRUE;
 
                                /* Mega-Hack -- Update the monster in the affected grid */
@@ -1483,7 +1478,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                                /* Identify */
                                                object_known(o_ptr);
 
-                                               /* Notice */
                                                if (known && (o_ptr->marked & OM_FOUND))
                                                {
                                                        msg_print(_("カチッと音がした！", "Click!"));

diff --git a/src/spells2.c b/src/spells2.c
index 13e2d91..8d5b444 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -2462,7 +2462,6 @@ static void cave_temp_room_unlite(void)
                                /* Forget the grid */
                                if (!view_torch_grids) c_ptr->info &= ~(CAVE_MARK);
 
-                               /* Notice */
                                note_spot(y, x);
                        }
 

diff --git a/src/spells3.c b/src/spells3.c
index 6ac0411..8e0fae0 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1007,7 +1007,6 @@ msg_format("%s(%c)は劣化を跳ね返した！",o_name, index_to_label(t) );
 #endif
 
 
-               /* Notice */
                return (TRUE);
        }
 
@@ -1057,7 +1056,6 @@ msg_format("%s(%c)は劣化を跳ね返した！",o_name, index_to_label(t) );
                calc_android_exp();
        }
 
-       /* Notice */
        return (TRUE);
 }
 
@@ -1730,7 +1728,6 @@ bool warding_glyph(void)
        cave[p_ptr->y][p_ptr->x].info |= CAVE_OBJECT;
        cave[p_ptr->y][p_ptr->x].mimic = feat_glyph;
 
-       /* Notice */
        note_spot(p_ptr->y, p_ptr->x);
 
        /* Redraw */
@@ -1758,7 +1755,6 @@ bool place_mirror(void)
        /* Turn on the light */
        cave[p_ptr->y][p_ptr->x].info |= CAVE_GLOW;
 
-       /* Notice */
        note_spot(p_ptr->y, p_ptr->x);
 
        /* Redraw */
@@ -1787,7 +1783,6 @@ bool explosive_rune(void)
        cave[p_ptr->y][p_ptr->x].info |= CAVE_OBJECT;
        cave[p_ptr->y][p_ptr->x].mimic = feat_explosive_rune;
 
-       /* Notice */
        note_spot(p_ptr->y, p_ptr->x);
        
        /* Redraw */
@@ -4874,7 +4869,6 @@ bool curse_weapon_object(bool force, object_type *o_ptr)
                p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
        }
 
-       /* Notice */
        return (TRUE);
 }
 
@@ -4927,7 +4921,6 @@ bool brand_bolts(void)
                /* Enchant */
                enchant(o_ptr, randint0(3) + 4, ENCH_TOHIT | ENCH_TODAM);
 
-               /* Notice */
                return (TRUE);
        }
 
@@ -4937,7 +4930,6 @@ bool brand_bolts(void)
        /* Fail */
        msg_print(_("炎で強化するのに失敗した。", "The fiery enchantment failed."));
 
-       /* Notice */
        return (TRUE);
 }
 

diff --git a/src/trap.c b/src/trap.c
index 97eeb97..f2b92d5 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -88,7 +88,6 @@ void disclose_grid(POSITION y, POSITION x)
                /* No longer hidden */\r
                c_ptr->mimic = 0;\r
 \r
-               /* Notice */\r
                note_spot(y, x);\r
 \r
                /* Redraw */\r
@@ -134,7 +133,8 @@ void place_trap(POSITION y, POSITION x)
 */\r
 static int check_hit(int power)\r
 {\r
-       int k, ac;\r
+       int k;\r
+       ARMOUR_CLASS ac;\r
 \r
        /* Percentile dice */\r
        k = randint0(100);\r
@@ -220,7 +220,6 @@ static void hit_trap_pit(int trap_feat_type)
                }\r
        }\r
 \r
-       /* Take the damage */\r
        take_hit(DAMAGE_NOESCAPE, dam, trap_name, -1);\r
 }\r
 \r
@@ -305,7 +304,6 @@ void hit_trap(bool break_trap)
        int trap_feat_type = have_flag(f_ptr->flags, FF_TRAP) ? f_ptr->subtype : NOT_TRAP;\r
        cptr name = _("トラップ", "a trap");\r
 \r
-       /* Disturb the player */\r
        disturb(0, 1);\r
 \r
        cave_alter_feat(y, x, FF_HIT_TRAP);\r

diff --git a/src/wizard2.c b/src/wizard2.c
index 0cb5f73..e5008e8 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1758,7 +1758,6 @@ static void do_cmd_wiz_create_feature(void)
        else if (have_flag(f_ptr->flags, FF_MIRROR))
                c_ptr->info |= (CAVE_GLOW | CAVE_OBJECT);
 
-       /* Notice */
        note_spot(y, x);
 
        /* Redraw */