update year to 2020

[jnethack/source.git] / src / spell.c

diff --git a/src/spell.c b/src/spell.c
index 40ba03c..06ad445 100644 (file)
--- a/src/spell.c
+++ b/src/spell.c
@@ -4,7 +4,7 @@
 
 /* JNetHack Copyright */
 /* (c) Issei Numata, Naoki Hamada, Shigehiro Miyashita, 1994-2000  */
-/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2019            */
+/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2020            */
 /* JNetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
@@ -166,7 +166,7 @@ struct obj *bp;
 */
         pline("\82±\82Ì\96{\82Í\90Ú\90G\8c^\82Ì\93Å\82Å\95¢\82í\82ê\82Ä\82¢\82é\81I");
         if (uarmg) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
             erode_obj(uarmg, "gloves", ERODE_CORRODE, EF_GREASE | EF_VERBOSE);
 #else
             erode_obj(uarmg, "\8f¬\8eè", ERODE_CORRODE, EF_GREASE | EF_VERBOSE);
@@ -177,7 +177,7 @@ struct obj *bp;
         was_in_use = bp->in_use;
         bp->in_use = FALSE;
         losestr(Poison_resistance ? rn1(2, 1) : rn1(4, 3));
-#if 0 /*JP*/
+#if 0 /*JP:T*/
         losehp(rnd(Poison_resistance ? 6 : 10), "contact-poisoned spellbook",
                KILLED_BY_AN);
 #else
@@ -238,7 +238,7 @@ struct obj *spellbook;
         useup(spellbook);
         gone = TRUE;
     } else {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
         You("find yourself reading the %s line over and over again.",
             spellbook == context.spbook.book ? "next" : "first");
 #else
@@ -489,7 +489,7 @@ learn(VOID_ARGS)
             You("\82·\82Å\82É%s\82ð\8fn\92m\82µ\82Ä\82¢\82é\81D", splname);
             costly = FALSE;
         } else { /* spellknow(i) <= KEEN/10 */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
             Your("knowledge of %s is %s.", splname,
                  spellknow(i) ? "keener" : "restored");
 #else
@@ -584,7 +584,7 @@ register struct obj *spellbook;
         /* handle the sequence: start reading, get interrupted, have
            context.spbook.book become erased somehow, resume reading it */
         && booktype != SPE_BLANK_PAPER) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
         You("continue your efforts to %s.",
             (booktype == SPE_NOVEL) ? "read the novel" : "memorize the spell");
 #else
@@ -661,7 +661,7 @@ register struct obj *spellbook;
                 if (Role_if(PM_WIZARD) && read_ability < 20 && !confused) {
                     char qbuf[QBUFSZ];
 
-#if 0 /*JP*/
+#if 0 /*JP:T*/
                     Sprintf(qbuf,
                     "This spellbook is %sdifficult to comprehend.  Continue?",
                             (read_ability < 12 ? "very " : ""));
@@ -720,7 +720,7 @@ register struct obj *spellbook;
         }
         spellbook->in_use = FALSE;
 
-#if 0 /*JP*/
+#if 0 /*JP:T*/
         You("begin to %s the runes.",
             spellbook->otyp == SPE_BOOK_OF_THE_DEAD ? "recite" : "memorize");
 #else
@@ -1043,7 +1043,7 @@ cast_protection()
                                             : "air");
 */
                                             : "\8bó\8bC");
-#if 0 /*JP*/
+#if 0 /*JP:T*/
                 pline_The("%s around you begins to shimmer with %s haze.",
                           atmosphere, an(hgolden));
 #else
@@ -1996,11 +1996,11 @@ int *spell_no;
      * given string and are of the form "a - ".
      */
     if (!iflags.menu_tab_sep) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
         Sprintf(buf, "%-20s     Level %-12s Fail Retention", "    Name",
                 "Category");
 #else
-        Sprintf(buf, "%-20s     Level  %-12s \90¬\8c÷\97¦", "    Name", "\95ª\97Þ");
+        Sprintf(buf, "%-20s     Level  %-12s \90¬\8c÷\97¦", "    \96¼\91O", "\95ª\97Þ");
 #endif
         fmt = "%-20s  %2d   %-12s %3d%% %9s";
     } else {
@@ -2190,7 +2190,10 @@ char *outbuf;
 
     if (turnsleft < 1L) {
         /* spell has expired; hero can't successfully cast it anymore */
+/*JP
         Strcpy(outbuf, "(gone)");
+*/
+        Strcpy(outbuf, "(\96Y\8bp)");
     } else if (turnsleft >= (long) KEEN) {
         /* full retention, first turn or immediately after reading book */
         Strcpy(outbuf, "100%");