[Refactor] #37353 ソース整形。

Refactor sources.

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index deb2b94..cc92967 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -159,7 +159,6 @@ void do_cmd_activate_aux(INVENTORY_IDX item)
        /* Activate the artifact */
        msg_print(_("始動させた...", "You activate it..."));
 
-       /* Sound */
        sound(SOUND_ZAP);
 
        /* Activate object */

diff --git a/src/cmd-eat.c b/src/cmd-eat.c
index 2251dc0..4b686af 100644 (file)
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -35,7 +35,6 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
                o_ptr = &o_list[0 - item];\r
        }\r
 \r
-       /* Sound */\r
        sound(SOUND_EAT);\r
 \r
        /* Take a turn */\r

diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c
index 66ebeb5..d942567 100644 (file)
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -77,7 +77,6 @@ void do_cmd_quaff_potion_aux(INVENTORY_IDX item)
                floor_item_optimize(0 - item);\r
        }\r
 \r
-       /* Sound */\r
        sound(SOUND_QUAFF);\r
 \r
 \r

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index eac4502..461e2f8 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -403,7 +403,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
        }\r
 \r
 \r
-       /* Sound */\r
        sound(SOUND_ZAP);\r
 \r
        ident = staff_effect(o_ptr->sval, &use_charge, FALSE, FALSE, object_is_aware(o_ptr));\r

diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c
index f8d430f..eafbe11 100644 (file)
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -359,7 +359,6 @@ void do_cmd_zap_rod_aux(INVENTORY_IDX item)
                return;
        }
 
-       /* Sound */
        sound(SOUND_ZAP);
 
        ident = rod_effect(o_ptr->sval, dir, &use_charge, FALSE, FALSE);

diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c
index c3de66e..7e84347 100644 (file)
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -403,7 +403,6 @@ void do_cmd_aim_wand_aux(INVENTORY_IDX item)
                return;
        }
 
-       /* Sound */
        sound(SOUND_ZAP);
 
        ident = wand_effect(o_ptr->sval, dir, FALSE, FALSE);

diff --git a/src/cmd1.c b/src/cmd1.c
index f7cda57..5dd813c 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -1492,7 +1492,6 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
                /* Disturb the player */
                disturb(0, 1);
 
-               /* Sound */
                if (!boundary_floor(c_ptr, f_ptr, mimic_f_ptr)) sound(SOUND_HITWALL);
        }
 
@@ -1548,7 +1547,6 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
                        p_ptr->update |= (PU_FLOW);
                }
 
-               /* Sound */
                /* sound(SOUND_WALK); */
 
 #ifdef ALLOW_EASY_DISARM /* TNB */

diff --git a/src/cmd2.c b/src/cmd2.c
index 7a1a95b..8f61f25 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -721,7 +721,6 @@ static bool do_cmd_open_aux(int y, int x)
                        /* Open the door */
                        cave_alter_feat(y, x, FF_OPEN);
 
-                       /* Sound */
                        sound(SOUND_OPENDOOR);
 
                        /* Experience */
@@ -748,7 +747,6 @@ static bool do_cmd_open_aux(int y, int x)
                /* Open the door */
                cave_alter_feat(y, x, FF_OPEN);
 
-               /* Sound */
                sound(SOUND_OPENDOOR);
        }
 
@@ -921,7 +919,6 @@ static bool do_cmd_close_aux(int y, int x)
                        }
                        else
                        {
-                               /* Sound */
                                sound(SOUND_SHUTDOOR);
                        }
                }
@@ -1098,7 +1095,6 @@ static bool do_cmd_tunnel_aux(int y, int x)
 
        name = f_name + mimic_f_ptr->name;
 
-       /* Sound */
        sound(SOUND_DIG);
 
        if (have_flag(f_ptr->flags, FF_PERMANENT))
@@ -1154,7 +1150,6 @@ static bool do_cmd_tunnel_aux(int y, int x)
                                p_ptr->update |= (PU_FLOW);
                        }
                        
-                       /* Sound */
                        if (have_flag(f_ptr->flags, FF_GLASS)) sound(SOUND_GLASS);
 
                        /* Remove the feature */
@@ -1354,7 +1349,6 @@ bool easy_open_door(int y, int x)
                        /* Open the door */
                        cave_alter_feat(y, x, FF_OPEN);
 
-                       /* Sound */
                        sound(SOUND_OPENDOOR);
 
                        /* Experience */
@@ -1379,7 +1373,6 @@ bool easy_open_door(int y, int x)
                /* Open the door */
                cave_alter_feat(y, x, FF_OPEN);
 
-               /* Sound */
                sound(SOUND_OPENDOOR);
        }
 
@@ -1759,7 +1752,6 @@ static bool do_cmd_bash_aux(int y, int x, int dir)
                /* Message */
                msg_format(_("%sを壊した！", "The %s crashes open!"), name);
 
-               /* Sound */
                sound(have_flag(f_ptr->flags, FF_GLASS) ? SOUND_GLASS : SOUND_OPENDOOR);
 
                /* Break down the door */
@@ -2995,7 +2987,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
                floor_item_optimize(0 - item);
        }
 
-       /* Sound */
        sound(SOUND_SHOOT);
 
        /* Hack -- Handle stuff */
@@ -3279,7 +3270,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
                                        {
                                                char m_name[80];
 
-                                               /* Sound */
                                                sound(SOUND_FLEE);
 
                                                /* Get the monster name (or "it") */
@@ -3874,7 +3864,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
                                        {
                                                char m_name[80];
 
-                                               /* Sound */
                                                sound(SOUND_FLEE);
 
                                                /* Get the monster name (or "it") */

diff --git a/src/cmd5.c b/src/cmd5.c
index 65fedf0..010df70 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -897,7 +897,6 @@ void do_cmd_study(void)
                break;
        }
 
-       /* Sound */
        sound(SOUND_STUDY);
 
        /* One less spell available */

diff --git a/src/dungeon.c b/src/dungeon.c
index 78092cc..df107e2 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -2952,7 +2952,6 @@ static void process_world_aux_movement(void)
                                }
                        }
 
-                       /* Sound */
                        sound(SOUND_TPLEVEL);
                }
        }
@@ -2994,7 +2993,6 @@ static void process_world_aux_movement(void)
                                msg_print(_("世界が少しの間変化したようだ。", "The world seems to change for a moment!"));
                        }
 
-                       /* Sound */
                        sound(SOUND_TPLEVEL);
                }
        }

diff --git a/src/effects.c b/src/effects.c
index 14165fa..effd665 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -4499,7 +4499,6 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell)
                        if(!save_player()) msg_print("セーブ失敗！");
 #endif
 
-               /* Sound */
                sound(SOUND_DEATH);
 
                chg_virtue(V_SACRIFICE, 10);

diff --git a/src/melee1.c b/src/melee1.c
index 6239d16..36b2c1d 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -363,7 +363,6 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath)
        /* Test for hit */
        if ((!(r_ptr->flags2 & RF2_QUANTUM) || !randint0(2)) && test_hit_norm(chance, r_ptr->ac, m_ptr->ml))
        {
-               /* Sound */
                sound(SOUND_HIT);
                msg_format(_("%sを%sで攻撃した。", "You hit %s with your %s."), m_name, atk_desc);
 
@@ -415,7 +414,6 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath)
        /* Player misses */
        else
        {
-               /* Sound */
                sound(SOUND_MISS);
 
                /* Message */
@@ -603,7 +601,6 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, BIT
                {
                        int vorpal_chance = ((o_ptr->name1 == ART_VORPAL_BLADE) || (o_ptr->name1 == ART_CHAINSWORD)) ? 2 : 4;
 
-                       /* Sound */
                        sound(SOUND_HIT);
 
                        /* Message */
@@ -1199,7 +1196,6 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, BIT
                        {
                                u32b flgs_aux[TR_FLAG_SIZE];
 
-                               /* Sound */
                                sound(SOUND_HIT);
 
                                /* Message */
@@ -1296,7 +1292,6 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, BIT
                        }
                        else
                        {
-                               /* Sound */
                                sound(SOUND_MISS);
 
                                /* Message */
@@ -1512,7 +1507,6 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
        /* Hack -- delay fear messages */
        if (fear && m_ptr->ml && !mdeath)
        {
-               /* Sound */
                sound(SOUND_FLEE);
 
                /* Message */

diff --git a/src/monster-process.c b/src/monster-process.c
index da76b0c..64b87de 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -3107,7 +3107,6 @@ void process_monster(MONSTER_IDX m_idx)
                        }
                        else
                        {
-                               /* Sound */
                                /* sound(SOUND_WALK); */
 
                                /* Move the player */

diff --git a/src/mspells3.c b/src/mspells3.c
index 3a49814..2df69f9 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -1618,7 +1618,6 @@ void learn_spell(int monspell)
                msg_format(_("%sを学習した！", "You have learned %s!"), monster_powers[monspell].name);
                gain_exp(monster_powers[monspell].level * monster_powers[monspell].smana);
 
-               /* Sound */
                sound(SOUND_STUDY);
 
                new_mane = TRUE;

diff --git a/src/object2.c b/src/object2.c
index 6088a57..64f9a0a 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -5466,7 +5466,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
        /* Draw the spot */
        lite_spot(by, bx);
 
-       /* Sound */
        sound(SOUND_DROP);
 
        /* Mega-Hack -- no message if "dropped" by player */

diff --git a/src/spells1.c b/src/spells1.c
index 1cd52ed..e8d6f54 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -4964,7 +4964,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Take note */
                        if ((fear || do_fear) && seen)
                        {
-                               /* Sound */
                                sound(SOUND_FLEE);
 
                                /* Message */

diff --git a/src/spells3.c b/src/spells3.c
index 5d5bc9f..a7e3288 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -102,7 +102,6 @@ bool teleport_away(MONSTER_IDX m_idx, POSITION dis, BIT_FLAGS mode)
                if (tries > MAX_TRIES) return (FALSE);
        }
 
-       /* Sound */
        sound(SOUND_TPOTHER);
 
        /* Update the old location */
@@ -211,7 +210,6 @@ void teleport_monster_to(MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power,
 
        if (attempts < 1) return;
 
-       /* Sound */
        sound(SOUND_TPOTHER);
 
        /* Update the old location */
@@ -357,7 +355,6 @@ bool teleport_player_aux(int dis, BIT_FLAGS mode)
 
        if (player_bold(y, x)) return FALSE;
 
-       /* Sound */
        sound(SOUND_TELEPORT);
 
 #ifdef JP
@@ -508,7 +505,6 @@ void teleport_player_to(POSITION ny, POSITION nx, BIT_FLAGS mode)
                }
        }
 
-       /* Sound */
        sound(SOUND_TELEPORT);
 
        /* Move the player */
@@ -743,7 +739,6 @@ void teleport_level(MONSTER_IDX m_idx)
                delete_monster_idx(m_idx);
        }
 
-       /* Sound */
        sound(SOUND_TPLEVEL);
 }
 

diff --git a/src/store.c b/src/store.c
index dc25e55..6e1c277 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -570,7 +570,6 @@ static void purchase_analyze(s32b price, s32b value, s32b guess)
                chg_virtue(V_HONOUR, -1);
                chg_virtue(V_JUSTICE, -1);
 
-               /* Sound */
                sound(SOUND_STORE1);
        }
 
@@ -584,7 +583,6 @@ static void purchase_analyze(s32b price, s32b value, s32b guess)
                if (one_in_(4))
                        chg_virtue(V_HONOUR, -1);
 
-               /* Sound */
                sound(SOUND_STORE2);
        }
 
@@ -599,7 +597,6 @@ static void purchase_analyze(s32b price, s32b value, s32b guess)
                else if (one_in_(4))
                        chg_virtue(V_HONOUR, 1);
 
-               /* Sound */
                sound(SOUND_STORE3);
        }
 
@@ -617,7 +614,6 @@ static void purchase_analyze(s32b price, s32b value, s32b guess)
                if (10 * price < value)
                        chg_virtue(V_SACRIFICE, 1);
 
-               /* Sound */
                sound(SOUND_STORE4);
        }
 }

diff --git a/src/xtra2.c b/src/xtra2.c
index eb333eb..91efa91 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -100,7 +100,6 @@ void check_experience(void)
                        do_cmd_write_nikki(NIKKI_LEVELUP, p_ptr->lev, NULL);
                }
 
-               /* Sound */
                sound(SOUND_LEVEL);
 
                /* Message */