OSDN Git Service

(root) / hengband / hengband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 10f968c)
[Refactor] #37353 コメント整理 / Refactor comments.
authorDeskull <deskull@users.sourceforge.jp>
Wed, 28 Nov 2018 12:14:15 +0000 (21:14 +0900)
committerDeskull <deskull@users.sourceforge.jp>
Wed, 28 Nov 2018 12:14:15 +0000 (21:14 +0900)
src/cmd4.c patch | blob | history
src/melee1.c patch | blob | history
src/spells1.c patch | blob | history
src/spells2.c patch | blob | history

diff --git a/src/cmd4.c b/src/cmd4.c
index c1fa564..0ec8690 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -8428,7 +8428,6 @@ static void do_cmd_knowledge_autopick(void)
                {
                        tmp = _("拾う", "Pickup");
                }
-               else /* if (act & DO_QUERY_AUTOPICK) */ /* Obvious */
                {
                        tmp = _("確認", "Query");
                }
diff --git a/src/melee1.c b/src/melee1.c
index 6c85868..eefc835 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -1987,7 +1987,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                }
                                case RBE_HURT:
                                {
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        /* Hack -- Player armor reduces total damage */
@@ -2079,7 +2078,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                                        msg_print(_("ザックからエネルギーが吸い取られた！", "Energy drains from your pack!"));
 
-                                                       /* Obvious */
                                                        obvious = TRUE;
 
                                                        /* Heal the monster */
@@ -2114,7 +2112,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        /* Saving throw (unless paralyzed) based on dex and level */
@@ -2187,7 +2184,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Occasional "blink" anyway */
                                                blinked = TRUE;
 
-                                               /* Obvious */
                                                obvious = TRUE;
 
                                                break;
@@ -2270,7 +2266,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                inven_item_increase(i, -1);
                                                inven_item_optimize(i);
 
-                                               /* Obvious */
                                                obvious = TRUE;
 
                                                /* Blink away */
@@ -2322,7 +2317,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                inven_item_increase(i, -1);
                                                inven_item_optimize(i);
 
-                                               /* Obvious */
                                                obvious = TRUE;
 
                                                break;
@@ -2363,7 +2357,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                case RBE_ACID:
                                {
                                        if (explode) break;
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        msg_print(_("酸を浴びせられた！", "You are covered in acid!"));
@@ -2383,7 +2376,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                case RBE_ELEC:
                                {
                                        if (explode) break;
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        msg_print(_("電撃を浴びせられた！", "You are struck by electricity!"));
@@ -2400,7 +2392,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                case RBE_FIRE:
                                {
                                        if (explode) break;
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        msg_print(_("全身が炎に包まれた！", "You are enveloped in flames!"));
@@ -2417,7 +2408,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                case RBE_COLD:
                                {
                                        if (explode) break;
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        msg_print(_("全身が冷気で覆われた！", "You are covered with frost!"));
@@ -2554,12 +2544,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_STR:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_STR)) obvious = TRUE;
 
                                        break;
@@ -2567,12 +2554,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_INT:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_INT)) obvious = TRUE;
 
                                        break;
@@ -2580,12 +2564,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_WIS:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_WIS)) obvious = TRUE;
 
                                        break;
@@ -2593,12 +2574,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_DEX:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_DEX)) obvious = TRUE;
 
                                        break;
@@ -2606,12 +2584,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_CON:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_CON)) obvious = TRUE;
 
                                        break;
@@ -2619,12 +2594,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_CHR:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
-
-                                       /* Damage (stat) */
                                        if (do_dec_stat(A_CHR)) obvious = TRUE;
 
                                        break;
@@ -2632,7 +2604,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_LOSE_ALL:
                                {
-                                       /* Damage (physical) */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2650,7 +2621,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_SHATTER:
                                {
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        /* Hack -- Reduce damage based on the player armor class */
@@ -2671,7 +2641,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        s32b d = damroll(10, 6) + (p_ptr->exp / 100) * MON_DRAIN_LIFE;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
@@ -2686,7 +2655,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        s32b d = damroll(20, 6) + (p_ptr->exp / 100) * MON_DRAIN_LIFE;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
@@ -2701,7 +2669,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        s32b d = damroll(40, 6) + (p_ptr->exp / 100) * MON_DRAIN_LIFE;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
@@ -2716,7 +2683,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        s32b d = damroll(80, 6) + (p_ptr->exp / 100) * MON_DRAIN_LIFE;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
@@ -2826,7 +2792,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        s32b d = damroll(60, 6) + (p_ptr->exp / 100) * MON_DRAIN_LIFE;
                                        bool resist_drain;
 
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
@@ -2882,7 +2847,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                }
                                case RBE_DR_MANA:
                                {
-                                       /* Obvious */
                                        obvious = TRUE;
 
                                        if (CHECK_MULTISHADOW())
diff --git a/src/spells1.c b/src/spells1.c
index 0430f78..5d02940 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -3710,7 +3710,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                        if (!resists_tele)
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Prepare to teleport */
@@ -3734,7 +3733,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect undead */
                        if (r_ptr->flags3 & (RF3_UNDEAD))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
@@ -3777,7 +3775,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect evil */
                        if (r_ptr->flags3 & (RF3_EVIL))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
@@ -3817,7 +3814,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                skipped = TRUE;
                                break;
                        }
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        /* Apply some fear */
@@ -3852,7 +3848,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect undead */
                        if (r_ptr->flags3 & (RF3_UNDEAD))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
@@ -3888,7 +3883,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect evil */
                        if (r_ptr->flags3 & (RF3_EVIL))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
@@ -3923,7 +3917,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect good */
                        if (r_ptr->flags3 & (RF3_GOOD))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
@@ -3958,7 +3951,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect non-undead */
                        if (monster_living(r_ptr))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                note = _("は身震いした。", " shudders.");
@@ -3990,7 +3982,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        /* Only affect demons */
                        if (r_ptr->flags3 & (RF3_DEMON))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Learn about type */
@@ -4022,7 +4013,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                dam = 0;
                                break;
                        }
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        note = _("は身震いした。", " shudders.");
@@ -4686,7 +4676,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        !(r_ptr->flagsr & (RFR_RES_SOUN | RFR_RES_WALL)) &&
                        !(r_ptr->flags3 & RF3_NO_STUN))
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        /* Get stunned */
@@ -4713,7 +4702,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                         !(r_ptr->flags3 & RF3_NO_CONF) &&
                         !(r_ptr->flagsr & RFR_EFF_RES_CHAO_MASK))
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        /* Already partially confused */
@@ -4739,7 +4727,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                if (do_time)
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        if (do_time >= m_ptr->maxhp) do_time = m_ptr->maxhp - 1;
@@ -4758,7 +4745,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                {
                        if (polymorph_monster(y, x))
                        {
-                               /* Obvious */
                                if (seen) obvious = TRUE;
 
                                /* Monster polymorphs */
@@ -4783,7 +4769,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                /* Handle "teleport" */
                if (do_dist)
                {
-                       /* Obvious */
                        if (seen) obvious = TRUE;
 
                        note = _("が消え去った！", " disappears!");
diff --git a/src/spells2.c b/src/spells2.c
index 4ea4451..ca0d1e0 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -69,7 +69,6 @@ static bool detect_feat_flag(POSITION range, int flag, bool known)
                                /* Redraw */
                                lite_spot(y, x);
 
-                               /* Obvious */
                                detect = TRUE;
                        }
                }
変愚蛮怒のメインリポジトリです
About OSDN
Find Software
Develop Software
Help