Commit: 9cb23ea26fe57ac2161c5fbc52707dda1120d471 - jnethack_source (git)

JNetHackのソースをいじくったものを置いておくための場所

Commit MetaInfo

• Révision: 9cb23ea26fe57ac2161c5fbc52707dda1120d471 (tree)
• l'heure: 2018-01-22 03:42:21
• Auteur: SHIRAKATA Kentaro <argrath@ub32...>
• Commiter: SHIRAKATA Kentaro

Message de Log

eliminate warnings

Change Summary

• modified: src/apply.c
• modified: src/artifact.c
• modified: src/attrib.c
• modified: src/do.c
• modified: src/eat.c
• modified: src/mhitu.c
• modified: src/objnam.c
• modified: src/polyself.c
• modified: src/potion.c
• modified: src/role.c
• modified: src/shk.c
• modified: src/steal.c
• modified: src/topten.c
• modified: src/weapon.c
• modified: src/wield.c
• modified: src/write.c
• modified: sys/winnt/nttty.c

Modification

--- a/src/apply.c
+++ b/src/apply.c
@@ -240,7 +240,9 @@ int rx, ry, *resp;
 {
     char buf[BUFSZ];
     boolean more_corpses;
+#if 0 /*JP*/
     struct permonst *mptr;
+#endif
     struct obj *corpse = sobj_at(CORPSE, rx, ry),
                *statue = sobj_at(STATUE, rx, ry);
 

--- a/src/artifact.c
+++ b/src/artifact.c
@@ -986,7 +986,11 @@ boolean vis;               /* whether the action can be seen */
 char *hittee;              /* target's name: "you" or mon_nam(mdef) */
 {
     struct permonst *old_uasmon;
+#if 0 /*JP*/
     const char *verb, *fakename;
+#else
+    const char *verb;
+#endif
     boolean youattack = (magr == &youmonst), youdefend = (mdef == &youmonst),
             resisted = FALSE, do_stun, do_confuse, result;
     int attack_indx, scare_dieroll = MB_MAX_DIEROLL / 2;

--- a/src/attrib.c
+++ b/src/attrib.c
@@ -926,7 +926,9 @@ int propidx; /* special cases can have negative values */
         static NEARDATA const char because_of[] = "%sによって";
 
         if (propidx >= 0) {
+#if 0 /*JP*/
             char *p;
+#endif
             struct obj *obj = (struct obj *) 0;
             int innate = is_innate(propidx);
 

--- a/src/do.c
+++ b/src/do.c
@@ -1819,7 +1819,9 @@ boolean at_stairs, falling, portal;
 #endif
         };
         const char *mesg;
+#if 0 /*JP*/
         char buf[BUFSZ];
+#endif
         int which = rn2(4);
 
         if (Hallucination)

--- a/src/eat.c
+++ b/src/eat.c
@@ -1393,7 +1393,9 @@ struct obj *obj;
 int mnum;
 char *buf;
 {
+#if 0 /*JP*/
     char buf2[BUFSZ];
+#endif
     int r = tin_variety(obj, TRUE);
 
     if (obj && buf) {

--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -718,7 +718,11 @@ register struct monst *mtmp;
 
         if (!rn2(10) && !mtmp->mcan) {
             int numseen, numhelp;
+#if 0 /*JP*/
             char buf[BUFSZ], genericwere[BUFSZ];
+#else
+            char genericwere[BUFSZ];
+#endif
 
 /*JP
             Strcpy(genericwere, "creature");

--- a/src/objnam.c
+++ b/src/objnam.c
@@ -1080,9 +1080,11 @@ boolean with_price;
     boolean known, cknown, bknown, lknown;
     int omndx = obj->corpsenm;
     char prefix[PREFIX];
+#if 0 /*JP*/
     char tmpbuf[PREFIX + 1]; /* for when we have to add something at
                                 the start of prefix instead of the
                                 end (Strcat is used on the end) */
+#endif
     register char *bp = xname(obj);
 #if 1 /*JP*//*順序入れ替えに使う*/
     char preprefix[PREFIX];
@@ -3034,15 +3036,15 @@ struct obj *no_wish;
     int eroded, eroded2, erodeproof;
     int halfeaten, mntmp, contents;
     int islit, unlabeled, ishistoric, isdiluted, trapped;
+#if 0 /*JP*/
     int tmp, tinv, tvariety;
+#else
+    int tvariety;
+#endif
     int wetness;
     struct fruit *f;
     int ftype = context.current_fruit;
     char fruitbuf[BUFSZ];
-#if 1 /*JP*/
-    char buf[BUFSZ];
-    char pfx[BUFSZ];
-#endif
     /* Fruits may not mess up the ability to wish for real objects (since
      * you can leave a fruit in a bones file and it will be added to
      * another person's game), so they must be checked for last, after

--- a/src/polyself.c
+++ b/src/polyself.c
@@ -541,7 +541,11 @@ int psflags;
                     You("鱗の鎧と一体化した．");
                 } else { /* dragon scale mail */
                     /* d.scale mail first reverts to scales */
+#if 0 /*JP*/
                     char *p, *dsmail;
+#else
+                    char *dsmail;
+#endif
 
                     /* similar to noarmor(invent.c),
                        shorten to "<color> scale mail" */
@@ -1183,7 +1187,11 @@ drop_weapon(alone)
 int alone;
 {
     struct obj *otmp;
+#if 0 /*JP*/
     const char *what, *which, *whichtoo;
+#else
+    const char *which, *whichtoo;
+#endif
     boolean candropwep, candropswapwep;
 
     if (uwep) {

--- a/src/potion.c
+++ b/src/potion.c
@@ -268,7 +268,9 @@ boolean talk;
 {
     long old = Blinded;
     boolean u_could_see, can_see_now;
+#if 0 /*JP*/
     const char *eyes;
+#endif
 
     /* we need to probe ahead in case the Eyes of the Overworld
        are or will be overriding blindness */

--- a/src/role.c
+++ b/src/role.c
@@ -1947,7 +1947,11 @@ int buflen, rolenum, racenum, gendnum, alignnum;
 */
     const char *defprompt = "適当にキャラクターを選んでよいですか？[ynaq] ";
     int num_post_attribs = 0;
+#if 0 /*JP*/
     char tmpbuf[BUFSZ], *p;
+#else
+    char tmpbuf[BUFSZ];
+#endif
 
     if (buflen < QBUFSZ)
         return (char *) defprompt;

--- a/src/shk.c
+++ b/src/shk.c
@@ -2690,7 +2690,11 @@ const char *fmt; /* "%s %ld %s %s", doname(obj), amt, plur(amt), arg */
 long amt;
 const char *arg;
 {
+#if 0 /*JP*/
     char *obj_name, fmtbuf[BUFSZ];
+#else
+    char *obj_name;
+#endif
     boolean was_unknown = !obj->dknown;
 
     obj->dknown = TRUE;
@@ -3451,7 +3455,11 @@ xchar x, y;
         }
     } else {
         char qbuf[BUFSZ], qsfx[BUFSZ];
+#if 0 /*JP*/
         boolean short_funds = (offer > shkmoney), one;
+#else
+        boolean short_funds = (offer > shkmoney);
+#endif
 
         if (short_funds)
             offer = shkmoney;

--- a/src/steal.c
+++ b/src/steal.c
@@ -100,8 +100,10 @@ register struct monst *mtmp;
     register struct obj *fgold = g_at(u.ux, u.uy);
     register struct obj *ygold;
     register long tmp;
+#if 0 /*JP*/
     struct monst *who;
     const char *whose, *what;
+#endif
 
     /* skip lesser coins on the floor */
     while (fgold && fgold->otyp != GOLD_PIECE)

--- a/src/topten.c
+++ b/src/topten.c
@@ -110,7 +110,9 @@ int how;
         /* PANICKED, TRICKED, QUIT, ESCAPED, ASCENDED */
         "", "", "", "", ""
     };
+#if 0 /*JP*/
     unsigned l;
+#endif
     char *kname = killer.name;
 
     buf[0] = '\0'; /* so strncat() can find the end */
@@ -826,7 +828,11 @@ boolean so;
 {
     boolean second_line = TRUE;
     char linebuf[BUFSZ];
+#if 0 /*JP*/
     char *bp, hpbuf[24], linebuf3[BUFSZ];
+#else
+    char *bp, hpbuf[24];
+#endif
     int hppos, lngr;
 #if 1 /*JP*/
     char who[BUFSZ];

--- a/src/weapon.c
+++ b/src/weapon.c
@@ -719,7 +719,9 @@ register struct monst *mon;
          */
         if (mw_tmp && mwelded(mw_tmp)) {
             if (canseemon(mon)) {
+#if 0 /*JP*/
                 char welded_buf[BUFSZ];
+#endif
                 const char *mon_hand = mbodypart(mon, HAND);
 
                 if (bimanual(mw_tmp))

--- a/src/wield.c
+++ b/src/wield.c
@@ -483,7 +483,9 @@ struct obj *obj;
 const char *verb; /* "rub",&c */
 {
     const char *what;
+#if 0 /*JP*/
     boolean more_than_1;
+#endif
 
     if (obj == uwep)
         return TRUE; /* nothing to do if already wielding it */

--- a/src/write.c
+++ b/src/write.c
@@ -100,7 +100,11 @@ dowrite(pen)
 register struct obj *pen;
 {
     register struct obj *paper;
+#if 0 /*JP*/
     char namebuf[BUFSZ], *nm, *bp;
+#else
+    char namebuf[BUFSZ], *nm;
+#endif
     register struct obj *new_obj;
     int basecost, actualcost;
     int curseval;

--- a/sys/winnt/nttty.c
+++ b/sys/winnt/nttty.c
@@ -500,7 +500,7 @@ int ch2;
 
     attrs[0] = attrs[1] = attr;
 
-    WriteConsoleOutputAttribute(hConOut,&attrs,2,
+    WriteConsoleOutputAttribute(hConOut,(WORD *)(&attrs),2,
 				cursor,&acount);
     WriteConsoleOutputCharacter(hConOut,buf,2,
 				cursor,&ccount);