From: Deskull <deskull@users.sourceforge.jp>
Date: Tue, 29 Jan 2019 15:15:06 +0000 (+0900)
Subject: [Refactor] #37353 メッセージ整理。 / Refactor messages.
X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=2a98e4728e4f9573994fc68de8cf9076fb03094f

[Refactor] #37353 メッセージ整理。 / Refactor messages.
---

diff --git a/src/cmd-spell.h b/src/cmd-spell.h
index 122d4745a..3195cb82f 100644
--- a/src/cmd-spell.h
+++ b/src/cmd-spell.h
@@ -1,7 +1,7 @@
 
 static const concptr s_dam = _("損傷:", "dam ");
 static const concptr s_random = _("ランダム", "random");
-static const concptr s_rng = _("射程", "rng ");
+static const concptr s_rng = _("射程:", "rng ");
 static const concptr s_dur = _("期間:", "dur ");
 static const concptr s_range = _("範囲:", "range ");
 static const concptr s_heal = _("回復:", "heal ");
diff --git a/src/mind.c b/src/mind.c
index d582acf24..3752fae3d 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -21,6 +21,7 @@
 #include "avatar.h"
 #include "player-status.h"
 #include "spells-status.h"
+#include "cmd-spell.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =
@@ -540,15 +541,6 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] =
  */
 void mindcraft_info(char *p, int use_mind, int power)
 {
-#ifdef JP
-	concptr s_dam = "損傷:";
-	concptr s_dur = "期間:";
-	concptr s_range = "範囲:";
-#else
-	concptr s_dam = "dam ";
-	concptr s_dur = "dur ";
-	concptr s_range = "range ";
-#endif
 	PLAYER_LEVEL plev = p_ptr->lev;
 
 	strcpy(p, "");
diff --git a/src/mspells3.c b/src/mspells3.c
index fb7f2cce0..56a743490 100644
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -15,6 +15,7 @@
 #include "projection.h"
 #include "avatar.h"
 #include "spells-status.h"
+#include "cmd-spell.h"
 
 #define pseudo_plev() (((p_ptr->lev + 40) * (p_ptr->lev + 40) - 1550) / 130) /*!< モンスター魔法をプレイヤーが使用する場合の換算レベル */
 
@@ -36,7 +37,7 @@ void set_bluemage_damage(int SPELL_NUM, PLAYER_LEVEL plev, concptr msg, char* tm
     int dice_div = monspell_bluemage_damage(SPELL_NUM, plev, DICE_DIV);
     char dmg_str[80];
     dice_to_string(base_damage, dice_num, dice_side, dice_mult, dice_div, dmg_str);
-    sprintf(tmp, msg, dmg_str);
+    sprintf(tmp, " %s %s", msg, dmg_str);
 }
 
 /*!
@@ -49,18 +50,6 @@ static void learned_info(char *p, int power)
 {
 	PLAYER_LEVEL plev = pseudo_plev();
 
-#ifdef JP
-	concptr s_dam = " 損傷:%s";
-	concptr s_dur = "期間:";
-	concptr s_range = "範囲:";
-	concptr s_heal = " 回復:%s";
-#else
-	concptr s_dam = " dam %s";
-	concptr s_dur = "dur ";
-	concptr s_range = "range ";
-	concptr s_heal = " heal %s";
-#endif
-
 	strcpy(p, "");
 
 	switch (power)