remove unused code

diff --git a/japanese/jlib.c b/japanese/jlib.c
index 6132125..e5b64ee 100644 (file)
--- a/japanese/jlib.c
+++ b/japanese/jlib.c
@@ -181,7 +181,10 @@ str2ic(s)
 {
     static unsigned char buf[1024];
     const unsigned char *up;
-    unsigned char *p, *pp;
+    unsigned char *p;
+#ifndef POSIX_ICONV
+    unsigned char *pp;
+#endif
 
     if(!s)
       return s;
@@ -240,7 +243,10 @@ ic2str(s)
 {
     static unsigned char buf[1024];
     const unsigned char *up;
-    unsigned char *p, *pp;
+    unsigned char *p;
+#ifndef POSIX_ICONV
+    unsigned char *pp;
+#endif
 
     if(!s)
       return s;
@@ -348,8 +354,10 @@ jbuffer(
 {
     static unsigned int ibuf[2];
     unsigned int c1, c2;
+#ifndef POSIX_ICONV
     unsigned char uc[2];
     unsigned char *p;
+#endif
 
     if(!buf) buf = ibuf;
     if(!f1) f1 = tty_jputc;

diff --git a/src/apply.c b/src/apply.c
index fcd7bfe..109070f 100644 (file)
--- a/src/apply.c
+++ b/src/apply.c
@@ -243,8 +243,8 @@ its_dead(rx, ry, resp)
 int rx, ry, *resp;
 {
     char buf[BUFSZ];
-    boolean more_corpses;
 #if 0 /*JP*/
+    boolean more_corpses;
     struct permonst *mptr;
 #endif
     struct obj *corpse = sobj_at(CORPSE, rx, ry),
@@ -264,7 +264,9 @@ int rx, ry, *resp;
         else
             statue = 0; /* corpse precedes statue; ignore statue */
     }
+#if 0 /*JP*/
     more_corpses = (corpse && nxtobj(corpse, CORPSE, TRUE));
+#endif
 
     /* additional stethoscope messages from jyoung@apanix.apana.org.au */
     if (!corpse && !statue) {
@@ -316,8 +318,12 @@ int rx, ry, *resp;
         return TRUE;
 
     } else if (corpse) {
+#if 0 /*JP*/
         boolean here = (rx == u.ux && ry == u.uy),
                 one = (corpse->quan == 1L && !more_corpses), reviver = FALSE;
+#else
+        boolean here = (rx == u.ux && ry == u.uy), reviver = FALSE;
+#endif
         int visglyph, corpseglyph;
 
         visglyph = glyph_at(rx, ry);

diff --git a/src/cmd.c b/src/cmd.c
index e62a662..ea1e4a0 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1593,7 +1593,9 @@ int incamt, final;
 char *outbuf;
 {
     const char *modif, *bonus;
+#if 0 /*JP*/
     boolean invrt;
+#endif
     int absamt;
 
     absamt = abs(incamt);
@@ -1638,8 +1640,6 @@ char *outbuf;
     /* "bonus <foo>" (to hit) vs "<bar> bonus" (damage, defense) */
 #if 0 /*JP*/
     invrt = strcmp(inctyp, "to hit") ? TRUE : FALSE;
-#else
-    invrt = strcmp(inctyp, "\96½\92\86\97¦") ? TRUE : FALSE;
 #endif
 
 #if 0 /*JP*/

diff --git a/src/do.c b/src/do.c
index b015cae..9074705 100644 (file)
--- a/src/do.c
+++ b/src/do.c
@@ -2352,9 +2352,9 @@ heal_legs()
         }
 
         if (!u.usteed) {
+#if 0 /*JP*/
             const char *legs = body_part(LEG);
 
-#if 0 /*JP*/
             if ((EWounded_legs & BOTH_SIDES) == BOTH_SIDES)
                 legs = makeplural(legs);
             /* this used to say "somewhat better" but that was

diff --git a/src/do_name.c b/src/do_name.c
index 9878980..6a7142e 100644 (file)
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -1457,9 +1457,6 @@ register struct obj *obj;
     char *bufp, buf[BUFSZ] = DUMMY, bufcpy[BUFSZ], qbuf[QBUFSZ];
     const char *aname;
     short objtyp;
-#if 1 /*JP*/
-    boolean is_japanese = FALSE;
-#endif
 
     /* Do this now because there's no point in even asking for a name */
     if (obj->otyp == SPE_NOVEL) {
@@ -1495,14 +1492,7 @@ register struct obj *obj;
 
     /* relax restrictions over proper capitalization for artifacts */
     if ((aname = artifact_name(buf, &objtyp)) != 0 && objtyp == obj->otyp)
-#if 0 /*JP*/
         Strcpy(buf, aname);
-#else
-        {
-            is_japanese = is_kanji(*buf);
-        Strcpy(buf, aname);
-        }
-#endif
 
     if (obj->oartifact) {
 /*JP
@@ -1818,7 +1808,11 @@ namefloorobj()
     int glyph;
     char buf[BUFSZ];
     struct obj *obj = 0;
+#if 0 /*JP*/
     boolean fakeobj = FALSE, use_plural;
+#else
+    boolean fakeobj = FALSE;
+#endif
 
     cc.x = u.ux, cc.y = u.uy;
     /* "dot for under/over you" only makes sense when the cursor hasn't
@@ -1859,7 +1853,9 @@ namefloorobj()
     Strcpy(buf, (obj->otyp != STRANGE_OBJECT)
                  ? simpleonames(obj)
                  : obj_descr[STRANGE_OBJECT].oc_name);
+#if 0 /*JP*/
     use_plural = (obj->quan > 1L);
+#endif
     if (Hallucination) {
         const char *unames[6];
         char tmpbuf[BUFSZ];

diff --git a/src/invent.c b/src/invent.c
index acd7beb..793055e 100644 (file)
--- a/src/invent.c
+++ b/src/invent.c
@@ -1404,6 +1404,7 @@ register const char *let, *word;
         }
         if (ilet == HANDS_SYM) { /* '-' */
             if (!allownone) {
+#if 0 /*JP*/
                 char *suf = (char *) 0;
 
                 strcpy(buf, word);
@@ -1417,7 +1418,6 @@ register const char *let, *word;
                     bp = (rn2(2) ? buf : (bp + 4));
                 } else
                     bp = buf;
-#if 0 /*JP*/
                 You("mime %s something%s%s.", ing_suffix(bp), suf ? " " : "",
                     suf ? suf : "");
 #else

diff --git a/src/lock.c b/src/lock.c
index b89d4e7..009b2ba 100644 (file)
--- a/src/lock.c
+++ b/src/lock.c
@@ -448,7 +448,9 @@ struct obj *pick;
     if (cc.x == u.ux && cc.y == u.uy) { /* pick lock on a container */
         const char *verb;
         char qsfx[QBUFSZ];
+#if 0 /*JP*/
         boolean it;
+#endif
         int count;
 
         if (u.dz < 0) {
@@ -486,7 +488,9 @@ struct obj *pick;
                     You("\82±\82±\82©\82ç%s\82É\93Í\82©\82È\82¢\81D", the(xname(otmp)));
                     return PICKLOCK_LEARNED_SOMETHING;
                 }
+#if 0 /*JP*/
                 it = 0;
+#endif
                 if (otmp->obroken)
 /*JP
                     verb = "fix";
@@ -496,12 +500,12 @@ struct obj *pick;
 /*JP
                     verb = "lock", it = 1;
 */
-                    verb = "\8c®\82ð\82©\82¯\82é", it = 1;
+                    verb = "\8c®\82ð\82©\82¯\82é";
                 else if (picktyp != LOCK_PICK)
 /*JP
                     verb = "unlock", it = 1;
 */
-                    verb = "\8c®\82ð\82Í\82¸\82·", it = 1;
+                    verb = "\8c®\82ð\82Í\82¸\82·";
                 else
 /*JP
                     verb = "pick";

diff --git a/src/mcastu.c b/src/mcastu.c
index 41feb2d..e9f85b3 100644 (file)
--- a/src/mcastu.c
+++ b/src/mcastu.c
@@ -471,9 +471,11 @@ int spellnum;
             impossible("bad wizard cloning?");
         break;
     case MGC_SUMMON_MONS: {
+#if 0 /*JP*/
         int count;
 
         count = nasty(mtmp); /* summon something nasty */
+#endif
         if (mtmp->iswiz)
 /*JP
             verbalize("Destroy the thief, my pet%s!", plur(count));

diff --git a/src/mon.c b/src/mon.c
index 4d7f8ea..5589395 100644 (file)
--- a/src/mon.c
+++ b/src/mon.c
@@ -1112,10 +1112,14 @@ mpickgold(mtmp)
 register struct monst *mtmp;
 {
     register struct obj *gold;
+#if 0 /*JP*/
     int mat_idx;
+#endif
 
     if ((gold = g_at(mtmp->mx, mtmp->my)) != 0) {
+#if 0 /*JP*/
         mat_idx = objects[gold->otyp].oc_material;
+#endif
         obj_extract_self(gold);
         add_to_minv(mtmp, gold);
         if (cansee(mtmp->mx, mtmp->my)) {
@@ -1945,10 +1949,12 @@ register struct monst *mtmp;
             char buf[BUFSZ];
             boolean in_door = (amorphous(mtmp->data)
                                && closed_door(mtmp->mx, mtmp->my)),
+#if 0 /*JP*/
                 /* alternate message phrasing for some monster types */
                 spec_mon = (nonliving(mtmp->data)
                             || noncorporeal(mtmp->data)
                             || amorphous(mtmp->data)),
+#endif
                 spec_death = (disintegested /* disintegrated or digested */
                               || noncorporeal(mtmp->data)
                               || amorphous(mtmp->data));
@@ -2388,9 +2394,9 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
         u.uconduct.killer++;
 
     if (!nomsg) {
+#if 0 /*JP*/
         boolean namedpet = has_mname(mtmp) && !Hallucination;
 
-#if 0 /*JP*/
         You("%s %s!",
             nonliving(mtmp->data) ? "destroy" : "kill",
             !(wasinside || canspotmon(mtmp)) ? "it"

diff --git a/src/objnam.c b/src/objnam.c
index 689fcdc..c1db92c 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -29,17 +29,14 @@ STATIC_DCL void FDECL(releaseobuf, (char *));
 STATIC_DCL char *FDECL(minimal_xname, (struct obj *));
 STATIC_DCL void FDECL(add_erosion_words, (struct obj *, char *));
 STATIC_DCL char *FDECL(doname_base, (struct obj *obj, unsigned));
+#if 0 /*JP*/
 STATIC_DCL boolean FDECL(singplur_lookup, (char *, char *, BOOLEAN_P,
                                            const char *const *));
 STATIC_DCL char *FDECL(singplur_compound, (char *));
+#endif
 STATIC_DCL char *FDECL(xname_flags, (struct obj *, unsigned));
+#if 0 /*JP*/
 STATIC_DCL boolean FDECL(badman, (const char *, BOOLEAN_P));
-#if 1 /*JP*/
-static char *FDECL(substitute, (char *,     char *,     char *));
-static char *FDECL(transpose, (char *buf,char *));
-static char *FDECL(delete, (char *, char *str));
-static int FDECL(digit_8, (int));
-static int FDECL(atoi_8, (const char *));
 #endif
 
 struct Jitem {
@@ -1860,8 +1857,12 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
 {
     char *nambuf = nextobuf();
     int omndx = otmp->corpsenm;
+#if 0 /*JP*/
     boolean ignore_quan = (cxn_flags & CXN_SINGULAR) != 0,
             /* suppress "the" from "the unique monster corpse" */
+#else
+    boolean
+#endif
         no_prefix = (cxn_flags & CXN_NO_PFX) != 0,
             /* include "the" for "the woodchuck corpse */
         the_prefix = (cxn_flags & CXN_PFX_THE) != 0,
@@ -2495,12 +2496,14 @@ struct obj *obj;
     return outbuf;
 }
 
+#if 0 /*JP*/
 static const char *wrp[] = {
     "wand",   "ring",      "potion",     "scroll", "gem",
     "amulet", "spellbook", "spell book",
     /* for non-specific wishes */
     "weapon", "armor",     "tool",       "food",   "comestible",
 };
+#endif
 static const char wrpsym[] = { WAND_CLASS,   RING_CLASS,   POTION_CLASS,
                                SCROLL_CLASS, GEM_CLASS,    AMULET_CLASS,
                                SPBOOK_CLASS, SPBOOK_CLASS, WEAPON_CLASS,
@@ -2646,6 +2649,7 @@ sing:
     return buf;
 }
 
+#if 0 /*JP*/
 struct sing_plur {
     const char *sing, *plur;
 };
@@ -2799,6 +2803,7 @@ char *str;
     /* wasn't recognized as a compound phrase */
     return 0;
 }
+#endif
 
 /* Plural routine; once upon a time it may have been chiefly used for
  * user-defined fruits, but it is now used extensively throughout the
@@ -3102,6 +3107,7 @@ bottom:
 #endif
 }
 
+#if 0 /*JP*/
 boolean
 badman(basestr, to_plural)
 const char *basestr;
@@ -3149,6 +3155,7 @@ boolean to_plural;            /* true => makeplural, false => makesingular */
     }
     return FALSE;
 }
+#endif
 
 /* compare user string against object name string using fuzzy matching */
 STATIC_OVL boolean

diff --git a/src/potion.c b/src/potion.c
index db2a4c0..df87be7 100644 (file)
--- a/src/potion.c
+++ b/src/potion.c
@@ -2350,7 +2350,9 @@ dodip()
     char allowall[2];
     short mixture;
     char qbuf[QBUFSZ], obuf[QBUFSZ];
+#if 0 /*JP*/
     const char *shortestname; /* last resort obj name for prompt */
+#endif
 
     allowall[0] = ALL_CLASSES;
     allowall[1] = '\0';
@@ -2362,10 +2364,8 @@ dodip()
     if (inaccessible_equipment(obj, "\82ð\90Z\82·", FALSE))
         return 0;
 
-#if 0 /*JP:T*/
+#if 0 /*JP*/
     shortestname = (is_plural(obj) || pair_of(obj)) ? "them" : "it";
-#else
-    shortestname = "\82»\82ê";
 #endif
     /*
      * Bypass safe_qbuf() since it doesn't handle varying suffix without

diff --git a/src/read.c b/src/read.c
index 19e2862..d17e67b 100644 (file)
--- a/src/read.c
+++ b/src/read.c
@@ -298,7 +298,9 @@ doread()
         return 1;
     } else if (scroll->otyp == T_SHIRT || scroll->otyp == ALCHEMY_SMOCK) {
         char buf[BUFSZ], *mesg;
+#if 0 /*JP*/
         const char *endpunct;
+#endif
 
         if (Blind) {
 /*JP
@@ -323,13 +325,17 @@ doread()
         /* populate 'buf[]' */
         mesg = (scroll->otyp == T_SHIRT) ? tshirt_text(scroll, buf)
                                          : apron_text(scroll, buf);
+#if 0 /*JP*/
         endpunct = "";
+#endif
         if (flags.verbose) {
+#if 0 /*JP*/
             int ln = (int) strlen(mesg);
 
             /* we will be displaying a sentence; need ending punctuation */
             if (ln > 0 && !index(".!?", mesg[ln - 1]))
                 endpunct = ".";
+#endif
 /*JP
             pline("It reads:");
 */

diff --git a/src/role.c b/src/role.c
index 2b73ab7..d082584 100644 (file)
--- a/src/role.c
+++ b/src/role.c
@@ -1791,7 +1791,9 @@ int buflen, rolenum, racenum, gendnum, alignnum;
     static char err_ret[] = " character's";
 */
     static char err_ret[] = "\83L\83\83\83\89\83N\83^\81[\82Ì";
+#if 0 /*JP*/
     boolean donefirst = FALSE;
+#endif
 
     if (!suppliedbuf || buflen < 1)
         return err_ret;
@@ -1816,14 +1818,18 @@ int buflen, rolenum, racenum, gendnum, alignnum;
                 Strcat(buf, " ");
 #endif
             Strcat(buf, aligns[alignnum].adj);
+#if 0 /*JP*/
             donefirst = TRUE;
+#endif
         } else {
 #if 0 /*JP*/
             if (donefirst)
                 Strcat(buf, " ");
 #endif
             Strcat(buf, aligns[alignnum].adj);
+#if 0 /*JP*/
             donefirst = TRUE;
+#endif
         }
     } else {
         /* in case we got here by failing the ok_align() test */
@@ -1857,7 +1863,9 @@ int buflen, rolenum, racenum, gendnum, alignnum;
                     Strcat(buf, " ");
 #endif
                 Strcat(buf, genders[gendnum].adj);
+#if 0 /*JP*/
                 donefirst = TRUE;
+#endif
             }
         } else {
 #if 0 /*JP*/
@@ -1865,7 +1873,9 @@ int buflen, rolenum, racenum, gendnum, alignnum;
                 Strcat(buf, " ");
 #endif
             Strcat(buf, genders[gendnum].adj);
+#if 0 /*JP*/
             donefirst = TRUE;
+#endif
         }
     } else {
         /* if gender not specified, but role is specified
@@ -1888,14 +1898,18 @@ int buflen, rolenum, racenum, gendnum, alignnum;
 #endif
             Strcat(buf, (rolenum == ROLE_NONE) ? races[racenum].noun
                                                : races[racenum].adj);
+#if 0 /*JP*/
             donefirst = TRUE;
+#endif
         } else if (!validrole(rolenum)) {
 #if 0 /*JP*/
             if (donefirst)
                 Strcat(buf, " ");
 #endif
             Strcat(buf, races[racenum].noun);
+#if 0 /*JP*/
             donefirst = TRUE;
+#endif
         } else {
             pa[BP_RACE] = 1;
             post_attribs++;
@@ -1924,7 +1938,9 @@ int buflen, rolenum, racenum, gendnum, alignnum;
             } else
                 Strcat(buf, roles[rolenum].name.m);
         }
+#if 0 /*JP*/
         donefirst = TRUE;
+#endif
     } else if (rolenum == ROLE_NONE) {
         pa[BP_ROLE] = 1;
         post_attribs++;
@@ -1940,7 +1956,9 @@ int buflen, rolenum, racenum, gendnum, alignnum;
         Strcat(buf, "character");
 */
         Strcat(buf, "\83L\83\83\83\89\83N\83^\81[");
+#if 0 /*JP*/
         donefirst = TRUE;
+#endif
     }
     /* <your lawful female gnomish cavewoman> || <your lawful female gnome>
      *    || <your lawful female character>

diff --git a/src/sounds.c b/src/sounds.c
index 7230453..9b5fc15 100644 (file)
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -211,7 +211,9 @@ dosounds()
                 continue;
             if ((is_undead(mtmp->data) || is_vampshifter(mtmp))
                 && mon_in_room(mtmp, MORGUE)) {
+#if 0 /*JP*/
                 const char *hair = body_part(HAIR); /* hair/fur/scales */
+#endif
 
                 switch (rn2(2) + hallu) {
                 case 0:

diff --git a/src/timeout.c b/src/timeout.c
index 8f77668..05e2b06 100644 (file)
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -1290,12 +1290,18 @@ anything *arg;
 long timeout;
 {
     struct obj *obj = arg->a_obj;
+#if 0 /*JP*/
     boolean canseeit, many, menorah, need_newsym, need_invupdate;
+#else
+    boolean canseeit, menorah, need_newsym, need_invupdate;
+#endif
     xchar x, y;
     char whose[BUFSZ];
 
     menorah = obj->otyp == CANDELABRUM_OF_INVOCATION;
+#if 0 /*JP*/
     many = menorah ? obj->spe > 1 : obj->quan > 1L;
+#endif
 
     /* timeout while away */
     if (timeout != monstermoves) {

diff --git a/src/trap.c b/src/trap.c
index f2f758b..300cec8 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -4508,14 +4508,20 @@ boolean force;
     } else if (obj->oclass == POTION_CLASS) {
         if (obj->otyp == POT_ACID) {
             char *bufp;
+#if 0 /*JP*/
             boolean one = (obj->quan == 1L), update = carried(obj),
                     exploded = FALSE;
+#else
+            boolean update = carried(obj);
+#endif
 
             if (Blind && !carried(obj))
                 obj->dknown = 0;
+#if 0 /*JP*/
             if (acid_ctx.ctx_valid)
                 exploded = ((obj->dknown ? acid_ctx.dkn_boom
                                          : acid_ctx.unk_boom) > 0);
+#endif
             /* First message is
              * "a [potion|<color> potion|potion of acid] explodes"
              * depending on obj->dknown (potion has been seen) and
@@ -5470,9 +5476,15 @@ boolean force;
     struct trap *ttmp;
     struct monst *mtmp;
     const char *trapdescr;
+#if 0 /*JP*/
     boolean here, useplural, deal_with_floor_trap,
             confused = (Confusion || Hallucination),
             trap_skipped = FALSE;
+#else
+    boolean here, deal_with_floor_trap,
+            confused = (Confusion || Hallucination),
+            trap_skipped = FALSE;
+#endif
     int boxcnt = 0;
     char the_trap[BUFSZ], qbuf[QBUFSZ];
 
@@ -5520,7 +5532,9 @@ boolean force;
             Strcat(the_trap, (boxcnt == 1) ? "a container" : "containers");
 */
             Strcat(the_trap, "\97e\8aí");
+#if 0 /*JP*/
         useplural = ((ttmp && boxcnt > 0) || boxcnt > 1);
+#endif
         /* note: boxcnt and useplural will always be 0 for !here case */
         if (ttmp || boxcnt)
 #if 0 /*JP*/

diff --git a/src/uhitm.c b/src/uhitm.c
index 83b760f..6c24a0c 100644 (file)
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -711,10 +711,14 @@ int dieroll;
     int jousting = 0;
     int wtype;
     struct obj *monwep;
+#if 0 /*JP*/
     char unconventional[BUFSZ]; /* substituted for word "attack" in msg */
+#endif
     char saved_oname[BUFSZ];
 
+#if 0 /*JP*/
     unconventional[0] = '\0';
+#endif
     saved_oname[0] = '\0';
 
     wakeup(mon, TRUE);

diff --git a/src/wield.c b/src/wield.c
index 82a2ae1..296ca78 100644 (file)
--- a/src/wield.c
+++ b/src/wield.c
@@ -510,9 +510,9 @@ dowieldquiver()
 */
             Strcpy(qbuf, "\91ã\82í\82è\82É\82±\82ê\82ç\91S\95\94\82ð\8f\80\94õ\82·\82é\81H");
         } else {
+#if 0 /*JP*/
             boolean use_plural = (is_plural(uwep) || pair_of(uwep));
 
-#if 0 /*JP*/
             Sprintf(qbuf, "You are wielding %s.  Ready %s instead?",
                     !use_plural ? "that" : "those",
                     !use_plural ? "it" : "them");
@@ -568,9 +568,9 @@ dowieldquiver()
 */
             Strcpy(qbuf, "\91ã\82í\82è\82É\82±\82ê\82ç\91S\95\94\82ð\8f\80\94õ\82·\82é\81H");
         } else {
+#if 0 /*JP*/
             boolean use_plural = (is_plural(uswapwep) || pair_of(uswapwep));
 
-#if 0 /*JP*/
             Sprintf(qbuf, "%s your %s weapon.  Ready %s instead?",
                     !use_plural ? "That is" : "Those are",
                     u.twoweap ? "second" : "alternate",
@@ -639,8 +639,8 @@ wield_tool(obj, verb)
 struct obj *obj;
 const char *verb; /* "rub",&c */
 {
-    const char *what;
 #if 0 /*JP*/
+    const char *what;
     boolean more_than_1;
 #endif
 
@@ -650,9 +650,7 @@ const char *verb; /* "rub",&c */
 #if 0 /*JP*/
     if (!verb)
         verb = "wield";
-#endif
     what = xname(obj);
-#if 0 /*JP*/
     more_than_1 = (obj->quan > 1L || strstri(what, "pair of ") != 0
                    || strstri(what, "s of ") != 0);
 #endif

diff --git a/src/zap.c b/src/zap.c
index 39e6685..99b7f00 100644 (file)
--- a/src/zap.c
+++ b/src/zap.c
@@ -2873,8 +2873,10 @@ int amt;          /* pseudo-damage used to determine blindness duration */
         pline("\82¨\82í\81C\8cõ\82ª\92É\82¢%s", (dmg > 2 || u.mh <= 5) ? "\81I" : "\81D");
         /* [composing killer/reason is superfluous here; if fatal, cause
            of death will always be "killed while stuck in creature form"] */
+#if 0 /*JP*/
         if (obj->oclass == SCROLL_CLASS || obj->oclass == SPBOOK_CLASS)
             ordinary = FALSE; /* say blasted rather than zapped */
+#endif
         how = (obj->oclass != SPBOOK_CLASS)
                   ? (const char *) ansimpleoname(obj)
 /*JP

diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 33946a4..c39eefb 100644 (file)
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -2591,9 +2591,6 @@ int x, y;
 char ch;
 {
     register struct WinDesc *cw = 0;
-#if 1 /*JP*/
-    static int prev_win;
-#endif
 
     if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0)
         panic(winpanicstr, window);
@@ -2623,9 +2620,6 @@ char ch;
         impossible("Can't putsym to window type %d", cw->type);
         break;
     }
-#if 1 /*JP*/
-    prev_win = cw->type;
-#endif
 }
 
 STATIC_OVL const char *