OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision10f968c56ea953805bcc3e3313123c739f196955 (tree)
Time2018-11-27 23:48:50
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1363,7 +1363,6 @@ static void process_world_aux_digestion(void)
13631363 /* Calculate damage */
13641364 HIT_POINT dam = (PY_FOOD_STARVE - p_ptr->food) / 10;
13651365
1366- /* Take damage */
13671366 if (!IS_INVULN()) take_hit(DAMAGE_LOSELIFE, dam, _("空腹", "starvation"), -1);
13681367 }
13691368 }
@@ -1390,7 +1389,6 @@ static void process_world_aux_hp_and_sp(void)
13901389 /* Take damage from poison */
13911390 if (p_ptr->poisoned && !IS_INVULN())
13921391 {
1393- /* Take damage */
13941392 take_hit(DAMAGE_NOESCAPE, 1, _("毒", "poison"), -1);
13951393 }
13961394
@@ -1437,7 +1435,6 @@ static void process_world_aux_hp_and_sp(void)
14371435 dam = 1;
14381436 }
14391437
1440- /* Take damage */
14411438 take_hit(DAMAGE_NOESCAPE, dam, _("致命傷", "a fatal wound"), -1);
14421439 }
14431440
@@ -1448,7 +1445,6 @@ static void process_world_aux_hp_and_sp(void)
14481445 {
14491446 if ((cave[p_ptr->y][p_ptr->x].info & (CAVE_GLOW | CAVE_MNDK)) == CAVE_GLOW)
14501447 {
1451- /* Take damage */
14521448 msg_print(_("日光があなたのアンデッドの肉体を焼き焦がした！", "The sun's rays scorch your undead flesh!"));
14531449 take_hit(DAMAGE_NOESCAPE, 1, _("日光", "sunlight"), -1);
14541450 cave_no_regen = TRUE;
@@ -1520,7 +1516,6 @@ static void process_world_aux_hp_and_sp(void)
15201516 {
15211517 if (p_ptr->total_weight > weight_limit())
15221518 {
1523- /* Take damage */
15241519 msg_print(_("溺れている！", "You are drowning!"));
15251520 take_hit(DAMAGE_NOESCAPE, randint1(p_ptr->lev), _("溺れ", "drowning"), -1);
15261521 cave_no_regen = TRUE;
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -1981,7 +1981,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
19811981 msg_print(_("痛恨の一撃！", "It was a critical hit!"));
19821982 tmp_damage = MAX(damage, tmp_damage*2);
19831983
1984- /* Take damage */
19851984 get_damage += take_hit(DAMAGE_ATTACK, tmp_damage, ddesc, -1);
19861985 break;
19871986 }
@@ -1994,7 +1993,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
19941993 /* Hack -- Player armor reduces total damage */
19951994 damage -= (damage * ((ac < 150) ? ac : 150) / 250);
19961995
1997- /* Take damage */
19981996 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
19991997
20001998 break;
@@ -2435,7 +2433,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
24352433
24362434 case RBE_BLIND:
24372435 {
2438- /* Take damage */
24392436 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
24402437
24412438 if (p_ptr->is_dead) break;
@@ -2463,7 +2460,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
24632460 case RBE_CONFUSE:
24642461 {
24652462 if (explode) break;
2466- /* Take damage */
24672463 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
24682464
24692465 if (p_ptr->is_dead) break;
@@ -2485,7 +2481,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
24852481
24862482 case RBE_TERRIFY:
24872483 {
2488- /* Take damage */
24892484 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
24902485
24912486 if (p_ptr->is_dead) break;
@@ -2521,7 +2516,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
25212516
25222517 case RBE_PARALYZE:
25232518 {
2524- /* Take damage */
25252519 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
25262520
25272521 if (p_ptr->is_dead) break;
@@ -2662,7 +2656,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
26622656 /* Hack -- Reduce damage based on the player armor class */
26632657 damage -= (damage * ((ac < 150) ? ac : 150) / 250);
26642658
2665- /* Take damage */
26662659 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
26672660
26682661 /* Radius 8 earthquake centered at the monster */
@@ -2681,7 +2674,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
26812674 /* Obvious */
26822675 obvious = TRUE;
26832676
2684- /* Take damage */
26852677 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
26862678
26872679 if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2697,7 +2689,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
26972689 /* Obvious */
26982690 obvious = TRUE;
26992691
2700- /* Take damage */
27012692 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
27022693
27032694 if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2713,7 +2704,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
27132704 /* Obvious */
27142705 obvious = TRUE;
27152706
2716- /* Take damage */
27172707 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
27182708
27192709 if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2729,7 +2719,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
27292719 /* Obvious */
27302720 obvious = TRUE;
27312721
2732- /* Take damage */
27332722 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
27342723
27352724 if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2840,7 +2829,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
28402829 /* Obvious */
28412830 obvious = TRUE;
28422831
2843- /* Take damage */
28442832 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
28452833
28462834 if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2905,7 +2893,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
29052893 {
29062894 do_cut = 0;
29072895
2908- /* Take damage */
29092896 p_ptr->csp -= damage;
29102897 if (p_ptr->csp < 0)
29112898 {
@@ -2923,7 +2910,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
29232910 }
29242911 case RBE_INERTIA:
29252912 {
2926- /* Take damage */
29272913 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
29282914
29292915 if (p_ptr->is_dead) break;
@@ -2945,7 +2931,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
29452931 }
29462932 case RBE_STUN:
29472933 {
2948- /* Take damage */
29492934 get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
29502935
29512936 if (p_ptr->is_dead) break;
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -433,7 +433,6 @@ HIT_POINT acid_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura)
433433 if (minus_ac()) dam = (dam + 1) / 2;
434434 }
435435
436- /* Take damage */
437436 get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
438437
439438 /* Inventory damage */
@@ -481,7 +480,6 @@ HIT_POINT elec_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura)
481480 (void)do_dec_stat(A_DEX);
482481 }
483482
484- /* Take damage */
485483 get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
486484
487485 /* Inventory damage */
@@ -530,7 +528,6 @@ HIT_POINT fire_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura)
530528 (void)do_dec_stat(A_STR);
531529 }
532530
533- /* Take damage */
534531 get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
535532
536533 /* Inventory damage */
@@ -578,7 +575,6 @@ HIT_POINT cold_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura)
578575 (void)do_dec_stat(A_STR);
579576 }
580577
581- /* Take damage */
582578 get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
583579
584580 /* Inventory damage */
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -1116,7 +1116,6 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
11161116
11171117 if (player_cast)
11181118 {
1119- /* Take damage */
11201119 take_hit(DAMAGE_GENO, randint1(dam_side), format(_("%^sの呪文を唱えた疲労", "the strain of casting %^s"), spell_name), -1);
11211120 }
11221121
Show on old repository browser