fix compile error on English version

diff --git a/src/melee1.c b/src/melee1.c
index 5adbd40..79e0449 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -1,4 +1,4 @@
-/*!
+/*!
  * @file melee1.c
  * @brief モンスターの打撃処理 / Monster attacks
  * @date 2014/01/17
@@ -171,9 +171,7 @@ bool make_attack_normal(int m_idx)
        bool explode = FALSE;
        bool do_silly_attack = (one_in_(2) && p_ptr->image);
        int get_damage = 0;
-#ifdef JP
        int abbreviate = 0;
-#endif
 
        /* Not allowed to attack */
        if (r_ptr->flags1 & (RF1_NEVER_BLOW)) return (FALSE);
@@ -387,13 +385,8 @@ bool make_attack_normal(int m_idx)
 
                                case RBM_CHARGE:
                                {
-#ifdef JP
                                        abbreviate = -1;
-                                       act = "は請求書をよこした。";
-#else
-                                       act = "charges you.";
-#endif
-
+                                       act = _("は請求書をよこした。", "charges you.");
                                        touched = TRUE;
                                        sound(SOUND_BUY); /* Note! This is "charges", not "charges at". */
                                        break;

diff --git a/src/mind.c b/src/mind.c
index beeadf7..3ccbc87 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -1,4 +1,4 @@
-/*!
+/*!
  * @file mind.c
  * @brief 各職業の特殊技能実装 / Special magics
  * @date 2014/01/15
@@ -1645,9 +1645,7 @@ void do_cmd_mind(void)
        mind_type       spell;
        bool            cast;
        int             use_mind, mana_cost;
-#ifdef JP
        cptr            p;
-#endif
        bool            on_mirror = FALSE;
 
        /* not if confused */
@@ -1764,7 +1762,7 @@ void do_cmd_mind(void)
        if (randint0(100) < chance)
        {
                if (flush_failure) flush();
-               msg_format(_("%sの集中に失敗した！", "You failed to concentrate hard enough!"),p);
+               msg_format(_("%sの集中に失敗した！", "You failed to concentrate hard enough!"), p);
 
                sound(SOUND_FAIL);
 

diff --git a/src/object2.c b/src/object2.c
index f9ccc6b..dc9c22a 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -1,4 +1,4 @@
-/*!
+/*!
  * @file object2.c
  * @brief オブジェクトの実装 / Object code, part 2
  * @date 2014/01/11
@@ -7642,7 +7642,7 @@ cptr essence_name[] =
 
 #else
 
-static cptr essence_name[] = 
+cptr essence_name[] = 
 {
        "strength",
        "intelligen.",

diff --git a/src/wizard1.c b/src/wizard1.c
index 7c7657d..7943c1d 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -1,4 +1,4 @@
-/*!
+/*!
  *  @file wizard1.c
  *  @brief ウィザードモードの処理(スポイラー出力中心) / Spoiler generation -BEN-
  *  @date 2014/02/17
@@ -2182,7 +2182,7 @@ static void spoil_mon_info(cptr fname)
                }
 
                /* Name */
-               sprintf(buf, _("%s/%s  (", "%s  ("), (r_name + r_ptr->name),(r_name+r_ptr->E_name));  /* ---)--- */
+               sprintf(buf, _("%s/%s  (", "%s  ("), (r_name + r_ptr->name), _(r_name+r_ptr->E_name, ""));  /* ---)--- */
 
                spoil_out(buf);
 

diff --git a/src/xtra2.c b/src/xtra2.c
index c397e0c..437594c 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -1,4 +1,4 @@
-/*!
+/*!
  * @file xtra2.c
  * @brief 雑多なその他の処理2 / effects of various "objects"
  * @date 2014/02/06
@@ -5905,7 +5905,8 @@ void display_rumor(bool ex)
                if (randint0(3) == 0) section = 1;
        }
 
-       err = get_rnd_line_jonly(_("rumors_j.txt", "rumors.txt"), section, Rumor, 10);
+       err = _(get_rnd_line_jonly("rumors_j.txt", section, Rumor, 10),
+                       get_rnd_line("rumors.txt", section, Rumor));
        if (err) strcpy(Rumor, _("嘘の噂もある。", "Some rumors are wrong."));
 
        err = TRUE;