fix #36939

diff --git a/ChangeLog.j b/ChangeLog.j
index 0c5808e..8f7f8a5 100644 (file)
--- a/ChangeLog.j
+++ b/ChangeLog.j
@@ -1,3 +1,5 @@
+       * \83E\83B\83U\81[\83h\83\82\81[\83h\82Å\83C\83F\83\93\83_\81[\82Ì\96\82\8f\9c\82¯\82ª\8aè\82¦\82È\82¢\96â\91è\82ð\8fC\90³ (#36939)
+
 Wed Dec  7 2016  Kentaro Shirakata  <argrath@ub32.org>
 
        * \88ê\95\94\82Ì\8e\80\88ö\82Å\81u\8e\80\82ñ\82¾\81v\82ª\95\\8e¦\82³\82ê\82È\82¢\96â\91è\82ð\8fC\90³ (#36579)

diff --git a/src/objnam.c b/src/objnam.c
index 0fd0220..277739d 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -3507,6 +3507,11 @@ struct obj *no_wish;
         goto any;
     }
 
+#if 0 /*JP*/
+    /*JP
+      \89p\8cê\82È\82ç XXXXX potion \82Í\95s\8am\92è\96¼\81Apotion of XXXXX \82Í\8am\92è\96¼\82Æ\82¢\82¤
+      \8bæ\95Ê\82ª\95t\82­\82ª\81A\93ú\96{\8cê\82Å\82Í\82Ç\82¿\82ç\82à\81uXXXXX\82Ì\96ò\81v\82È\82Ì\82Å\82±\82±\82Å\82Í\94»\95Ê\82µ\82È\82¢
+      */
     /* Search for class names: XXXXX potion, scroll of XXXXX.  Avoid */
     /* false hits on, e.g., rings for "ring mail". */
     if (strncmpi(bp, "enchant ", 8) && strncmpi(bp, "destroy ", 8)
@@ -3539,6 +3544,7 @@ struct obj *no_wish;
                 goto srch;
             }
         }
+#endif
 
     /* Wishing in wizard mode can create traps and furniture.
      * Part I:  distinguish between trap and object for the two
@@ -3648,8 +3654,18 @@ srch:
             typ = i;
             goto typfnd;
         }
+#if 0 /*JP*/
         if (dn && (zn = OBJ_DESCR(objects[i])) != 0
             && wishymatch(dn, zn, FALSE)) {
+#else /*JP
+       * \81u\83C\83F\83\93\83_\81[\82Ì\96\82\8f\9c\82¯\81v\82ð\8aè\82Á\82½\82Æ\82«\82É\82±\82±\82Å\82Í\8bU\95¨\82É
+       * \82È\82ç\82È\82¢\82æ\82¤\82É\82·\82é\81B
+       * \94ñ\83E\83B\83U\81[\83h\83\82\81[\83h\82Å\82Ì\93ü\82ê\91Ö\82¦\8f\88\97\9d\82Í\8cã\82É\82 \82é\81B
+       */
+        if (i != FAKE_AMULET_OF_YENDOR &&
+            dn && (zn = OBJ_DESCR(objects[i])) != 0
+            && wishymatch(dn, zn, FALSE)) {
+#endif
             /* don't match extra descriptions (w/o real name) */
             if (!OBJ_NAME(objects[i]))
                 return (struct obj *) 0;