view_granite_lite offでview_unsafe_grids on のとき壁を全部xにしてしまっ

ていたバグ修正。さらに FEAT_UNDETECTED を導入して、未感知の地形表示の
文字やタイルを変更できるようにした。

diff --git a/src/cave.c b/src/cave.c
index 9fb4149..3d3be8e 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -991,17 +991,14 @@ void map_info(int y, int x, byte *ap, char *cp)
                        }
                }
 
-               /* Hack -- Safe cave grid -- idea borrowed from Unangband */
-               else if (view_unsafe_grids && !(c_ptr->info & (CAVE_DETECT)))
-               {
-                       a = TERM_L_DARK;
-                       c = 'x';
-               }
-
                /* Unknown */
                else
                {
-                       feat = FEAT_NONE;
+                       /* Unsafe cave grid -- idea borrowed from Unangband */
+                       if (view_unsafe_grids && !(c_ptr->info & (CAVE_DETECT)))
+                               feat = FEAT_UNDETECTD;
+                       else
+                               feat = FEAT_NONE;
 
                        /* Access darkness */
                        f_ptr = &f_info[feat];
@@ -1199,20 +1196,17 @@ void map_info(int y, int x, byte *ap, char *cp)
                        }
                }
 
-               /* Hack -- Safe cave grid -- idea borrowed from Unangband */
-               else if (view_unsafe_grids && !(c_ptr->info & (CAVE_DETECT)))
-               {
-                       a = TERM_L_DARK;
-                       c = 'x';
-               }
-
                 /* "Simple Lighting" */
                 else
                 {
                         /* Handle "blind" */
                         if (!(c_ptr->info & CAVE_MARK))
                         {
-                                feat = FEAT_NONE;
+                               /* Unsafe cave grid -- idea borrowed from Unangband */
+                               if (view_unsafe_grids && !(c_ptr->info & (CAVE_DETECT)))
+                                       feat = FEAT_UNDETECTD;
+                               else
+                                       feat = FEAT_NONE;
                         }
 
                         /* Access feature */

diff --git a/src/defines.h b/src/defines.h
index 0b00def..39a4cd2 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1065,6 +1065,8 @@
 /* for mirror master */
 #define FEAT_MIRROR             0xc3
 
+/* unknown grid (not detected)  */
+#define FEAT_UNDETECTD          0xc4
 
 /*
  * Wilderness terrains

diff --git a/src/xtra2.c b/src/xtra2.c
index 212efe9..fcf5733 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -3558,13 +3558,6 @@ if (o_ptr->number != 1) s1 = "
                                name = f_name + f_info[feat].name;
                        }
 
-                       /* Hack -- handle unknown grids */
-#ifdef JP
-if (feat == FEAT_NONE) name = "̤ÃΤÎÃÏ·Á";
-#else
-                       if (feat == FEAT_NONE) name = "unknown grid";
-#endif
-
 
                        /* Pick a prefix */
                        if (*s2 && ((feat >= FEAT_MINOR_GLYPH) &&