From: mogami <mogami@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Thu, 21 Nov 2002 13:43:57 +0000 (+0000)
Subject: アイテム名の頭に付いていたゴミ"& "を削除したが、flavor.cの一部が"& "の存在
X-Git-Tag: v2.1.2~1706
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dd77acfe35fda35f69e67901176631aaa96b67a3;p=hengband%2Fhengband.git

アイテム名の頭に付いていたゴミ"& "を削除したが、flavor.cの一部が"& "の存在
を仮定して単純に2文字削除するような処理をしていた為、死体の名前の表示がおか
しくなってしまっていたバグ修正。他にもflavor.cに残っていた"& "削除。
---

diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt
index a5999802d..4b72af506 100644
--- a/lib/edit/k_info.txt
+++ b/lib/edit/k_info.txt
@@ -5242,7 +5242,7 @@ A:50/3
 P:0:1d1:0:0:0
 
 N:578:¤Î¹ü
-E:& Skeleton~
+E:Skeleton~
 G:~:w
 I:10:0:0
 W:1:0:20:0
@@ -5250,7 +5250,7 @@ A:1/2
 P:0:1d1:0:0:0
 
 N:579:¤Î»àÂÎ
-E:& Corpse~
+E:Corpse~
 G:~:v
 I:10:1:0
 W:1:0:40:0
diff --git a/src/flavor.c b/src/flavor.c
index 65b72ab4e..650b0be51 100644
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -1782,15 +1782,15 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 
 
 #ifdef JP
-			sprintf(tmp_val2, "& #%s", basenm + 2);
+			sprintf(tmp_val2, "#%s", basenm);
 #else
 			if (r_ptr->flags1 & RF1_UNIQUE)
 			{
-				sprintf(tmp_val2, "%s %s", basenm, "of #");
+				sprintf(tmp_val2, "& %s %s", basenm, "of #");
 			}
 			else
 			{
-				sprintf(tmp_val2, "& # %s", basenm + 2);
+				sprintf(tmp_val2, "& # %s", basenm);
 			}
 #endif
 
@@ -1851,9 +1851,9 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 
 			if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
 #ifdef JP
-				basenm = aware ? "& %¤Î¥¢¥ß¥å¥ì¥Ã¥È" : "& ¥¢¥ß¥å¥ì¥Ã¥È";
+				basenm = aware ? "%¤Î¥¢¥ß¥å¥ì¥Ã¥È" : "¥¢¥ß¥å¥ì¥Ã¥È";
 			else
-				basenm = aware ? "& #%¤Î¥¢¥ß¥å¥ì¥Ã¥È" : "& #¥¢¥ß¥å¥ì¥Ã¥È";
+				basenm = aware ? "#%¤Î¥¢¥ß¥å¥ì¥Ã¥È" : "#¥¢¥ß¥å¥ì¥Ã¥È";
 #else
 				basenm = "& Amulet~";
 			else
@@ -1878,9 +1878,9 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 
 			if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
 #ifdef JP
-				basenm = aware ? "& %¤Î»ØÎØ" : "& »ØÎØ";
+				basenm = aware ? "%¤Î»ØÎØ" : "»ØÎØ";
 			else
-				basenm = aware ? "& #%¤Î»ØÎØ" : "& #»ØÎØ";
+				basenm = aware ? "#%¤Î»ØÎØ" : "#»ØÎØ";
 #else
 				basenm = "& Ring~";
 			else
@@ -1905,9 +1905,9 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 			if (aware) append_name = TRUE;
 			if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
 #ifdef JP
-				basenm = aware ? "& %¤Î¾ó" : "& ¾ó";
+				basenm = aware ? "%¤Î¾ó" : "¾ó";
 			else
-				basenm = aware ? "& #%¤Î¾ó" : "& #¾ó";
+				basenm = aware ? "#%¤Î¾ó" : "#¾ó";
 #else
 				basenm = "& Staff~";
 			else
@@ -1925,9 +1925,9 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 			if (aware) append_name = TRUE;
 			if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
 #ifdef JP
-				basenm = aware? "& %¤ÎËâË¡ËÀ":"& ËâË¡ËÀ";
+				basenm = aware? "%¤ÎËâË¡ËÀ":"ËâË¡ËÀ";
 			else
-				basenm = aware ? "& #%¤ÎËâË¡ËÀ" : "& #ËâË¡ËÀ";
+				basenm = aware ? "#%¤ÎËâË¡ËÀ" : "#ËâË¡ËÀ";
 #else
 				basenm = "& Wand~";
 			else
@@ -1945,9 +1945,9 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 			if (aware) append_name = TRUE;
 			if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
 #ifdef JP
-				basenm = aware? "& %¤Î¥í¥Ã¥É":"& ¥í¥Ã¥É";
+				basenm = aware? "%¤Î¥í¥Ã¥É":"¥í¥Ã¥É";
 			else
-				basenm = aware ? "& #%¤Î¥í¥Ã¥É" : "& #¥í¥Ã¥É";
+				basenm = aware ? "#%¤Î¥í¥Ã¥É" : "#¥í¥Ã¥É";
 #else
 				basenm = "& Rod~";
 			else
@@ -1964,9 +1964,9 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 			if (aware) append_name = TRUE;
 			if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
 #ifdef JP
-				basenm = aware ? "& %¤Î´¬Êª" : "& ´¬Êª";
+				basenm = aware ? "%¤Î´¬Êª" : "´¬Êª";
 			else
-				basenm = aware ? "& ¡Ö#¡×¤È½ñ¤«¤ì¤¿%¤Î´¬Êª" : "& ¡Ö#¡×¤È½ñ¤«¤ì¤¿´¬Êª";
+				basenm = aware ? "¡Ö#¡×¤È½ñ¤«¤ì¤¿%¤Î´¬Êª" : "¡Ö#¡×¤È½ñ¤«¤ì¤¿´¬Êª";
 #else
 				basenm = "& Scroll~";
 			else
@@ -1984,9 +1984,9 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 			if (aware) append_name = TRUE;
 			if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
 #ifdef JP
-				basenm = aware ? "& %¤ÎÌô" : "& Ìô";
+				basenm = aware ? "%¤ÎÌô" : "Ìô";
 			else
-				basenm = aware ? "& #%¤ÎÌô" : "& #Ìô";
+				basenm = aware ? "#%¤ÎÌô" : "#Ìô";
 #else
 				basenm = "& Potion~";
 			else
@@ -2007,9 +2007,9 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 			if (aware) append_name = TRUE;
 			if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
 #ifdef JP
-				basenm = aware ? "& %¤Î¥­¥Î¥³" : "& ¥­¥Î¥³";
+				basenm = aware ? "%¤Î¥­¥Î¥³" : "¥­¥Î¥³";
 			else
-				basenm = aware ? "& #%¤Î¥­¥Î¥³" : "& #¥­¥Î¥³";
+				basenm = aware ? "#%¤Î¥­¥Î¥³" : "#¥­¥Î¥³";
 #else
 				basenm = "& Mushroom~";
 			else
@@ -2023,7 +2023,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-			basenm = "& ÍÓÈé»æ - #";
+			basenm = "ÍÓÈé»æ - #";
 #else
 			basenm = "& Parchement~ - #";
 #endif
@@ -2035,7 +2035,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& À¸Ì¿¤ÎËâË¡½ñ#";
+				basenm = "À¸Ì¿¤ÎËâË¡½ñ#";
 #else
 			if (mp_ptr->spell_book == TV_LIFE_BOOK)
 				basenm = "& Book~ of Life Magic #";
@@ -2050,7 +2050,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& Àç½Ñ¤ÎËâË¡½ñ#";
+				basenm = "Àç½Ñ¤ÎËâË¡½ñ#";
 #else
 			if (mp_ptr->spell_book == TV_LIFE_BOOK)
 				basenm = "& Book~ of Sorcery #";
@@ -2065,7 +2065,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& ¼«Á³¤ÎËâË¡½ñ#";
+				basenm = "¼«Á³¤ÎËâË¡½ñ#";
 #else
 			if (mp_ptr->spell_book == TV_LIFE_BOOK)
 				basenm = "& Book~ of Nature Magic #";
@@ -2080,7 +2080,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& ¥«¥ª¥¹¤ÎËâË¡½ñ#";
+				basenm = "¥«¥ª¥¹¤ÎËâË¡½ñ#";
 #else
 			if (mp_ptr->spell_book == TV_LIFE_BOOK)
 				basenm = "& Book~ of Chaos Magic #";
@@ -2095,7 +2095,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& °Å¹õ¤ÎËâË¡½ñ#";
+				basenm = "°Å¹õ¤ÎËâË¡½ñ#";
 #else
 			if (mp_ptr->spell_book == TV_LIFE_BOOK)
 				basenm = "& Book~ of Death Magic #";
@@ -2110,7 +2110,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& ¥È¥é¥ó¥×¤ÎËâË¡½ñ#";
+				basenm = "¥È¥é¥ó¥×¤ÎËâË¡½ñ#";
 #else
 			if (mp_ptr->spell_book == TV_LIFE_BOOK)
 				basenm = "& Book~ of Trump Magic #";
@@ -2125,7 +2125,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& Èë½Ñ¤ÎËâË¡½ñ#";
+				basenm = "Èë½Ñ¤ÎËâË¡½ñ#";
 #else
 			if (mp_ptr->spell_book == TV_LIFE_BOOK)
 				basenm = "& Book~ of Arcane Magic #";
@@ -2139,7 +2139,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& ¾¢¤ÎËâË¡½ñ#";
+				basenm = "¾¢¤ÎËâË¡½ñ#";
 #else
 			if (mp_ptr->spell_book == TV_LIFE_BOOK)
 				basenm = "& Book~ of Craft Magic #";
@@ -2153,7 +2153,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& °­Ëâ¤ÎËâË¡½ñ#";
+				basenm = "°­Ëâ¤ÎËâË¡½ñ#";
 #else
 			if (mp_ptr->spell_book == TV_LIFE_BOOK)
 				basenm = "& Book~ of Daemon Magic #";
@@ -2167,7 +2167,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& Ç˼٤ÎËâË¡½ñ#";
+				basenm = "Ç˼٤ÎËâË¡½ñ#";
 #else
 			if (mp_ptr->spell_book == TV_LIFE_BOOK)
 				basenm = "& Book~ of Crusade Magic #";
@@ -2181,7 +2181,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 		{
 			modstr = basenm;
 #ifdef JP
-				basenm = "& ²Î½¸#";
+				basenm = "²Î½¸#";
 #else
 				basenm = "& Song Book~ #";
 #endif
@@ -2194,7 +2194,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 #ifdef JP
 				basenm = "& Éð·Ý¤Î½ñ#";
 #else
-				basenm = "& Book~ of Kendo #";
+				basenm = "Book~ of Kendo #";
 #endif
 
 			break;