JNetHack

Fork

• source
• tool
• htdocs

[jnh-cvs 580] [707] (almost) fix bug #21501

svnno****@sourc***** svnno****@sourc*****
2013年 4月 1日 (月) 03:29:19 JST

• 次の記事 [jnh-cvs 581] [708] fix comment inconsistency
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 707
          http://sourceforge.jp/projects/jnethack/scm/svn/commits/707
Author:   argrath
Date:     2013-04-01 03:29:18 +0900 (Mon, 01 Apr 2013)
Log Message:
-----------
(almost) fix bug #21501

Ticket Links:
------------
    http://sourceforge.jp/projects/jnethack/tracker/detail/21501

Modified Paths:
--------------
    jnethack/trunk/src/apply.c
    jnethack/trunk/src/artifact.c
    jnethack/trunk/src/bones.c
    jnethack/trunk/src/cmd.c
    jnethack/trunk/src/detect.c
    jnethack/trunk/src/do.c
    jnethack/trunk/src/do_wear.c
    jnethack/trunk/src/mon.c
    jnethack/trunk/src/monmove.c
    jnethack/trunk/src/timeout.c
    jnethack/trunk/src/wield.c
    jnethack/trunk/src/zap.c

Modified: jnethack/trunk/src/apply.c
===================================================================
--- jnethack/trunk/src/apply.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/apply.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -69,7 +69,7 @@
 /*JP
 		pline("Using your camera underwater would void the warranty.");
 */
-		pline("\xA4\xBD\xA4\xF3\xA4ʤ\xB3\xA4Ȥ򤷤\xBF\xA4\xE9\xCAݾڤ\xAC\xB8\xFA\xA4\xAB\xA4ʤ\xAF\xA4ʤ롥");
+		pline("\xBF\xE5\xCC̲\xBC\xA4ǤΥ\xAB\xA5\xE1\xA5\xE9\xA4λ\xC8\xCDѤ\xCF\xCAݾڤ\xCE\xC2оݳ\xB0\xA4Ǥ\xB9\xA1\xA5");
 		return(0);
 	}
 	if(!getdir((char *)0)) return(0);
@@ -162,7 +162,8 @@
 			    You("push your %s %s.", what,
 				rn2(2) ? "cock-eyed" : "crooked");
 #else
-			    pline("%s\xA4\xAC\xA4\xBA\xA4줿\xA1\xA5", what);
+			    pline("%s\xA4\xAC%s\xA1\xA5", what,
+				rn2(2) ? "\xA4\xBA\xA4줿" : "\xA4椬\xA4\xF3\xA4\xC0");
 #endif
 			} else {
 			    struct obj *saved_ublindf = ublindf;
@@ -934,14 +935,14 @@
 /*JP
 		    pline ("%s is too tired to look at your mirror.",
 */
-		    pline ("%s\xA4ϤȤƤ\xE2\xC8\xE8\xA4\xEC\xA4Ƥ\xA4\xA4ƶ\xC0\xA4򸫤뤳\xA4Ȥ\xAC\xA4Ǥ\xAD\xA4ʤ\xA4\xA1\xA5",
+		    pline ("%s\xA4ϤȤƤ\xE2\xC8\xE8\xA4\xEC\xA4Ƥ\xA4\xA4ƶ\xC0\xA4򸫤\xEB\xA4ɤ\xB3\xA4\x{D938}\xA4\xE3\xA4ʤ\xA4\xA1\xA5",
 			    Monnam(mtmp));
 	} else if (!mtmp->mcansee) {
 	    if (vis)
 /*JP
 		pline("%s can't see anything right now.", Monnam(mtmp));
 */
-		pline("%s\xA4ϸ\xB8\xB3Ф˽\xB1\xA4\xEF\xA4\xEC\xA4Ƥ\xA4\xA4ơ\xA4\xA4\xC1\xA4\xE3\xA4\xF3\xA4ȸ\xAB\xA4뤳\xA4Ȥ\xAC\xA4Ǥ\xAD\xA4ʤ\xA4\xA1\xA5", Monnam(mtmp));
+		pline("%s\xA4Ϻ\xA3\xA4ΤȤ\xB3\xA4\xED\xA4ޤȤ\xE2\xA4˸\xAB\xA4뤳\xA4Ȥ\xAC\xA4Ǥ\xAD\xA4ʤ\xA4\xA1\xA5", Monnam(mtmp));
 	/* some monsters do special things */
 	} else if (mlet == S_VAMPIRE || mlet == S_GHOST) {
 	    if (vis)
@@ -1193,7 +1194,7 @@
 /*JP
 		You("cannot make fire under water.");
 */
-		You("\xBF\xE5\xC3\xE6\xA4DzФϤ\xAA\xA4\xB3\xA4\xBB\xA4ʤ\xA4\xA1\xA5");
+		You("\xBF\xE5\xC3\xE6\xA4DzФ򤪤\xB3\xA4\xBB\xA4ʤ\xA4\xA1\xA5");
 		return;
 	}
 	if(obj->lamplit) {
@@ -2244,7 +2245,7 @@
 			You_feel("%s %s from your pack!", something,
 			    locomotion(mtmp->data,"drop"));
 #else
-			You_feel("%s\xA4\xAC\xA4\xA2\xA4ʤ\xBF\xA4γ󤫤\xE9%s\xA1\xAA", something,
+			You_feel("%s\xA4\xAC\xA4\xA2\xA4ʤ\xBF\xA4γ󤫤\xE9%s\xA4褦\xA4\xC0\xA1\xAA", something,
 				 jpast(locomotion(mtmp->data,"\xCD\xEE\xA4\xC1\xA4\xEB")));
 #endif
 		    else
@@ -2253,7 +2254,7 @@
 			    monnambuf,
 			    locomotion(mtmp->data,"drop"));
 #else
-			You("%s\xA4\xAC\xA4\xA2\xA4ʤ\xBF\xA4γ󤫤\xE9%s\xA1\xAA",
+			You("%s\xA4\xAC\xA4\xA2\xA4ʤ\xBF\xA4γ󤫤\xE9%s\xA4Τ򸫤\xBF\xA1\xAA",
 			    monnambuf,
 			    jpast(locomotion(mtmp->data,"\xCD\xEE\xA4\xC1\xA4\xEB")));
 #endif
@@ -2264,7 +2265,7 @@
 /*JP
 			You("suddenly see a figurine transform into %s!",
 */
-			You("\xC6\xCD\xC1\xB3\xBFͷ\xC1\xA4\xCF%s\xA4ˤʤä\xBF\xA1\xAA",
+			You("\xBFͷ\xC1\xA4\xAC\xC6\xCD\xC1\xB3%s\xA4ˤʤä\xBF\xA4Τ򸫤\xBF\xA1\xAA",
 				monnambuf);
 			redraw = TRUE;	/* update figurine's map location */
 		    }
@@ -2361,7 +2362,7 @@
 /*JP
 			You("cannot fit the figurine on the boulder.");
 */
-		    You("\xB4\xE4\xA4ξ\xE5\xA4ˤϿͷ\xC1\xA4\xF2\xC3֤\xB1\xA4ʤ\xA4\xA1\xA5");
+		    You("\xB4\xE4\xA4˿ͷ\xC1\xA4򲡤\xB7\xB9\xFE\xA4ळ\xA4ȤϤǤ\xAD\xA4ʤ\xA4\xA1\xA5");
 		return FALSE;
 	}
 	return TRUE;
@@ -3220,7 +3221,7 @@
 				an(mons[otmp->corpsenm].mname));
 			pline("Snatching %s is a fatal mistake.", kbuf);
 #else
-			pline("%s\xA4λ\xE0\xC2Τ\xF2å\xA4ä\xBF\xA4Τ\xCF\xC3\xD7̿Ū\xA4ʥߥ\xB9\xA4\xC0\xA1\xA5",
+			pline("%s\xA4λ\xE0\xC2Τ\xF2å\xA4ä\xBF\xA4Τ\xCF\xC3\xD7̿Ū\xA4ʴְ㤤\xA4\xC0\xA1\xA5",
 				jtrns_mon(mons[otmp->corpsenm].mname));
 			Sprintf(kbuf, "%s\xA4λ\xE0\xC2Τ˿\xA8\xA4\xEC\xA4\xC6",
 				jtrns_mon(mons[otmp->corpsenm].mname));

Modified: jnethack/trunk/src/artifact.c
===================================================================
--- jnethack/trunk/src/artifact.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/artifact.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -773,7 +773,7 @@
 	{ "prod", "amaze", "tickle", "purge" },
 #else
 	/* Mb_hit() \xA4\xC7 "%s\xA4\xBF"\xA4η\xC1\xA4\xC7\xCD\xF8\xCD\xD1 */
-	{"Ĵ\xA4\xD9", "\xA4\xAF\xA4餯\xA4餵\xA4\xBB", "\xB6\xB1\xA4\xA8\xA4\xB5\xA4\xBB", "\xBE\x{132F64}\xB7"},
+	{"Ĵ\xBA\xBA\xA4\xB7", "\xA4\xAF\xA4餯\xA4餵\xA4\xBB", "\xB6\xB1\xA4\xA8\xA4\xB5\xA4\xBB", "\xBE\x{132F64}\xB7"},
 	{ "\xCE\xE5\xA4ޤ\xB7", "\xB6ä\xAB\xA4\xBB", "\xA4\xAF\xA4\xB9\xA4\xB0\xA4\xC3", "\xC0\xB6\xA4\xE1" },
 #endif
 };
@@ -925,7 +925,7 @@
 /*JP
 	    pline_The("%s is insightful.", verb);
 */
-	    pline("\xBC\xB1\xCA̤Ǥ\xAD\xA4\xBF\xA1\xA5");
+	    pline("\xC1\xEA\xBC\xEA\xA4\xF2%s\xA4\xBF\xA1\xA5", verb);
 	    /* pre-damage status */
 	    probe_monster(mdef);
 	}
@@ -1405,7 +1405,7 @@
 /*JP
 		You_feel("re-energized.");
 */
-		You("\xA5\xA8\xA5ͥ륮\xA1\xBC\xA4\xAC\xCB\xFE\xA4\xBF\xA4\xB5\xA4줿\xA1\xA5");
+		You("\xA5\xA8\xA5ͥ륮\xA1\xBC\xA4\xC7\xCB\xFE\xA4\xBF\xA4\xB5\xA4줿\xA1\xA5");
 		u.uen += epboost;
 		flags.botl = 1;
 	    } else
@@ -1565,7 +1565,7 @@
 /*JP
 		You_feel("a surge of power, but nothing seems to happen.");
 */
-		You("\xCEϤ\xAC\xB1\xB2\xB4\xAC\xA4\xA4\xA4\xBF\xA4褦\xA4ʵ\xA4\xA4\xAC\xA4\xB7\xA4\xBF\xA1\xA4\xA4\xB7\xA4\xAB\xA4\xB7\xB2\xBF\xA4ⵯ\xA4\xAD\xA4ʤ\xAB\xA4ä\xBF\xA1\xA5");
+		You("\xCEϤι\xE2\xA4ޤ\xEA\xA4򴶤\xB8\xA4\xBF\xA4\xAC\xA1\xA4\xB2\xBF\xA4ⵯ\xA4\xAD\xA4ʤ\xAB\xA4ä\xBF\xA1\xA5");
 	    return 1;
 	}
 	switch(oart->inv_prop) {

Modified: jnethack/trunk/src/bones.c
===================================================================
--- jnethack/trunk/src/bones.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/bones.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -217,9 +217,15 @@
 		compress_bonesfile();
 #ifdef WIZARD
 		if (wizard) {
+/*JP
 		    if (yn("Bones file already exists.  Replace it?") == 'y') {
+*/
+		    if (yn("\xB9\xFC\xA5ե\xA1\xA5\xA4\xA5뤬\xB4\xFB\xA4\xCB¸\xBAߤ\xB7\xA4Ƥ\xEB\xA4补  \xC3֤\xAD\xB4\xB9\xA4\xA8\xA4롩") == 'y') {
 			if (delete_bonesfile(&u.uz)) goto make_bones;
+/*JP
 			else pline("Cannot unlink old bones.");
+*/
+			else pline("\xB8Ť\xA4\xB9\xFC\xA4\xF2\xBA\xEF\xBD\xFC\xA4Ǥ\xAD\xA4ʤ\xAB\xA4ä\xBF\xA1\xA5");
 		    }
 		}
 #endif
@@ -362,7 +368,10 @@
 	    if (bytes_counted > freediskspace(bones)) { /* not enough room */
 # ifdef WIZARD
 		if (wizard)
+/*JP
 			pline("Insufficient space to create bones file.");
+*/
+			pline("\xB9\xFC\xA5ե\xA1\xA5\xA4\xA5\xEB\xA4\xF2\xC0\xB8\xC0\xAE\xA4\xB9\xA4뤿\xA4\xE1\xA4ν\xBCʬ\xA4\xCA\xCEΰ褬\xA4ʤ\xA4\xA1\xA5");
 # endif
 		(void) close(fd);
 		cancel_bonesfile();
@@ -414,7 +423,10 @@
 	} else {
 #ifdef WIZARD
 		if(wizard)  {
+/*JP
 			if(yn("Get bones?") == 'n') {
+*/
+			if(yn("\xB9\xFC\xA4򽦤\xA6\xA1\xA9") == 'n') {
 				(void) close(fd);
 				compress_bonesfile();
 				return(0);
@@ -426,7 +438,10 @@
 		if (strcmp(bonesid, oldbonesid) != 0) {
 			char errbuf[BUFSZ];
 
+/*JP
 			Sprintf(errbuf, "This is bones level '%s', not '%s'!",
+*/
+			Sprintf(errbuf, "\xA4\xB3\xA4ι\xFC\xA4Υ\xEC\xA5٥\xEB\xA4\xCF'%s'\xA4Ǥ\xA2\xA4äơ\xA2'%s'\xA4ǤϤʤ\xA4\xA1\xAA",
 				oldbonesid, bonesid);
 #ifdef WIZARD
 			if (wizard) {
@@ -467,7 +482,10 @@
 
 #ifdef WIZARD
 	if(wizard) {
+/*JP
 		if(yn("Unlink bones?") == 'n') {
+*/
+		if(yn("\xB9\xFC\xA4\xF2\xBEä\xB9\xA1\xA9") == 'n') {
 			compress_bonesfile();
 			return(ok);
 		}

Modified: jnethack/trunk/src/cmd.c
===================================================================
--- jnethack/trunk/src/cmd.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/cmd.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -671,7 +671,10 @@
     int newlevel;
     int ret;
 
+/*JP
     getlin("To what experience level do you want to be set?", buf);
+*/
+    getlin("\xB7и\xB3\xA5\xEC\xA5٥\xEB\xA4򤤤\xAF\xA4Ĥ\xCB\xC0\xDF\xC4ꤷ\xA4ޤ\xB9\xA4\xAB\xA1\xA9", buf);
     (void)mungspaces(buf);
     if (buf[0] == '\033' || buf[0] == '\0') ret = 0;
     else ret = sscanf(buf, "%d", &newlevel);
@@ -681,18 +684,30 @@
 	return 0;
     }
     if (newlevel == u.ulevel) {
+/*JP
 	You("are already that experienced.");
+*/
+	You("\xA4\xB9\xA4Ǥˤ\xBD\xA4ηи\xB3\xA5\xEC\xA5٥\xEB\xA4\xC0\xA1\xA5");
     } else if (newlevel < u.ulevel) {
 	if (u.ulevel == 1) {
+/*JP
 	    You("are already as inexperienced as you can get.");
+*/
+	    You("\xA4\xB9\xA4Ǥ˲\xC4ǽ\xA4ʸ¤\xEA\xA4κ\xC7\xC4\xE3\xA4ηи\xB3\xA5\xEC\xA5٥\xEB\xA4\xC0\xA1\xA5");
 	    return 0;
 	}
 	if (newlevel < 1) newlevel = 1;
 	while (u.ulevel > newlevel)
+/*JP
 	    losexp("#levelchange");
+*/
+	    losexp("#levelchange\xA5\xB3\xA5ޥ\xF3\xA5ɤ\xC7");
     } else {
 	if (u.ulevel >= MAXULEV) {
+/*JP
 	    You("are already as experienced as you can get.");
+*/
+	    You("\xA4\xB9\xA4Ǥ˲\xC4ǽ\xA4ʸ¤\xEA\xA4κ\xC7\xC2\xE7\xA4ηи\xB3\xA5\xEC\xA5٥\xEB\xA4\xC0\xA1\xA5");
 	    return 0;
 	}
 	if (newlevel > MAXULEV) newlevel = MAXULEV;
@@ -707,7 +722,10 @@
 STATIC_PTR int
 wiz_panic()
 {
+/*JP
 	if (yn("Do you want to call panic() and end your game?") == 'y')
+*/
+	if (yn("panic()\xB4ؿ\xF4\xA4\xF2\xB8ƤӽФ\xB7\xA4ƥ\xB2\xA1\xBC\xA5\xE0\xA4\xF2\xBD\xAAλ\xA4\xB5\xA4\xBB\xA4ޤ\xB9\xA4\xAB\xA1\xA9") == 'y')
 		panic("crash test.");
         return 0;
 }
@@ -1464,12 +1482,13 @@
 	} else
 #else
 	if (u.ugangr) {
-	    Sprintf(buf, "%s\xA4\xCF%s\xC5ܤä\xC6", u_gname(),
-		    u.ugangr > 6 ? "\xCC\xD4\xCE\xF5\xA4\xCB" : u.ugangr > 3 ? "\xA4ȤƤ\xE2" : "");
+	    Sprintf(buf, "%s\xA4\xCF%s\xC5ܤä\xC6%s", u_gname(),
+		    u.ugangr > 6 ? "\xCC\xD4\xCE\xF5\xA4\xCB" : u.ugangr > 3 ? "\xA4ȤƤ\xE2" : "",
+		    final ? ita : iru);
 #ifdef WIZARD
 	    if (wizard) Sprintf(eos(buf), "(%d)", u.ugangr);
 #endif
-	    enl_msg(buf, iru, ita, "");
+	    enl_msg(buf, "", "", "");
 	} else
 #endif
 	    /*
@@ -1491,12 +1510,18 @@
 #endif
 	    you_can(buf);
 #else /*JP*/
-	    Strcpy(buf, "\xA4\xA2\xA4ʤ\xBF\xA4ϰ\xC2\xC1\xB4\xA4˵\xA7\xA4뤳\xA4Ȥ\xAC");
-	    if(can_pray(FALSE))
-	      enl_msg(buf, "\xA4Ǥ\xAD\xA4\xEB", "\xA4Ǥ\xAD\xA4\xBF", "");
-	    else
-	      enl_msg(buf, "\xA4Ǥ\xAD\xA4ʤ\xA4", "\xA4Ǥ\xAD\xA4ʤ\xAB\xA4ä\xBF", "");
+	    Sprintf(buf, "\xA4\xA2\xA4ʤ\xBF\xA4ϰ\xC2\xC1\xB4\xA4˵\xA7\xA4뤳\xA4Ȥ\xAC");
+#if 0
+	    if(can_pray(FALSE)) Strcat(buf, final ? could : can);
+	    else Strcat(buf, final ? "\xA4Ǥ\xAD\xA4ʤ\xAB\xA4ä\xBF" : "\xA4Ǥ\xAD\xA4ʤ\xA4");
+#else
+	    Strcat(buf, can_pray(FALSE) ? can : "\xA4Ǥ\xAD\xA4ʤ\xA4");
 #endif
+#ifdef WIZARD
+	    if (wizard) Sprintf(eos(buf), " (%d)", u.ublesscnt);
+#endif
+	    enl_msg(buf, "", "", "");
+#endif /*JP*/
 	}
 
     {

Modified: jnethack/trunk/src/detect.c
===================================================================
--- jnethack/trunk/src/detect.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/detect.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -1029,12 +1029,12 @@
 /*JP
 	    case 4 : You("see goldfish swimming above fluorescent rocks.");
 */
-	    case 4 : You("\xB7ָ\xF7\xB4\xE4\xA4ξ\xE5\xA4\xF2\xB6\xE2\xB5\xFB\xA4\xAC\xB1ˤ\xA4\xA4Ǥ\xA4\xA4\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5");
+	    case 4 : You("\xB7ָ\xF7\xB4\xE4\xA4ξ\xE5\xA4\xF2\xB6\xE2\xB5\xFB\xA4\xAC\xB1ˤ\xA4\xA4Ǥ\xA4\xA4\xEB\xA4Τ򸫤\xBF\xA1\xA5");
 		break;
 /*JP
 	    case 5 : You("see tiny snowflakes spinning around a miniature farmhouse.");
 */
-	    case 5 : You("\xBE\xAE\xA4\xB5\xA4\xA4\xC0\xE3\xCAҤ\xAC\xA5ߥ˥\xC1\xA5奢\xA4\xCE\xC7\xC0\xB2ȤβȤΤޤ\xEF\xA4\xEA\xA4\xF2\xC9\xF1\xA4äƤ\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5");
+	    case 5 : You("\xBE\xAE\xA4\xB5\xA4\xA4\xC0\xE3\xCAҤ\xAC\xA5ߥ˥\xC1\xA5奢\xA4\xCE\xC7\xC0\xB2ȤβȤΤޤ\xEF\xA4\xEA\xA4\xF2\xC9\xF1\xA4äƤ\xEB\xA4Τ򸫤\xBF\xA1\xA5");
 		break;
 /*JP
 	    default: pline("Oh wow... like a kaleidoscope!");
@@ -1113,7 +1113,7 @@
 /*JP
 		You("see the Wizard of Yendor gazing out at you.");
 */
-		You("\xA5\xA4\xA5\xA7\xA5\xF3\xA5\xC0\xA1\xBC\xA4\xCE\xCB\xE2ˡ\xBBȤ\xA4\xA4\xAC\xA4\xA2\xA4ʤ\xBF\xA4\xF2\xA4ˤ\xE9\xA4\xF3\xA4Ǥ\xA4\xA4\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5");
+		You("\xA5\xA4\xA5\xA7\xA5\xF3\xA5\xC0\xA1\xBC\xA4\xCE\xCB\xE2ˡ\xBBȤ\xA4\xA4\xAC\xA4\xA2\xA4ʤ\xBF\xA4\xF2\xA4ˤ\xE9\xA4\xF3\xA4Ǥ\xA4\xA4\xEB\xA4Τ򸫤\xBF\xA1\xA5");
 /*JP
 	    else pline_The("vision is unclear.");
 */

Modified: jnethack/trunk/src/do.c
===================================================================
--- jnethack/trunk/src/do.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/do.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -517,7 +517,7 @@
 /*JP
 		    You("see some air in the sink.");
 */
-		    You("ή\xA4\xB7\xC2\xE6\xA4ξ\xE5\xA4˲\xBF\xA4餫\xA4ε\xA4\xC2Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5");
+		    You("ή\xA4\xB7\xC2\xE6\xA4ξ\xE5\xA4˲\xBF\xA4餫\xA4ε\xA4\xC2Τ򸫤\xBF\xA1\xA5");
 		    break;
 		case RIN_STEALTH:
 /*JP

Modified: jnethack/trunk/src/do_wear.c
===================================================================
--- jnethack/trunk/src/do_wear.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/do_wear.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -1574,7 +1574,7 @@
 		    (uwep->otyp == BATTLE_AXE) ? c_axe : c_weapon);
 #else
 		{
-		    m = jconj(jonmsg(otmp, &j), "\xA4Ƥ\xA4\xA4\xEB");
+		    m = jconj(jonmsg(uwep, &j), "\xA4Ƥ\xA4\xA4\xEB");
 		    You("ξ\xBC\xEA\xBB\xFD\xA4\xC1\xA4\xCE%s%s%s\xA4Τǽ\xE2\xA4ǿȤ\xF2\xBC\xE9\xA4\xEC\xA4ʤ\xA4\xA1\xA5",
 		        is_sword(uwep) ? c_sword :
 		        uwep->otyp == BATTLE_AXE ? c_axe : c_weapon,
@@ -1587,7 +1587,7 @@
 /*JP
 		You("cannot wear a shield while wielding two weapons.");
 */
-		You("ξ\xBC\xEA\xBB\xFD\xA4\xC1\xA4򤷤Ƥ\xA4\xA4\xEB\xB4֤Ͻ\xE2\xA4ǿȤ\xF2\xBC\xE9\xA4\xEC\xA4ʤ\xA4\xA1\xA5");
+		You("\xC6\xF3\xC5\xE1ή\xA4򤷤Ƥ\xA4\xA4\xEB\xA4Τǽ\xE2\xA4ǿȤ\xF2\xBC\xE9\xA4\xEC\xA4ʤ\xA4\xA1\xA5");
 	    err++;
 	} else
 	    *mask = W_ARMS;

Modified: jnethack/trunk/src/mon.c
===================================================================
--- jnethack/trunk/src/mon.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/mon.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -3084,7 +3084,7 @@
 				You("see %sangry guard%s approaching!",
 				  sct == 1 ? "an " : "", sct > 1 ? "s" : "");
 #else
-				You("\xC5ܤä\xBF\xC8\xD6ʼ\xA4\xAC\xB6\xE1\xB4\xF3\xA4äƤ\xAF\xA4\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xAA");
+				You("\xC5ܤä\xBF\xC8\xD6ʼ\xA4\xAC\xB6\xE1\xB4\xF3\xA4äƤ\xAF\xA4\xEB\xA4Τ򸫤\xBF\xA1\xAA");
 #endif
 		} else if(flags.soundok)
 /*JP

Modified: jnethack/trunk/src/monmove.c
===================================================================
--- jnethack/trunk/src/monmove.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/monmove.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -1152,7 +1152,7 @@
 /*JP
 				   You("see a door unlock and open.");
 */
-				   You("\xC8\xE2\xA4θ\xB0\xA4\xAC\xA4Ϥ\xBA\xA4졤\xB3\xAB\xA4\xAF\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5");
+				   You("\xC8\xE2\xA4θ\xB0\xA4\xAC\xA4Ϥ\xBA\xA4졤\xB3\xAB\xA4\xAF\xA4Τ򸫤\xBF\xA1\xA5");
 				else if (flags.soundok)
 /*JP
 				   You_hear("a door unlock and open.");
@@ -1175,7 +1175,7 @@
 /*JP
 				     You("see a door open.");
 */
-				     You("\xC8⤬\xB3\xAB\xA4\xAF\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5");
+				     You("\xC8⤬\xB3\xAB\xA4\xAF\xA4Τ򸫤\xBF\xA1\xA5");
 				else if (flags.soundok)
 /*JP
 				     You_hear("a door open.");

Modified: jnethack/trunk/src/timeout.c
===================================================================
--- jnethack/trunk/src/timeout.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/timeout.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -658,7 +658,7 @@
 			You("see %s %s out of your pack!",
 			    monnambuf, locomotion(mon->data, "drop"));
 #else
-		        pline("%s\xA4\xAC\xA4\xA2\xA4ʤ\xBF\xA4\xCE\xC7\xD8\xC9餤\xC2ޤ\xAB\xA4\xE9%s\xA1\xA5",
+		        You("%s\xA4\xAC\xA4\xA2\xA4ʤ\xBF\xA4\xCE\xC7\xD8\xC9餤\xC2ޤ\xAB\xA4\xE9%s\xA4Τ򸫤\xBF\xA1\xA5",
 			    monnambuf,
 			    jpast(locomotion(mon->data, "\xCD\xEE\xA4\xC1\xA4\xEB")));
 #endif
@@ -938,7 +938,7 @@
 /*JP
 		You("see %s flicker%s.", an(xname(obj)), tailer);
 */
-		You("%s\xA4\xAC%s\xC5\xC0\xCCǤ\xB9\xA4\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5", an(xname(obj)), tailer);
+		You("%s\xA4\xAC%s\xC5\xC0\xCCǤ\xB9\xA4\xEB\xA4Τ򸫤\xBF\xA1\xA5", an(xname(obj)), tailer);
 		break;
 	}
 }
@@ -1046,7 +1046,7 @@
 /*JP
 				You("see a burning potion of oil go out.");
 */
-				You("\xA5\xAA\xA5\xA4\xA5\xEB\xA4βФ\xAC\xBEä\xA8\xA4\xBF\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5");
+				You("\xA5\xAA\xA5\xA4\xA5\xEB\xA4βФ\xAC\xBEä\xA8\xA4\xBF\xA4Τ򸫤\xBF\xA1\xA5");
 				need_newsym = TRUE;
 				break;
 			}
@@ -1125,12 +1125,12 @@
 /*JP
 					You("see a lantern run out of power.");
 */
-					You("\xA5\xE9\xA5󥿥󤬾ä\xA8\xA4\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5");
+					You("\xA5\xE9\xA5󥿥󤬾ä\xA8\xA4\xEB\xA4Τ򸫤\xBF\xA1\xA5");
 				    else
 /*JP
 					You("see %s go out.",
 */
-					You("%s\xA4\xAC\xBEä\xA8\xA4\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5",
+					You("%s\xA4\xAC\xBEä\xA8\xA4\xEB\xA4Τ򸫤\xBF\xA1\xA5",
 					    an(xname(obj)));
 				    break;
 			    }
@@ -1179,7 +1179,7 @@
 						many ? "some " : "a ",
 					    many ? "s" : "");
 #else
-				    You("%s\xA4\x{D926}\xA4\xBD\xA4\xAF\xA4\xACû\xA4\xAF\xA4ʤ\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5",
+				    You("%s\xA4\x{D926}\xA4\xBD\xA4\xAF\xA4\xACû\xA4\xAF\xA4ʤ\xEB\xA4Τ򸫤\xBF\xA1\xA5",
 					    menorah ? "\xBF\xA4\xC2\xE6\xA4\xCE" : "");
 #endif
 				    break;
@@ -1213,7 +1213,7 @@
 					    many ? "s'" : "'s",
 					    many ? "s" : "");
 #else
-				    You("%s\xA4\x{D926}\xA4\xBD\xA4\xAF\xA4α꤬\xC5\xC0\xCCǤ\xB7\xA1\xA4\xB0Ť\xAF\xA4ʤ\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xAA",
+				    You("%s\xA4\x{D926}\xA4\xBD\xA4\xAF\xA4α꤬\xC5\xC0\xCCǤ\xB7\xA1\xA4\xB0Ť\xAF\xA4ʤ\xEB\xA4Τ򸫤\xBF\xA1\xAA",
 					    menorah ? "\xBF\xA4\xC2\xE6\xA4\xCE" : "");
 #endif
 				    break;
@@ -1241,7 +1241,7 @@
 					You("see a candelabrum's flame%s die.",
 						many ? "s" : "");
 #else
-					You("\xBF\xA4\xC2\xE6\xA4α꤬\xBEä\xA8\xA4\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5");
+					You("\xBF\xA4\xC2\xE6\xA4α꤬\xBEä\xA8\xA4\xEB\xA4Τ򸫤\xBF\xA1\xA5");
 #endif
 					break;
 				}
@@ -1270,7 +1270,7 @@
 					    many ? "some " : "",
 					    many ? xname(obj):an(xname(obj)));
 #else
-					You("%s\xA4\xACdz\xA4\xA8\xA4Ĥ\xAD\xA4\xEB\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xAA",
+					You("%s\xA4\xACdz\xA4\xA8\xA4Ĥ\xAD\xA4\xEB\xA4Τ򸫤\xBF\xA1\xAA",
 					    xname(obj));
 #endif
 					need_newsym = TRUE;

Modified: jnethack/trunk/src/wield.c
===================================================================
--- jnethack/trunk/src/wield.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/wield.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -593,8 +593,8 @@
 				     urole.name.f : urole.name.m));
 #else
 		    pline("%s\xA4\xCF\xC6\xF3\xA4Ĥ\xCE\xC9\xF0\xB4\xEF\xA4\xF2Ʊ\xBB\xFE\xA4˰\xB7\xA4\xA8\xA4ʤ\xA4\xA1\xA5",
-			  makeplural((flags.female && urole.name.f) ?
-				     urole.name.f : urole.name.m));
+			  makeplural((flags.female && urole.jname.f) ?
+				     urole.jname.f : urole.jname.m));
 #endif
 	} else if (!uwep || !uswapwep)
 #if 0 /*JP*/

Modified: jnethack/trunk/src/zap.c
===================================================================
--- jnethack/trunk/src/zap.c	2013-03-31 14:33:52 UTC (rev 706)
+++ jnethack/trunk/src/zap.c	2013-03-31 18:29:18 UTC (rev 707)
@@ -2672,7 +2672,7 @@
 				You("see a swirl of %s beneath you.",
 					is_ice(x,y) ? "frost" : "dust");
 #else
-				pline("\xA4\xA2\xA4ʤ\xBF\xA4β\xBC\xA4\xC7%s\xA4Τ\xA6\xA4\xBA\xA4\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5",
+				pline("\xA4\xA2\xA4ʤ\xBF\xA4β\xBC\xA4\xC7%s\xA4\xAC\xA4\xA6\xA4\xBA\xA4򴬤\xAF\xA4Τ\xAC\xB8\xAB\xA4\xA8\xA4\xBF\xA1\xA5",
 					is_ice(x,y) ? "\xC1\xFA" : "\xA4ۤ\xB3\xA4\xEA");
 #endif
 			}

• 次の記事 [jnh-cvs 581] [708] fix comment inconsistency
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]