Revision | 932b6b5b07afa257d6cd445f470994df2e3f23d6 (tree) |
---|---|
Time | 2018-12-16 04:48:52 |
Author | SHIRAKATA Kentaro <argrath@ub32...> |
Commiter | SHIRAKATA Kentaro |
GCC says embedding a directive within macro arguments is not portable
@@ -1104,19 +1104,21 @@ int propidx; /* special cases can have negative values */ | ||
1104 | 1104 | break; |
1105 | 1105 | case INVIS: |
1106 | 1106 | if (u.uprops[INVIS].blocked & W_ARMC) |
1107 | - Sprintf(buf, because_of, | |
1108 | 1107 | #if 0 /*JP*/ |
1108 | + Sprintf(buf, because_of, | |
1109 | 1109 | ysimple_name(uarmc)); /* mummy wrapping */ |
1110 | 1110 | #else |
1111 | + Sprintf(buf, because_of, | |
1111 | 1112 | simpleonames(uarmc)); /* mummy wrapping */ |
1112 | 1113 | #endif |
1113 | 1114 | break; |
1114 | 1115 | case CLAIRVOYANT: |
1115 | 1116 | if (wizard && (u.uprops[CLAIRVOYANT].blocked & W_ARMH)) |
1116 | - Sprintf(buf, because_of, | |
1117 | 1117 | #if 0 /*JP*/ |
1118 | + Sprintf(buf, because_of, | |
1118 | 1119 | ysimple_name(uarmh)); /* cornuthaum */ |
1119 | 1120 | #else |
1121 | + Sprintf(buf, because_of, | |
1120 | 1122 | simpleonames(uarmh)); /* cornuthaum */ |
1121 | 1123 | #endif |
1122 | 1124 | break; |
@@ -134,13 +134,15 @@ const char *goal; | ||
134 | 134 | "同じ地形を飛ばして" }; |
135 | 135 | #endif |
136 | 136 | |
137 | - Sprintf(sbuf, | |
138 | 137 | #if 0 /*JP*/ |
138 | + Sprintf(sbuf, | |
139 | 139 | "Use '%c', '%c', '%c', '%c' to move the cursor to %s.", /* hjkl */ |
140 | + Cmd.move_W, Cmd.move_S, Cmd.move_N, Cmd.move_E, goal); | |
140 | 141 | #else |
142 | + Sprintf(sbuf, | |
141 | 143 | "[%c%c%c%c]で%sへ移動できる.", |
142 | -#endif | |
143 | 144 | Cmd.move_W, Cmd.move_S, Cmd.move_N, Cmd.move_E, goal); |
145 | +#endif | |
144 | 146 | putstr(tmpwin, 0, sbuf); |
145 | 147 | #if 0 /*JP*/ |
146 | 148 | Sprintf(sbuf, |
@@ -2285,16 +2285,19 @@ long quan; /* if non-0, print this quantity, not obj->quan */ | ||
2285 | 2285 | */ |
2286 | 2286 | if (cost != 0 || let == '*') { |
2287 | 2287 | /* if dot is true, we're doing Iu, otherwise Ix */ |
2288 | - Sprintf(li, | |
2289 | 2288 | #if 0 /*JP*/ |
2289 | + Sprintf(li, | |
2290 | 2290 | iflags.menu_tab_sep ? "%c - %s\t%6ld %s" |
2291 | 2291 | : "%c - %-45s %6ld %s", |
2292 | + (dot && use_invlet ? obj->invlet : let), | |
2293 | + (txt ? txt : doname(obj)), cost, currency(cost)); | |
2292 | 2294 | #else |
2295 | + Sprintf(li, | |
2293 | 2296 | iflags.menu_tab_sep ? "%c - %s\t%6ld%s" |
2294 | 2297 | : "%c - %-45s %6ld%s", |
2295 | -#endif | |
2296 | 2298 | (dot && use_invlet ? obj->invlet : let), |
2297 | 2299 | (txt ? txt : doname(obj)), cost, currency(cost)); |
2300 | +#endif | |
2298 | 2301 | } else { |
2299 | 2302 | /* ordinary inventory display or pickup message */ |
2300 | 2303 | Sprintf(li, "%c - %s%s", (use_invlet ? obj->invlet : let), |
@@ -1204,28 +1204,27 @@ char *prefix; | ||
1204 | 1204 | Strcat(prefix, is_corrodeable(obj) ? "腐食した" : "腐った"); |
1205 | 1205 | } |
1206 | 1206 | if (rknown && obj->oerodeproof) |
1207 | +#if 0 /*JP*/ | |
1207 | 1208 | Strcat(prefix, iscrys |
1208 | -/*JP | |
1209 | 1209 | ? "fixed " |
1210 | -*/ | |
1211 | - ? "安定した" | |
1212 | 1210 | : is_rustprone(obj) |
1213 | -/*JP | |
1214 | 1211 | ? "rustproof " |
1215 | -*/ | |
1216 | - ? "錆びない" | |
1217 | 1212 | : is_corrodeable(obj) |
1218 | -#if 0 /*JP*/ | |
1219 | - ? "corrodeproof " /* "stainless"? */ | |
1220 | -#else | |
1221 | 1213 | ? "腐食しない" /* "stainless"? */ |
1222 | -#endif | |
1223 | 1214 | : is_flammable(obj) |
1224 | -/*JP | |
1225 | 1215 | ? "fireproof " |
1226 | -*/ | |
1216 | + : ""); | |
1217 | +#else | |
1218 | + Strcat(prefix, iscrys | |
1219 | + ? "安定した" | |
1220 | + : is_rustprone(obj) | |
1221 | + ? "錆びない" | |
1222 | + : is_corrodeable(obj) | |
1223 | + ? "腐食しない" /* "stainless"? */ | |
1224 | + : is_flammable(obj) | |
1227 | 1225 | ? "燃えない" |
1228 | 1226 | : ""); |
1227 | +#endif | |
1229 | 1228 | } |
1230 | 1229 | |
1231 | 1230 | /* used to prevent rust on items where rust makes no difference */ |
@@ -2236,13 +2236,17 @@ winid where; | ||
2236 | 2236 | Sprintf(buf, "%12s ", "alignment:"); |
2237 | 2237 | */ |
2238 | 2238 | Sprintf(buf, "%12s ", "属性:"); |
2239 | +#if 0 /*JP:日本語では名詞が自然*/ | |
2239 | 2240 | Strcat(buf, (which == RS_ALGNMNT) ? choosing : (a == ROLE_NONE) |
2240 | 2241 | ? not_yet |
2241 | 2242 | : (a == ROLE_RANDOM) |
2242 | 2243 | ? rand_choice |
2243 | -#if 0 /*JP:日本語では名詞が自然*/ | |
2244 | 2244 | : aligns[a].adj); |
2245 | 2245 | #else |
2246 | + Strcat(buf, (which == RS_ALGNMNT) ? choosing : (a == ROLE_NONE) | |
2247 | + ? not_yet | |
2248 | + : (a == ROLE_RANDOM) | |
2249 | + ? rand_choice | |
2246 | 2250 | : aligns[a].noun); |
2247 | 2251 | #endif |
2248 | 2252 | putstr(where, 0, buf); |
@@ -631,11 +631,12 @@ time_t when; | ||
631 | 631 | char pbuf[BUFSZ]; |
632 | 632 | |
633 | 633 | topten_print(""); |
634 | - Sprintf(pbuf, | |
635 | 634 | #if 0 /*JP*/ |
635 | + Sprintf(pbuf, | |
636 | 636 | "Since you were in %s mode, the score list will not be checked.", |
637 | 637 | wizard ? "wizard" : "discover"); |
638 | 638 | #else |
639 | + Sprintf(pbuf, | |
639 | 640 | "%sモードでプレイしたのでスコアリストには載らない.", |
640 | 641 | wizard ? "ウィザード" : "発見"); |
641 | 642 | #endif |
@@ -2037,10 +2037,11 @@ struct WinDesc *cw; | ||
2037 | 2037 | if (cw->npages > 1) |
2038 | 2038 | #if 0 /*JP*/ |
2039 | 2039 | Sprintf(cw->morestr, "(%d of %d)", curr_page + 1, |
2040 | + (int) cw->npages); | |
2040 | 2041 | #else |
2041 | 2042 | Sprintf(cw->morestr, "(%d/%d)", curr_page + 1, |
2042 | -#endif | |
2043 | 2043 | (int) cw->npages); |
2044 | +#endif | |
2044 | 2045 | else if (msave) |
2045 | 2046 | Strcpy(cw->morestr, msave); |
2046 | 2047 | else |