In English spell descriptions, use "cuts" rather than "cut status" or "cut", "poisons...

[hengband/hengband.git] / src / realm-life.c

diff --git a/src/realm-life.c b/src/realm-life.c
index 05f9b3f..7c3c070 100644 (file)
--- a/src/realm-life.c
+++ b/src/realm-life.c
@@ -10,6 +10,7 @@
 
 /*!
 * @brief 生命領域魔法の各処理を行う
+* @param caster_ptr プレーヤーへの参照ポインタ
 * @param spell 魔法ID
 * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
 * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。
@@ -28,7 +29,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
        {
        case 0:
                if (name) return _("軽傷の治癒", "Cure Light Wounds");
-               if (desc) return _("怪我と体力を少し回復させる。", "Heals cut and HP a little.");
+               if (desc) return _("怪我と体力を少し回復させる。", "Heals cuts and HP a little.");
                {
                        DICE_NUMBER dice = 2;
                        DICE_SID sides = 10;
@@ -39,7 +40,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
        case 1:
                if (name) return _("祝福", "Bless");
-               if (desc) return _("一定時間、命中率とACにボーナスを得る。", "Gives bonus to hit and AC for a few turns.");
+               if (desc) return _("一定時間、命中率とACにボーナスを得る。", "Gives a bonus to hit and AC for a few turns.");
                {
                        int base = 12;
 
@@ -63,8 +64,8 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               if (!get_aim_dir(&dir)) return NULL;
-                               fire_ball_hide(GF_WOUNDS, dir, damroll(dice, sides), 0);
+                               if (!get_aim_dir(caster_ptr, &dir)) return NULL;
+                               fire_ball_hide(caster_ptr, GF_WOUNDS, dir, damroll(dice, sides), 0);
                        }
                }
                break;
@@ -81,7 +82,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               lite_area(damroll(dice, sides), rad);
+                               lite_area(caster_ptr, damroll(dice, sides), rad);
                        }
                }
                break;
@@ -96,16 +97,16 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               detect_traps(rad, TRUE);
-                               detect_doors(rad);
-                               detect_stairs(rad);
+                               detect_traps(caster_ptr, rad, TRUE);
+                               detect_doors(caster_ptr, rad);
+                               detect_stairs(caster_ptr, rad);
                        }
                }
                break;
 
        case 5:
                if (name) return _("重傷の治癒", "Cure Medium Wounds");
-               if (desc) return _("怪我と体力を中程度回復させる。", "Heals cut and HP more.");
+               if (desc) return _("怪我と体力を中程度回復させる。", "Heals cuts and HP more.");
                {
                        DICE_NUMBER dice = 4;
                        DICE_SID sides = 10;
@@ -117,7 +118,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
        case 6:
                if (name) return _("解毒", "Cure Poison");
-               if (desc) return _("体内の毒を取り除く。", "Cure poison status.");
+               if (desc) return _("体内の毒を取り除く。", "Cures yourself of any poisons.");
                {
                        if (cast)
                        {
@@ -141,7 +142,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
                if (name) return _("解呪", "Remove Curse");
                if (desc) return _("アイテムにかかった弱い呪いを解除する。", "Removes normal curses from equipped items.");
                {
-                       if (cast) (void)remove_curse();
+                       if (cast) (void)remove_curse(caster_ptr);
                }
                break;
 
@@ -156,15 +157,15 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               if (!get_aim_dir(&dir)) return NULL;
-                               fire_ball_hide(GF_WOUNDS, dir, damroll(dice, sides), 0);
+                               if (!get_aim_dir(caster_ptr, &dir)) return NULL;
+                               fire_ball_hide(caster_ptr, GF_WOUNDS, dir, damroll(dice, sides), 0);
                        }
                }
                break;
 
        case 10:
                if (name) return _("致命傷の治癒", "Cure Critical Wounds");
-               if (desc) return _("体力を大幅に回復させ、負傷と朦朧状態も全快する。", "Heals cut, stun and HP greatly.");
+               if (desc) return _("体力を大幅に回復させ、負傷と朦朧状態も全快する。", "Heals HP greatly. Also cures cuts and being stunned.");
                {
                        DICE_NUMBER dice = 8;
                        DICE_SID sides = 10;
@@ -177,7 +178,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
        case 11:
                if (name) return _("耐熱耐寒", "Resist Heat and Cold");
                if (desc) return _("一定時間、火炎と冷気に対する耐性を得る。装備による耐性に累積する。",
-                       "Gives resistance to fire and cold. These resistances can be added to which from equipment for more powerful resistances.");
+                       "Gives resistance to fire and cold. These resistances can be added to those from equipment for more powerful resistances.");
 
                {
                        int base = 20;
@@ -203,7 +204,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               map_area(rad);
+                               map_area(caster_ptr, rad);
                        }
                }
                break;
@@ -215,14 +216,14 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               turn_undead();
+                               turn_undead(caster_ptr);
                        }
                }
                break;
 
        case 14:
                if (name) return _("体力回復", "Healing");
-               if (desc) return _("極めて強力な回復呪文で、負傷と朦朧状態も全快する。", "Much powerful healing magic, and heals cut and stun completely.");
+               if (desc) return _("極めて強力な回復呪文で、負傷と朦朧状態も全快する。", "Is very powerful healing magic. Also completely cures cuts and being stunned.");
 
                {
                        int heal = 300;
@@ -248,7 +249,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
                if (name) return _("*解呪*", "Dispel Curse");
                if (desc) return _("アイテムにかかった強力な呪いを解除する。", "Removes normal and heavy curse from equipped items.");
                {
-                       if (cast) (void)remove_all_curse();
+                       if (cast) (void)remove_all_curse(caster_ptr);
                }
                break;
 
@@ -259,7 +260,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (!ident_spell(FALSE)) return NULL;
+                               if (!ident_spell(caster_ptr, FALSE)) return NULL;
                        }
                }
                break;
@@ -276,7 +277,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               dispel_undead(damroll(dice, sides));
+                               dispel_undead(caster_ptr, damroll(dice, sides));
                        }
                }
                break;
@@ -292,7 +293,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               charm_monsters(power);
+                               charm_monsters(caster_ptr, power);
                        }
                }
                break;
@@ -309,8 +310,8 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               if (!get_aim_dir(&dir)) return NULL;
-                               fire_ball_hide(GF_WOUNDS, dir, damroll(dice, sides), 0);
+                               if (!get_aim_dir(caster_ptr, &dir)) return NULL;
+                               fire_ball_hide(caster_ptr, GF_WOUNDS, dir, damroll(dice, sides), 0);
                        }
                }
                break;
@@ -344,7 +345,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               alter_reality();
+                               reserve_alter_reality(caster_ptr);
                        }
                }
                break;
@@ -361,7 +362,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
                        if (cast)
                        {
                                warding_glyph(caster_ptr);
-                               glyph_creation();
+                               glyph_creation(caster_ptr, caster_ptr->y, caster_ptr->x);
                        }
                }
                break;
@@ -373,7 +374,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               p_ptr->current_floor_ptr->num_repro += MAX_REPRO;
+                               caster_ptr->current_floor_ptr->num_repro += MAX_REPRO;
                        }
                }
                break;
@@ -389,7 +390,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               detect_all(rad);
+                               detect_all(caster_ptr, rad);
                        }
                }
                break;
@@ -406,7 +407,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               mass_genocide_undead(power, TRUE);
+                               mass_genocide_undead(caster_ptr, power, TRUE);
                        }
                }
                break;
@@ -418,7 +419,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               wiz_lite(p_ptr, FALSE);
+                               wiz_lite(caster_ptr, FALSE);
                        }
                }
                break;
@@ -430,7 +431,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               (void)restore_all_status();
+                               (void)restore_all_status(caster_ptr);
                                restore_level(caster_ptr);
                        }
                }
@@ -438,7 +439,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
        case 29:
                if (name) return _("*体力回復*", "Healing True");
-               if (desc) return _("最強の治癒の魔法で、負傷と朦朧状態も全快する。", "The greatest healing magic. Heals all HP, cut and stun.");
+               if (desc) return _("最強の治癒の魔法で、負傷と朦朧状態も全快する。", "Is the greatest healing magic. Heals all HP, cuts and being stunned.");
 
                {
                        int heal = 2000;
@@ -454,7 +455,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (!identify_fully(FALSE)) return NULL;
+                               if (!identify_fully(caster_ptr, FALSE)) return NULL;
                        }
                }
                break;