[jnh-cvs 430] CVS update: jnethack/src

Back to archive index

Kentaro Shirakata argra****@users*****
2005年 1月 24日 (月) 21:39:47 JST


Index: jnethack/src/pager.c
diff -u jnethack/src/pager.c:1.21 jnethack/src/pager.c:1.22
--- jnethack/src/pager.c:1.21	Mon Jan 24 07:23:46 2005
+++ jnethack/src/pager.c	Mon Jan 24 21:39:47 2005
@@ -332,7 +332,7 @@
 */
 				Strcat(monbuf, "偏執的妄想");
 			else {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
 				Sprintf(wbuf, "warned of %s",
 					makeplural(mtmp->data->mname));
 #else
@@ -388,19 +388,18 @@
 */
 	    Strcat(buf, ",水中にある");
 	else if (is_lava(x,y))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
 	    Strcat(buf, " in molten lava");	/* [can this ever happen?] */
 #else
 	    Strcat(buf, ",溶岩の中にある");	/* [can this ever happen?] */
 #endif
     } else if (glyph_is_trap(glyph)) {
 	int tnum = what_trap(glyph_to_trap(glyph));
-#if 0 /*JP*/
+#if 0 /*JP:T*/
 	Strcpy(buf, defsyms[trap_to_defsym(tnum)].explanation);
 #else
 	Strcpy(buf, jtrns_obj('^', defsyms[
 	    trap_to_defsym(Hallucination ? rn2(TRAPNUM-3)+3 : tnum)].explanation));
-	Strcpy(buf2, buf);
 #endif
     } else if(!glyph_is_cmap(glyph)) {
 /*JP
@@ -421,59 +420,41 @@
 	else Sprintf(buf, "aligned altar");
 */
 	else Sprintf(buf, "属性の祭壇");
-#if 1 /*JP*/
-	Strcpy(buf2, "祭壇");
-#endif
 	break;
     case S_ndoor:
 	if (is_drawbridge_wall(x, y) >= 0)
-#if 0 /*JP:T*/
+/*JP
 	    Strcpy(buf,"open drawbridge portcullis");
-#else
-	    {
-		Strcpy(buf,"降りている跳ね橋");
-		Strcpy(buf2, "跳ね橋");
-	    }
-#endif
+*/
+	    Strcpy(buf,"降りている跳ね橋");
 	else if ((levl[x][y].doormask & ~D_TRAPPED) == D_BROKEN)
-#if 0 /*JP:T*/
+/*JP
 	    Strcpy(buf,"broken door");
-#else
-	    {
-		Strcpy(buf,"壊れた扉");
-		Strcpy(buf2, buf);
-	    }
-#endif
+*/
+	    Strcpy(buf,"壊れた扉");
 	else
-#if 0 /*JP:T*/
+/*JP
 	    Strcpy(buf,"doorway");
-#else
-	    {
-		Strcpy(buf,"通路");
-		Strcpy(buf2, buf);
-	    }
-#endif
+*/
+	    Strcpy(buf,"通路");
 	break;
     case S_cloud:
 /*JP
 	Strcpy(buf, Is_airlevel(&u.uz) ? "cloudy area" : "fog/vapor cloud");
 */
 	Strcpy(buf, Is_airlevel(&u.uz) ? "曇っている場所" : "霧/蒸気の雲");
-#if 1 /*JP*/
-	Strcpy(buf2, "雲");
-#endif
 	break;
     default:
 /*JP
 	Strcpy(buf,defsyms[glyph_to_cmap(glyph)].explanation);
 */
 	Strcpy(buf, jtrns_obj('S', defsyms[glyph_to_cmap(glyph)].explanation));
-#if 1 /*JP*/
-	Strcpy(buf2, buf);
-#endif
 	break;
     }
 #if 1 /*JP*/
+    if(buf2[0] == '\0'){
+	Strcpy(buf2, buf);
+    }
     set_trns_mode(1);
 #endif
 


Jnethack-cvs メーリングリストの案内
Back to archive index