Merge branch 'master' of git.sourceforge.jp:/gitroot/hengband/hengband

diff --git a/src/cmd2.c b/src/cmd2.c
index f7867a6..ed99c21 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -3606,6 +3606,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
                        /* Nope */
                        return FALSE;
                }
+
        }
 
        /* Get local object */
@@ -3645,8 +3646,8 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 
        if (shuriken >= 0)
        {
-               ty = randint0(101)-50+p_ptr->y;
-               tx = randint0(101)-50+p_ptr->x;
+               ty = randint0(101) - 50 + p_ptr->y;
+               tx = randint0(101) - 50 + p_ptr->x;
        }
        else
        {

diff --git a/src/cmd4.c b/src/cmd4.c
index 83b00f8..a466ab5 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -426,7 +426,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                else if (!dun_level)
                        note_level = _("地上:", "Surface:");
                else if (q_idx && (is_fixed_quest_idx(q_idx)
-                        && !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT))))
+                       && !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT))))
                        note_level = _("クエスト:", "Quest:");
                else
                {

diff --git a/src/mane.c b/src/mane.c
index ad997e2..78e4bc3 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -24,17 +24,10 @@ static int damage;
 static void mane_info(char *p, int power, HIT_POINT dam)
 {
        int plev = p_ptr->lev;
-#ifdef JP
-       cptr s_dam = "損傷:";
-       cptr s_dur = "期間:";
-       cptr s_range = "範囲:";
-       cptr s_heal = "回復:";
-#else
-       cptr s_dam = "dam ";
-       cptr s_dur = "dur ";
-       cptr s_range = "range ";
-       cptr s_heal = "heal ";
-#endif
+       cptr s_dam = _("損傷:", "dam ");
+       cptr s_dur = _("期間:", "dur ");
+       cptr s_range = _("範囲:", "range ");
+       cptr s_heal = _("回復:", "heal ");
 
        strcpy(p, "");
 
@@ -405,63 +398,68 @@ static bool use_mane(int spell)
        case MS_BR_NEXUS:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("因果混乱のブレスを吐いた。", "You breathe nexus."));
-               
-               fire_breath(GF_NEXUS, dir, damage, (plev > 35 ? 3 : 2));
+                       fire_breath(GF_NEXUS, dir, damage, (plev > 35 ? 3 : 2));
                break;
+
        case MS_BR_TIME:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("時間逆転のブレスを吐いた。", "You breathe time."));
-               
                fire_breath(GF_TIME, dir, damage, (plev > 35 ? 3 : 2));
                break;
+
        case MS_BR_INERTIA:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia."));
-               
-               fire_breath(GF_INERTIAL, dir, damage, (plev > 35 ? 3 : 2));
+                       fire_breath(GF_INERTIAL, dir, damage, (plev > 35 ? 3 : 2));
                break;
+
        case MS_BR_GRAVITY:
                if (!get_aim_dir(&dir)) return FALSE;
-               else msg_print(_("重力のブレスを吐いた。", "You breathe gravity."));
-               
+               else msg_print(_("重力のブレスを吐いた。", "You breathe gravity."));         
                fire_breath(GF_GRAVITY, dir, damage, (plev > 35 ? 3 : 2));
                break;
+
        case MS_BR_SHARDS:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("破片のブレスを吐いた。", "You breathe shards."));
-               
                fire_breath(GF_SHARDS, dir, damage, (plev > 35 ? 3 : 2));
                break;
+
        case MS_BR_PLASMA:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("プラズマのブレスを吐いた。", "You breathe plasma."));
                
                fire_breath(GF_PLASMA, dir, damage, (plev > 35 ? 3 : 2));
                break;
+
        case MS_BR_FORCE:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("フォースのブレスを吐いた。", "You breathe force."));
                
                fire_breath(GF_FORCE, dir, damage, (plev > 35 ? 3 : 2));
                break;
+
        case MS_BR_MANA:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("魔力のブレスを吐いた。", "You breathe mana."));
                
                fire_breath(GF_MANA, dir, damage, (plev > 35 ? 3 : 2));
                break;
+
        case MS_BALL_NUKE:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("放射能球を放った。", "You cast a ball of radiation."));
                
                        fire_ball(GF_NUKE, dir, damage, 2);
                break;
+
        case MS_BR_NUKE:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("放射性廃棄物のブレスを吐いた。", "You breathe toxic waste."));
                
                fire_breath(GF_NUKE, dir, damage, (plev > 35 ? 3 : 2));
                break;
+
        case MS_BALL_CHAOS:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("純ログルスを放った。", "You invoke a raw Logrus."));
@@ -764,15 +762,18 @@ static bool use_mane(int spell)
                else teleport_level(target_m_idx);
                break;
        }
+
        case MS_PSY_SPEAR:
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("光の剣を放った。", "You throw a psycho-spear."));
                (void)fire_beam(GF_PSY_SPEAR, dir, damage);
                break;
+
        case MS_DARKNESS:
                msg_print(_("暗闇の中で手を振った。", "You gesture in shadow."));
                (void)unlite_area(10, 3);
                break;
+
        case MS_MAKE_TRAP:
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("呪文を唱えて邪悪に微笑んだ。", "You cast a spell and cackles evilly."));

diff --git a/src/mspells2.c b/src/mspells2.c
index 07b2d5a..a38431d 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -703,8 +703,8 @@ bool monst_spell_monst(MONSTER_IDX m_idx)
 
        can_remember = is_original_ap_and_seen(m_ptr);
 
-    dam = monspell_to_monster(thrown_spell, y, x, m_idx, t_idx);
-    if (dam < 0)return FALSE;
+       dam = monspell_to_monster(thrown_spell, y, x, m_idx, t_idx);
+       if (dam < 0) return FALSE;
 
        if (m_ptr->ml && maneable && !world_monster && !p_ptr->blind && (p_ptr->pclass == CLASS_IMITATOR))
        {

diff --git a/src/mspells4.c b/src/mspells4.c
index 86bb885..62f92be 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -3614,7 +3614,7 @@ HIT_POINT monspell_to_monster(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX
        case RF6_SPELL_START + 8:  spell_RF6_TELE_TO(m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_TELE_TO */
        case RF6_SPELL_START + 9:  spell_RF6_TELE_AWAY(m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_TELE_AWAY */
        case RF6_SPELL_START + 10: spell_RF6_TELE_LEVEL(m_idx, t_idx, MONSTER_TO_MONSTER); break;  /* RF6_TELE_LEVEL */
-       case RF6_SPELL_START + 11: spell_RF6_PSY_SPEAR(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_PSY_SPEAR */
+       case RF6_SPELL_START + 11: return spell_RF6_PSY_SPEAR(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break; /* RF6_PSY_SPEAR */
        case RF6_SPELL_START + 12: spell_RF6_DARKNESS(y, x, m_idx, t_idx, MONSTER_TO_MONSTER); break;   /* RF6_DARKNESS */
        case RF6_SPELL_START + 13: return -1; /* RF6_TRAPS */
        case RF6_SPELL_START + 14: return -1;  /* RF6_FORGET */