From: mogami <mogami@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Mon, 23 Dec 2002 15:27:36 +0000 (+0000)
Subject: 'v'isual modeでゴミを表示しないようにする条件式が間違っていたので修正。
X-Git-Tag: v2.1.2~1652
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ac5a763d6ef4537ecc40a9031aba5f637a16ca1f;p=hengband%2Fhengband.git

'v'isual modeでゴミを表示しないようにする条件式が間違っていたので修正。
(char型で0x7fと比較する式になっていた。)
また、「'v'でシンボル変更」の説明文は 'v'isual mode が使用不可能なとき
(flavorがあるアイテムの場合)は表示しないように修正。
---

diff --git a/src/cmd4.c b/src/cmd4.c
index c1b4a63c4..92df469fb 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -7333,18 +7333,22 @@ static void display_visual_list(int col, int row, int height, int width, byte at
 			char c, c2;
 			int x = col + j;
 			int y = row + i;
+			int ia, ic;
 
 			/* Bigtile mode uses double width */
 			if (use_bigtile) x += j;
 
-			a = attr_top + i;
-			c = char_left + j;
+			ia = attr_top + i;
+			ic = char_left + j;
 
 			/* Ignore illegal characters */
-			if ((int)attr_top + i > 0x7f || (int)char_left + j > 0xff ||
-			    c < ' ' || (!use_graphics && c > 0x7f))
+			if (ia > 0x7f || ic > 0xff || ic < ' ' ||
+			    (!use_graphics && ic > 0x7f))
 				continue;
 
+			a = (byte)ia;
+			c = (char)ic;
+
 			/* Force correct code for both ASCII character and tile */
 			if (c & 0x80) a |= 0x80;
 
@@ -8025,19 +8029,19 @@ static void do_cmd_knowledge_objects(void)
 			display_visual_list(max + 3, 7, browser_rows-1, wid - (max + 3), attr_top, char_left);
 		}
 
-		/* Prompt */
-#ifdef JP
-		prt(format("<Êý¸þ>, 'r'¤Ç»×¤¤½Ð¤ò¸«¤ë%s%s, ESC", visual_list ? ", ENTER¤Ç·èÄê" : ", 'v'¤Ç¥·¥ó¥Ü¥ëÊѹ¹", (attr_idx||char_idx) ? ", 'c', 'p'¤Ç¥Ú¡¼¥¹¥È" : ", 'c'¤Ç¥³¥Ô¡¼"), hgt - 1, 0);
-#else
-		prt(format("<dir>, 'r' to recall%s%s, ESC", visual_list ? ", ENTER to accept" : ", 'v' for visuals", (attr_idx||char_idx) ? ", 'c', 'p' to paste" : ", 'c' to copy"), hgt - 1, 0);
-#endif
-
 		/* Get the current object */
 		k_ptr = &k_info[object_idx[object_cur]];
 
 		/* Mega Hack -- track this object */
 		if (object_cnt) object_kind_track(object_idx[object_cur]);
 
+		/* Prompt */
+#ifdef JP
+		prt(format("<Êý¸þ>, 'r'¤Ç»×¤¤½Ð¤ò¸«¤ë%s%s, ESC", k_ptr->flavor ? "" : visual_list ? ", ENTER¤Ç·èÄê" : ", 'v'¤Ç¥·¥ó¥Ü¥ëÊѹ¹", (attr_idx||char_idx) ? ", 'c', 'p'¤Ç¥Ú¡¼¥¹¥È" : ", 'c'¤Ç¥³¥Ô¡¼"), hgt - 1, 0);
+#else
+		prt(format("<dir>, 'r' to recall%s%s, ESC", k_ptr->flavor ? "" : visual_list ? ", ENTER to accept" : ", 'v' for visuals", (attr_idx||char_idx) ? ", 'c', 'p' to paste" : ", 'c' to copy"), hgt - 1, 0);
+#endif
+
 		/* The "current" object changed */
 		if (object_old != object_idx[object_cur])
 		{