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

Back to archive index

Kentaro Shirakata argra****@users*****
2005年 6月 8日 (水) 01:37:53 JST


Index: jnethack/src/options.c
diff -u jnethack/src/options.c:1.14 jnethack/src/options.c:1.15
--- jnethack/src/options.c:1.14	Sun Jun  5 18:02:47 2005
+++ jnethack/src/options.c	Wed Jun  8 01:37:52 2005
@@ -2617,7 +2617,7 @@
  add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
 		 "Booleans (selecting will toggle value):", MENU_UNSELECTED);
 #else
-	add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
+ add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
 		 "真偽オプション (選択すると値が切り替わります):", MENU_UNSELECTED);
 #endif
 	any.a_int = 0;
@@ -2657,7 +2657,7 @@
 		 "Compounds (selecting will prompt for new value):",
 		 MENU_UNSELECTED);
 #else
-	add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
+ add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
 		 "文字列オプション (選択すると新しい値の入力を求めます):",
 		 MENU_UNSELECTED);
 #endif
@@ -2708,7 +2708,7 @@
 #else
 	Sprintf(buf, "自動拾いの対象外 (現在の設定数:%d)",
 		count_ape_maps((int *)0, (int *)0));
-#endif /*JP*/
+#endif
 	add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_UNSELECTED);
 
 #endif /* AUTOPICKUP_EXCEPTIONS */
@@ -2720,11 +2720,10 @@
 	for (i = 0; i < PREFIX_COUNT; i++)
 		doset_add_menu(tmpwin, fqn_prefix_names[i], 0);
 #endif
-#if 0 /*JP*/
+/*JP
 	end_menu(tmpwin, "Set what options?");
-#else
+*/
 	end_menu(tmpwin, "どのオプションを設定しますか?");
-#endif
 	need_redraw = FALSE;
 	if ((pick_cnt = select_menu(tmpwin, PICK_ANY, &pick_list)) > 0) {
 	    /*
@@ -2755,11 +2754,10 @@
 
 		    if (!special_handling(compopt[opt_indx].name,
 							setinitial, fromfile)) {
-#if 0 /*JP*/
+/*JP
 			Sprintf(buf, "Set %s to what?", compopt[opt_indx].name);
-#else
+*/
 			Sprintf(buf, "%sに何を設定しますか?", compopt[opt_indx].name);
-#endif
 			getlin(buf, buf2);
 			if (buf2[0] == '\033')
 			    continue;
@@ -2812,11 +2810,10 @@
 		add_menu(tmpwin, NO_GLYPH, &any, *style_name, 0,
 			 ATR_NONE, style_name, MENU_UNSELECTED);
         }
-#if 0 /*JP*/
+/*JP
 	end_menu(tmpwin, "Select menustyle:");
-#else
+*/
 	end_menu(tmpwin, "メニュースタイルを選択してください:");
-#endif
 	if (select_menu(tmpwin, PICK_ONE, &style_pick) > 0) {
 		flags.menu_style = style_pick->item.a_int - 1;
 		free((genericptr_t)style_pick);
@@ -2834,11 +2831,10 @@
 		add_menu(tmpwin, NO_GLYPH, &any, burden_letters[i], 0,
 			 ATR_NONE, burden_name, MENU_UNSELECTED);
         }
-#if 0 /*JP*/
+/*JP
 	end_menu(tmpwin, "Select encumbrance level:");
-#else
+*/
 	end_menu(tmpwin, "警告を出す荷重レベルを選択してください:");
-#endif
 	if (select_menu(tmpwin, PICK_ONE, &burden_pick) > 0) {
 		flags.pickup_burden = burden_pick->item.a_int - 1;
 		free((genericptr_t)burden_pick);
@@ -2857,11 +2853,10 @@
          * must correspond to disclosure_options in decl.h
          */
 	static const char *disclosure_names[] = {
-#if 0 /*JP*/
+/*JP
 		"inventory", "attributes", "vanquished", "genocides", "conduct"
-#else
+*/
 		"所持アイテム", "最終属性", "殺害一覧", "虐殺一覧", "挑戦一覧"
-#endif
 	};
 	int disc_cat[NUM_DISCLOSURE_OPTIONS];
 	const char *disclosure_name;
@@ -2875,11 +2870,10 @@
 			 ATR_NONE, disclosure_name, MENU_UNSELECTED);
 		disc_cat[i] = 0;
         }
-#if 0 /*JP*/
+/*JP
 	end_menu(tmpwin, "Change which disclosure options categories:");
-#else
+*/
 	end_menu(tmpwin, "どのカテゴリの表示情報オプションを変更しますか:");
-#endif
 	if ((pick_cnt = select_menu(tmpwin, PICK_ANY, &disclosure_category_pick)) > 0) {
 	    for (pick_idx = 0; pick_idx < pick_cnt; ++pick_idx) {
 		opt_idx = disclosure_category_pick[pick_idx].item.a_int - 1;
@@ -2894,11 +2888,10 @@
 	    if (disc_cat[i]) {
 	    	char dbuf[BUFSZ];
 		menu_item *disclosure_option_pick = (menu_item *)0;
-#if 0 /*JP*/
+/*JP
 		Sprintf(dbuf, "Disclosure options for %s:", disclosure_names[i]);
-#else
+*/
 		Sprintf(dbuf, "%sの出力形式:", disclosure_names[i]);
-#endif
 	        tmpwin = create_nhwindow(NHW_MENU);
 		start_menu(tmpwin);
 		any.a_char = DISCLOSE_NO_WITHOUT_PROMPT;
@@ -3014,11 +3007,10 @@
 	add_menu(tmpwin, NO_GLYPH, &any, 'r', 0,
 		ATR_NONE, "最近のものから一画面表示(reversed)", MENU_UNSELECTED);
 #endif
-#if 0 /*JP*/
+/*JP
 	end_menu(tmpwin, "Select message history display type:");
-#else
+*/
 	end_menu(tmpwin, "メッセージ履歴の表示方法を選択してください:");
-#endif
 	if (select_menu(tmpwin, PICK_ONE, &window_pick) > 0) {
 		iflags.prevmsg_window = window_pick->item.a_char;
 		free((genericptr_t)window_pick);
@@ -3084,11 +3076,10 @@
         retval = TRUE;
     } else if (!strcmp("number_pad", optname)) {
 	static const char *npchoices[3] =
-#if 0 /*JP*/
+/*JP
 		{"0 (off)", "1 (on)", "2 (on, DOS compatible)"};
-#else
+*/
 		{"0 (無効)", "1 (有効)", "2 (有効,DOS互換)"};
-#endif
 	const char *npletters = "abc";
 	menu_item *mode_pick = (menu_item *)0;
 
@@ -3099,11 +3090,10 @@
 		add_menu(tmpwin, NO_GLYPH, &any, npletters[i], 0,
 			 ATR_NONE, npchoices[i], MENU_UNSELECTED);
         }
-#if 0 /*JP*/
+/*JP
 	end_menu(tmpwin, "Select number_pad mode:");
-#else
+*/
 	end_menu(tmpwin, "number_padモードを選択してください:");
-#endif
 	if (select_menu(tmpwin, PICK_ONE, &mode_pick) > 0) {
 		int mode = mode_pick->item.a_int - 1;
 		switch(mode) {
@@ -3125,11 +3115,10 @@
 	destroy_nhwindow(tmpwin);
         retval = TRUE;
     } else if (!strcmp("menu_headings", optname)) {
-#if 0 /*JP*/
+/*JP
 	static const char *mhchoices[3] = {"bold", "inverse", "underline"};
-#else
+*/
 	static const char *mhchoices[3] = {"太字", "反転", "下線"};
-#endif
 	const char *npletters = "biu";
 	menu_item *mode_pick = (menu_item *)0;
 
@@ -3140,11 +3129,10 @@
 		add_menu(tmpwin, NO_GLYPH, &any, npletters[i], 0,
 			 ATR_NONE, mhchoices[i], MENU_UNSELECTED);
         }
-#if 0 /*JP*/
+/*JP
 	end_menu(tmpwin, "How to highlight menu headings:");
-#else
+*/
 	end_menu(tmpwin, "メニューヘッダの強調方法を選択してください:");
-#endif
 	if (select_menu(tmpwin, PICK_ONE, &mode_pick) > 0) {
 		int mode = mode_pick->item.a_int - 1;
 		switch(mode) {
@@ -3196,11 +3184,10 @@
 		add_menu(tmpwin, NO_GLYPH, &any, *action_titles[i],
 		      0, ATR_NONE, action_titles[i+1], MENU_UNSELECTED);
         }
-#if 0 /*JP*/
+/*JP
 	end_menu(tmpwin, "Do what?");
-#else
+*/
 	end_menu(tmpwin, "どうしますか?");
-#endif
 	if ((pick_cnt = select_menu(tmpwin, PICK_ONE, &pick_list)) > 0) {
 		for (pick_idx = 0; pick_idx < pick_cnt; ++pick_idx) {
 			opt_idx = pick_list[pick_idx].item.a_int - 1;
@@ -3212,11 +3199,10 @@
 	if (pick_cnt < 1) return FALSE;
 
 	if (opt_idx == 0) {	/* add new */
-#if 0 /*JP*/
+/*JP
 		getlin("What new autopickup exception pattern?", &apebuf[1]);
-#else
+*/
 		getlin("新しい自動拾い例外のパターンを入力してください:", &apebuf[1]);
-#endif
 		if (apebuf[1] == '\033') return FALSE;
 		apebuf[0] = '"';
 		Strcat(apebuf,"\"");
@@ -3738,54 +3724,51 @@
 /* data for option_help() */
 static const char *opt_intro[] = {
 	"",
-#if 0 /*JP*/
+/*JP
 	"                 NetHack Options Help:",
-#else /*JP*/
+*/
 	"                 NetHackオプションヘルプ:",
-#endif /*JP*/
 	"",
 #define CONFIG_SLOT 3	/* fill in next value at run-time */
 	(char *)0,
 #if !defined(MICRO) && !defined(MAC)
-#if 0 /*JP*/
+/*JP
 	"or use `NETHACKOPTIONS=\"<options>\"' in your environment",
-#else /*JP*/
+*/
 	"または環境変数に`NETHACKOPTIONS=\"<options>\"'と定義できます",
-#endif /*JP*/
 #endif
-#if 0 /*JP*/
+/*JP
 	"(<options> is a list of options separated by commas)",
-#else /*JP*/
+*/
 	"(<options>はカンマで区切って連続して指定することができます)",
-#endif /*JP*/
 #ifdef VMS
-#if 0 /*JP*/
+/*JP
 	"-- for example, $ DEFINE NETHACKOPTIONS \"noautopickup,fruit:kumquat\"",
-#else /*JP*/
+*/
 	"-- 例えば次のようにします:$ DEFINE NETHACKOPTIONS \"noautopickup,fruit:kumquat\"",
-#endif /*JP*/
 #endif
-#if 0 /*JP*/
+/*JP
 	"or press \"O\" while playing and use the menu.",
-	"",
- "Boolean options (which can be negated by prefixing them with '!' or \"no\"):",
-#else /*JP*/
+*/
 	"もしくはゲームプレイ中に\"O\"ボタンを押すことで設定可能です.",
 	"",
+/*JP
+ "Boolean options (which can be negated by prefixing them with '!' or \"no\"):",
+*/
  "真偽値オプション (否定の値を指定する場合,'!'もしくは\"no\"を先頭に付加します):",
-#endif /*JP*/
 	(char *)0
 };
 
 static const char *opt_epilog[] = {
 	"",
-#if 0 /*JP*/
+/*JP
  "Some of the options can be set only before the game is started; those",
-	"items will not be selectable in the 'O' command's menu.",
-#else
+*/
  "幾つかのオプションはゲーム開始前のみにしか設定できないものがあります.",
+/*JP
+	"items will not be selectable in the 'O' command's menu.",
+*/
 	"それらは'O'コマンドのメニューでは選択することができません.",
-#endif
 	(char *)0
 };
 
@@ -3797,11 +3780,10 @@
     winid datawin;
 
     datawin = create_nhwindow(NHW_TEXT);
-#if 0 /*JP*/
+/*JP
     Sprintf(buf, "Set options as OPTIONS=<options> in %s", configfile);
-#else
+*/
     Sprintf(buf, "オプションは%sの中でOPTIONS=<options>と設定します", configfile);
-#endif
     opt_intro[CONFIG_SLOT] = (const char *) buf;
     for (i = 0; opt_intro[i]; i++)
 	putstr(datawin, 0, opt_intro[i]);
@@ -3819,11 +3801,10 @@
     next_opt(datawin, "");
 
     /* Compound options */
-#if 0 /*JP*/
+/*JP
     putstr(datawin, 0, "Compound options:");
-#else
+*/
     putstr(datawin, 0, "文字列オプション:");
-#endif
     for (i = 0; compopt[i].name; i++) {
 	Sprintf(buf2, "`%s'", compopt[i].name);
 	Sprintf(buf, "%-20s - %s%c", buf2, compopt[i].descr,


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