X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=src%2Ffiles.c;h=8d6f218642f99245a17c2f94292d9f41d6c06e82;hb=97c7a62d7abe963c7a9abcb22a35273101a09081;hp=f2bbf11b98f14a8bfccf393b335e11098af3fcef;hpb=3e4319de33500689dee9dec2bd11dd62df554cc5;p=hengband%2Fhengband.git diff --git a/src/files.c b/src/files.c index f2bbf11b9..8d6f21864 100644 --- a/src/files.c +++ b/src/files.c @@ -1,14 +1,17 @@ -/* File: files.c */ - -/* +/*! + * @file files.c + * @brief ãã¡ã¤ã«å ¥åºå管ç / Purpose: code dealing with files (and death) + * @date 2014/01/28 + * @author + *
* Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke - * * This software may be copied and distributed for educational, research, * and not for profit purposes provided that this copyright and statement * are included in all such copies. Other copyrights may also apply. + * 2014 Deskull rearranged comment for Doxygen.\n + **/ -/* Purpose: code dealing with files (and death) */ #include "angband.h" @@ -19,8 +22,8 @@ /* #undef _POSIX_SAVED_IDS */ -/* - * Hack -- drop permissions +/*! + * @brief ãã¡ã¤ã«ã®ãããããã¼ããã·ã§ã³ãã§ã㯠/ Hack -- drop permissions */ void safe_setuid_drop(void) { @@ -33,42 +36,22 @@ void safe_setuid_drop(void) if (setuid(getuid()) != 0) { -#ifdef JP -quit("setuid(): Àµ¤·¤¯µö²Ä¤¬¼è¤ì¤Þ¤»¤ó¡ª"); -#else - quit("setuid(): cannot set permissions correctly!"); -#endif - + quit(_("setuid(): æ£ãã許å¯ãåãã¾ããï¼", "setuid(): cannot set permissions correctly!")); } if (setgid(getgid()) != 0) { -#ifdef JP -quit("setgid(): Àµ¤·¤¯µö²Ä¤¬¼è¤ì¤Þ¤»¤ó¡ª"); -#else - quit("setgid(): cannot set permissions correctly!"); -#endif - + quit(_("setgid(): æ£ãã許å¯ãåãã¾ããï¼", "setgid(): cannot set permissions correctly!")); } # else if (setreuid(geteuid(), getuid()) != 0) { -#ifdef JP -quit("setreuid(): Àµ¤·¤¯µö²Ä¤¬¼è¤ì¤Þ¤»¤ó¡ª"); -#else - quit("setreuid(): cannot set permissions correctly!"); -#endif - + quit(_("setreuid(): æ£ãã許å¯ãåãã¾ããï¼", "setreuid(): cannot set permissions correctly!")); } if (setregid(getegid(), getgid()) != 0) { -#ifdef JP -quit("setregid(): Àµ¤·¤¯µö²Ä¤¬¼è¤ì¤Þ¤»¤ó¡ª"); -#else - quit("setregid(): cannot set permissions correctly!"); -#endif - + quit(_("setregid(): æ£ãã許å¯ãåãã¾ããï¼", "setregid(): cannot set permissions correctly!")); } # endif @@ -80,8 +63,8 @@ quit("setregid(): } -/* - * Hack -- grab permissions +/*! + * @brief ãã¡ã¤ã«ã®ã°ã©ããã¼ããã·ã§ã³ãã§ã㯠/ Hack -- grab permissions */ void safe_setuid_grab(void) { @@ -94,42 +77,22 @@ void safe_setuid_grab(void) if (setuid(player_euid) != 0) { -#ifdef JP -quit("setuid(): Àµ¤·¤¯µö²Ä¤¬¼è¤ì¤Þ¤»¤ó¡ª"); -#else - quit("setuid(): cannot set permissions correctly!"); -#endif - + quit(_("setuid(): æ£ãã許å¯ãåãã¾ããï¼", "setuid(): cannot set permissions correctly!")); } if (setgid(player_egid) != 0) { -#ifdef JP -quit("setgid(): Àµ¤·¤¯µö²Ä¤¬¼è¤ì¤Þ¤»¤ó¡ª"); -#else - quit("setgid(): cannot set permissions correctly!"); -#endif - + quit(_("setgid(): æ£ãã許å¯ãåãã¾ããï¼", "setgid(): cannot set permissions correctly!")); } # else if (setreuid(geteuid(), getuid()) != 0) { -#ifdef JP -quit("setreuid(): Àµ¤·¤¯µö²Ä¤¬¼è¤ì¤Þ¤»¤ó¡ª"); -#else - quit("setreuid(): cannot set permissions correctly!"); -#endif - + quit(_("setreuid(): æ£ãã許å¯ãåãã¾ããï¼", "setreuid(): cannot set permissions correctly!")); } if (setregid(getegid(), getgid()) != 0) { -#ifdef JP -quit("setregid(): Àµ¤·¤¯µö²Ä¤¬¼è¤ì¤Þ¤»¤ó¡ª"); -#else - quit("setregid(): cannot set permissions correctly!"); -#endif - + quit(_("setregid(): æ£ãã許å¯ãåãã¾ããï¼", "setregid(): cannot set permissions correctly!")); } # endif /* SAFE_SETUID_POSIX */ @@ -141,25 +104,27 @@ quit("setregid(): } -/* - * Extract the first few "tokens" from a buffer - * +/*! + * @brief å種ãã¼ã¿ããã¹ãããã¼ã¯ã³åä½ã«å解ãã / Extract the first few "tokens" from a buffer + * @param buf ãã¼ã¿ããã¹ãã®åç §ãã¤ã³ã¿ + * @param num ãã¼ã¯ã³ã®æ° + * @param tokens ãã¼ã¯ã³ãä¿ç®¡ããæåååç §ãã¤ã³ã¿é å + * @param mode ãªãã·ã§ã³ + * @return 解éããæååæ° + * @details + *
* This function uses "colon" and "slash" as the delimeter characters. - * * We never extract more than "num" tokens. The "last" token may include * "delimeter" characters, allowing the buffer to include a "string" token. - * * We save pointers to the tokens in "tokens", and return the number found. - * * Hack -- Attempt to handle the 'c' character formalism - * * Hack -- An empty buffer, or a final delimeter, yields an "empty" token. - * * Hack -- We will always extract at least one token + **/ -s16b tokenize(char *buf, s16b num, char **tokens, int mode) +s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode) { - int i = 0; + s16b i = 0; char *s = buf; @@ -250,7 +215,7 @@ static named_num gf_desc[] = {"GF_SOUND", GF_SOUND }, {"GF_CONFUSION", GF_CONFUSION }, {"GF_FORCE", GF_FORCE }, - {"GF_INERTIA", GF_INERTIA }, + {"GF_INERTIA", GF_INERTIAL }, {"GF_MANA", GF_MANA }, {"GF_METEOR", GF_METEOR }, {"GF_ICE", GF_ICE }, @@ -274,7 +239,7 @@ static named_num gf_desc[] = {"GF_OLD_SLOW", GF_OLD_SLOW }, {"GF_OLD_CONF", GF_OLD_CONF }, {"GF_OLD_SLEEP", GF_OLD_SLEEP }, - {"GF_OLD_DRAIN", GF_OLD_DRAIN }, + {"GF_HYPODYNAMIA", GF_HYPODYNAMIA }, {"GF_AWAY_UNDEAD", GF_AWAY_UNDEAD }, {"GF_AWAY_EVIL", GF_AWAY_EVIL }, {"GF_AWAY_ALL", GF_AWAY_ALL }, @@ -335,78 +300,65 @@ static named_num gf_desc[] = }; -/* +/*! + * @brief è¨å®ãã¡ã¤ã«ã®åè¡ããå種ããã¹ãæ å ±ãåå¾ãã / * Parse a sub-file of the "extra info" (format shown below) - * + * @param buf ãã¼ã¿ããã¹ãã®åç §ãã¤ã³ã¿ + * @return ã¨ã©ã¼ã³ã¼ã + * @details + *
* Each "action" line has an "action symbol" in the first column, * followed by a colon, followed by some command specific info, * usually in the form of "tokens" separated by colons or slashes. - * * Blank lines, lines starting with white space, and lines starting * with pound signs ("#") are ignored (as comments). - * * Note the use of "tokenize()" to allow the use of both colons and * slashes as delimeters, while still allowing final tokens which * may contain any characters including "delimiters". - * * Note the use of "strtol()" to allow all "integers" to be encoded * in decimal, hexidecimal, or octal form. - * * Note that "monster zero" is used for the "player" attr/char, "object * zero" will be used for the "stack" attr/char, and "feature zero" is * used for the "nothing" attr/char. - * * Parse another file recursively, see below for details - * %:*/ - errr process_pref_file_command(char *buf) { - int i, j, n1, n2; + int i, j; + SYMBOL_COLOR n1; + SYMBOL_CODE n2; + char *zz[16]; @@ -417,393 +369,370 @@ errr process_pref_file_command(char *buf) switch (buf[0]) { - /* Mega-Hack -- read external player's history file */ - /* Process "H:- * + * %:\ * Specify the attr/char values for "monsters" by race index - * R: :: - * + * R:\ :\:\ * Specify the attr/char values for "objects" by kind index - * K: :: - * + * K:\ :\:\ * Specify the attr/char values for "features" by feature index - * F: :: - * + * F:\ :\:\ * Specify the attr/char values for unaware "objects" by kind tval - * U: :: - * + * U:\ :\:\ * Specify the attr/char values for inventory "objects" by kind tval - * E: :: - * + * E:\ :\:\ * Define a macro action, given an encoded macro action - * A: - * + * A:\ * Create a normal macro, given an encoded macro trigger - * P: - * + * P:\ * Create a command macro, given an encoded macro trigger - * C: - * + * C:\ * Create a keyset mapping - * S: : : - * + * S:\ :\ :\ * Turn an option off, given its name - * X: - * + * X:\ * Turn an option on, given its name - * Y: - * + * Y:\ * Specify visual information, given an index, and some data - * V: : : : : - * + * V:\ :\ :\ :\ :\ * Specify the set of colors to use when drawing a zapped spell - * Z: : - * + * Z:\ :\ * Specify a macro trigger template and macro trigger names. - * T:: : : :... - * T: : : - * + * T:\:\ :\ :\ :... + * T:\ :\ :\ + *
* Input: * v: output buffer array * f: final character - * * Output: * result + **/ -cptr process_pref_file_expr(cptr *sp, char *fp) +cptr process_pref_file_expr(char **sp, char *fp) { cptr v; - cptr s; + char *b; + char *s; char b1 = '['; char b2 = ']'; char f = ' '; - static char tmp[8]; + static char tmp[10]; /* Initial */ s = (*sp); /* Skip spaces */ - while (isspace(*s)) s++; + while (iswspace(*s)) s++; + + /* Save start */ + b = s; /* Default */ v = "?o?o?"; @@ -955,24 +893,25 @@ cptr process_pref_file_expr(cptr *sp, char *fp) if (f != b2) v = "?x?x?"; /* Extract final and Terminate */ - if ((f = *s) != '\0') s++; + if ((f = *s) != '\0') *s++ = '\0'; } /* Other */ else { - char b[1024]; - int i; - /* Accept all printables except spaces and brackets */ - for (i = 0; isprint(*s) && !my_strchr(" []", *s); i++) - b[i] = *s++; - - /* Terminate */ - b[i] = '\0'; +#ifdef JP + while (iskanji(*s) || (isprint(*s) && !my_strchr(" []", *s))) + { + if (iskanji(*s)) s++; + s++; + } +#else + while (isprint(*s) && !my_strchr(" []", *s)) ++s; +#endif /* Extract final and Terminate */ - if ((f = *s) != '\0') s++; + if ((f = *s) != '\0') *s++ = '\0'; /* Variable */ if (*b == '$') @@ -1026,7 +965,22 @@ cptr process_pref_file_expr(cptr *sp, char *fp) /* Player */ else if (streq(b+1, "PLAYER")) { - v = player_base; + static char tmp_player_name[32]; + char *pn, *tpn; + for (pn = p_ptr->name, tpn = tmp_player_name; *pn; pn++, tpn++) + { +#ifdef JP + if (iskanji(*pn)) + { + *(tpn++) = *(pn++); + *tpn = *pn; + continue; + } +#endif + *tpn = my_strchr(" []", *pn) ? '_' : *pn; + } + *tpn = '\0'; + v = tmp_player_name; } /* First realm */ @@ -1064,6 +1018,13 @@ cptr process_pref_file_expr(cptr *sp, char *fp) else v = "0"; } + + /* Money */ + else if (streq(b+1, "MONEY")) + { + sprintf(tmp, "%09ld", (long int)p_ptr->au); + v = tmp; + } } /* Constant */ @@ -1088,8 +1049,20 @@ cptr process_pref_file_expr(cptr *sp, char *fp) #define PREF_TYPE_AUTOPICK 1 #define PREF_TYPE_HISTPREF 2 -/* +/*! + * @brief process_pref_fileã®ãµãã«ã¼ãã³ / * Open the "user pref file" and parse it. + * @param name èªã¿è¾¼ããã¡ã¤ã«å + * @param preftype prefãã¡ã¤ã«ã®ã¿ã¤ã + * @return ã¨ã©ã¼ã³ã¼ã + * @details + *
+ * Input: + * v: output buffer array + * f: final character + * Output: + * result + **/ static errr process_pref_file_aux(cptr name, int preftype) { @@ -1125,7 +1098,7 @@ static errr process_pref_file_aux(cptr name, int preftype) #ifdef JP if (!iskanji(buf[0])) #endif - if (isspace(buf[0])) continue; + if (iswspace(buf[0])) continue; /* Skip comments */ if (buf[0] == '#') continue; @@ -1140,7 +1113,7 @@ static errr process_pref_file_aux(cptr name, int preftype) { char f; cptr v; - cptr s; + char *s; /* Start */ s = buf + 2; @@ -1210,13 +1183,9 @@ static errr process_pref_file_aux(cptr name, int preftype) { /* Print error message */ /* ToDo: Add better error messages */ -#ifdef JP - msg_format("¥Õ¥¡¥¤¥ë'%s'¤Î%d¹Ô¤Ç¥¨¥é¡¼ÈÖ¹æ%d¤Î¥¨¥é¡¼¡£", name, line, err); - msg_format("('%s'¤ò²òÀÏÃæ)", old); -#else - msg_format("Error %d in line %d of file '%s'.", err, line, name); - msg_format("Parsing '%s'", old); -#endif + msg_format(_("ãã¡ã¤ã«'%s'ã®%dè¡ã§ã¨ã©ã¼çªå·%dã®ã¨ã©ã¼ã", "Error %d in line %d of file '%s'."), + _(name, err), line, _(err, name)); + msg_format(_("('%s'ã解æä¸)", "Parsing '%s'"), old); msg_print(NULL); } @@ -1228,14 +1197,17 @@ static errr process_pref_file_aux(cptr name, int preftype) } - -/* +/*! + * @brief prefè¨å®ãã¡ã¤ã«ãèªã¿è¾¼ã¿è¨å®ãåæ ããã / * Process the "user pref file" with the given name - * + * @param name èªã¿è¾¼ããã¡ã¤ã«å + * @return ã¨ã©ã¼ã³ã¼ã + * @details + *
* See the functions above for a list of legal "commands". - * * We also accept the special "?" and "%" directives, which * allow conditional evaluation and filename inclusion. + **/ errr process_pref_file(cptr name) { @@ -1294,8 +1266,10 @@ static bool check_time_flag = FALSE; #endif -/* +/*! + * @brief Angbandãã¬ã¤ç¦æ¢æå»ããã§ã㯠/ * Handle CHECK_TIME + * @return ã¨ã©ã¼ã³ã¼ã */ errr check_time(void) { @@ -1322,9 +1296,10 @@ errr check_time(void) } - -/* +/*! + * @brief Angbandãã¬ã¤ç¦æ¢æå»ã®åæå / * Initialize CHECK_TIME + * @return ã¨ã©ã¼ã³ã¼ã */ errr check_time_init(void) { @@ -1414,8 +1389,10 @@ static int check_load_value = 0; #endif -/* +/*! + * @brief Angbandãã¬ã¤ç¦æ¢ãã¹ãã®ãã§ã㯠/ * Handle CHECK_LOAD + * @return ã¨ã©ã¼ã³ã¼ã */ errr check_load(void) { @@ -1444,8 +1421,10 @@ errr check_load(void) } -/* +/*! + * @brief Angbandãã¬ã¤ç¦æ¢ãã¹ãã®è¨å®åæå / * Initialize CHECK_LOAD + * @return ã¨ã©ã¼ã³ã¼ã */ errr check_load_init(void) { @@ -1565,51 +1544,51 @@ static struct } disp_player_line[] #ifdef JP = { - { 1, 10, 25, "ÂǷ⽤Àµ(³ÊÆ®)"}, - { 1, 10, 25, "ÂǷ⽤Àµ(ξ¼ê)"}, - { 1, 10, 25, "ÂǷ⽤Àµ(±¦¼ê)"}, - { 1, 10, 25, "ÂǷ⽤Àµ(º¸¼ê)"}, - { 1, 11, 25, "ÂǷ⽤Àµ(º¸¼ê)"}, - { 1, 11, 25, "ÂǷ⽤Àµ(±¦¼ê)"}, + { 1, 10, 25, "ææä¿®æ£(æ ¼é)"}, + { 1, 10, 25, "ææä¿®æ£(両æ)"}, + { 1, 10, 25, "ææä¿®æ£(å³æ)"}, + { 1, 10, 25, "ææä¿®æ£(å·¦æ)"}, + { 1, 11, 25, "ææä¿®æ£(å·¦æ)"}, + { 1, 11, 25, "ææä¿®æ£(å³æ)"}, { 1, 11, 25, ""}, - { 1, 15, 25, "¼Í·â¹¶·â½¤Àµ"}, - { 1, 16, 25, "¼Í·âÉð´ïÇÜΨ"}, - { 1, 20, 25, "²Ã®"}, - { 1, 19, 25, "£Á£Ã"}, - {29, 13, 21, "¥ì¥Ù¥ë"}, - {29, 14, 21, "·Ð¸³ÃÍ"}, - {29, 15, 21, "ºÇÂç·Ð¸³"}, - {29, 16, 21, "¼¡¥ì¥Ù¥ë"}, - {29, 17, 21, "½ê»ý¶â"}, - {29, 19, 21, "ÆüÉÕ"}, - {29, 10, 21, "£È£Ð"}, - {29, 11, 21, "£Í£Ð"}, - {29, 20, 21, "¥×¥ì¥¤»þ´Ö"}, - {53, 10, -1, "ÂǷ⹶·â :"}, - {53, 11, -1, "¼Í·â¹¶·â :"}, - {53, 12, -1, "ËâË¡Ëɸæ :"}, - {53, 13, -1, "±£Ì©¹ÔÆ° :"}, - {53, 15, -1, "ÃγР:"}, - {53, 16, -1, "õº÷ :"}, - {53, 17, -1, "²ò½ü :"}, - {53, 18, -1, "ËâË¡Æ»¶ñ :"}, - { 1, 12, 25, "ÂÇ·â²ó¿ô"}, - { 1, 17, 25, "¼Í·â²ó¿ô"}, - { 1, 13, 25, "Ê¿¶Ñ¥À¥á¡¼¥¸"}, - {53, 20, -1, "ÀÖ³°Àþ»ëÎÏ:"}, - {26, 1, -1, "̾Á° : "}, - { 1, 3, -1, "ÀÊÌ : "}, - { 1, 4, -1, "¼ï² : "}, - { 1, 5, -1, "¿¦¶È : "}, - { 1, 6, -1, "ËâË¡ : "}, - { 1, 7, -1, "¼é¸îËâ¿À : "}, - {29, 3, 21, "ǯÎð"}, - {29, 4, 21, "¿ÈĹ"}, - {29, 5, 21, "ÂνÅ"}, - {29, 6, 21, "¼Ò²ñŪÃÏ°Ì"}, - {29, 7, 21, "°À"}, - {29, 14, 21, "¶¯²½ÅÙ"}, - {29, 16, 21, "¼¡¥ì¥Ù¥ë"}, + { 1, 15, 25, "å°ææ»æä¿®æ£"}, + { 1, 16, 25, "å°ææ¦å¨åç"}, + { 1, 20, 25, "å é"}, + { 1, 19, 25, "AC"}, + {29, 13, 21, "ã¬ãã«"}, + {29, 14, 21, "çµé¨å¤"}, + {29, 15, 21, "æ大çµé¨"}, + {29, 16, 21, "次ã¬ãã«"}, + {29, 17, 21, "ææé"}, + {29, 19, 21, "æ¥ä»"}, + {29, 10, 21, "HP"}, + {29, 11, 21, "ï¼ï¼°"}, + {29, 20, 21, "ãã¬ã¤æé"}, + {53, 10, -1, "ææå½ä¸ :"}, + {53, 11, -1, "å°æå½ä¸ :"}, + {53, 12, -1, "éæ³é²å¾¡ :"}, + {53, 13, -1, "é å¯è¡å :"}, + {53, 15, -1, "ç¥è¦ :"}, + {53, 16, -1, "æ¢ç´¢ :"}, + {53, 17, -1, "è§£é¤ :"}, + {53, 18, -1, "éæ³éå · :"}, + { 1, 12, 25, "ææåæ°"}, + { 1, 17, 25, "å°æåæ°"}, + { 1, 13, 25, "å¹³åãã¡ã¼ã¸"}, + {53, 20, -1, "赤å¤ç·è¦å:"}, + {26, 1, -1, "åå : "}, + { 1, 3, -1, "æ§å¥ : "}, + { 1, 4, -1, "種æ : "}, + { 1, 5, -1, "è·æ¥ : "}, + { 1, 6, -1, "éæ³ : "}, + { 1, 7, -1, "å®è·éç¥ : "}, + {29, 3, 21, "å¹´é½¢"}, + {29, 4, 21, "身é·"}, + {29, 5, 21, "ä½é"}, + {29, 6, 21, "社ä¼çå°ä½"}, + {29, 7, 21, "å±æ§"}, + {29, 14, 21, "å¼·å度"}, + {29, 16, 21, "次ã¬ãã«"}, }; #else = { @@ -1661,6 +1640,13 @@ static struct }; #endif +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ã¹ãã¼ã¿ã¹1種ãåºåãã + * @param entry é ç®ID + * @param val å¤ãä¿ç®¡ããæååãã¤ã³ã¿ + * @param attr é ç®è¡¨ç¤ºã®è² + * @return ãªã + */ static void display_player_one_line(int entry, cptr val, byte attr) { char buf[40]; @@ -1691,62 +1677,65 @@ static void display_player_one_line(int entry, cptr val, byte attr) return; } +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ææè½åä¿®æ£ã表示ãã + * @param hand æ¦å¨ã®è£ åé¨ä½ID + * @param hand_entry é ç®ID + * @return ãªã + */ +static void display_player_melee_bonus(int hand, int hand_entry) +{ + char buf[160]; + int show_tohit = p_ptr->dis_to_h[hand]; + int show_todam = p_ptr->dis_to_d[hand]; + object_type *o_ptr = &inventory[INVEN_RARM + hand]; -/* + /* Hack -- add in weapon info if known */ + if (object_is_known(o_ptr)) show_tohit += o_ptr->to_h; + if (object_is_known(o_ptr)) show_todam += o_ptr->to_d; + + show_tohit += p_ptr->skill_thn / BTH_PLUS_ADJ; + + /* Melee attacks */ + sprintf(buf, "(%+d,%+d)", show_tohit, show_todam); + + /* Dump the bonuses to hit/dam */ + if (!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM)) + display_player_one_line(ENTRY_BARE_HAND, buf, TERM_L_BLUE); + else if (p_ptr->ryoute) + display_player_one_line(ENTRY_TWO_HANDS, buf, TERM_L_BLUE); + else + display_player_one_line(hand_entry, buf, TERM_L_BLUE); +} + + +/*! + * @brief ãã¬ã¤ã¤ã¼ã¹ãã¼ã¿ã¹è¡¨ç¤ºã®ä¸å¤®é¨åã表示ãããµãã«ã¼ãã³ * Prints the following information on the screen. + * @return ãªã */ static void display_player_middle(void) { char buf[160]; - int show_tohit, show_todam; - object_type *o_ptr; - int tmul = 0; - int e; - - if(p_ptr->migite) - { - show_tohit = p_ptr->dis_to_h[0]; - show_todam = p_ptr->dis_to_d[0]; - o_ptr = &inventory[INVEN_RARM]; + /* Base skill */ + int show_tohit = p_ptr->dis_to_h_b; + int show_todam = 0; - /* Hack -- add in weapon info if known */ - if (object_is_known(o_ptr)) show_tohit += o_ptr->to_h; - if (object_is_known(o_ptr)) show_todam += o_ptr->to_d; + /* Range weapon */ + object_type *o_ptr = &inventory[INVEN_BOW]; - /* Melee attacks */ - sprintf(buf, "(%+d,%+d)", show_tohit, show_todam); + int tmul = 0; + int e; - /* Dump the bonuses to hit/dam */ - if(!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM)) - display_player_one_line(ENTRY_BARE_HAND, buf, TERM_L_BLUE); - else if(p_ptr->ryoute) - display_player_one_line(ENTRY_TWO_HANDS, buf, TERM_L_BLUE); - else if (left_hander) - display_player_one_line(ENTRY_LEFT_HAND1, buf, TERM_L_BLUE); - else - display_player_one_line(ENTRY_RIGHT_HAND1, buf, TERM_L_BLUE); + if (p_ptr->migite) + { + display_player_melee_bonus(0, left_hander ? ENTRY_LEFT_HAND1 : ENTRY_RIGHT_HAND1); } - if(p_ptr->hidarite) + if (p_ptr->hidarite) { - show_tohit = p_ptr->dis_to_h[1]; - show_todam = p_ptr->dis_to_d[1]; - - o_ptr = &inventory[INVEN_LARM]; - - /* Hack -- add in weapon info if known */ - if (object_is_known(o_ptr)) show_tohit += o_ptr->to_h; - if (object_is_known(o_ptr)) show_todam += o_ptr->to_d; - - /* Melee attacks */ - sprintf(buf, "(%+d,%+d)", show_tohit, show_todam); - - /* Dump the bonuses to hit/dam */ - if (left_hander) - display_player_one_line(ENTRY_RIGHT_HAND2, buf, TERM_L_BLUE); - else - display_player_one_line(ENTRY_LEFT_HAND2, buf, TERM_L_BLUE); + display_player_melee_bonus(1, left_hander ? ENTRY_RIGHT_HAND2: ENTRY_LEFT_HAND2); } else if ((p_ptr->pclass == CLASS_MONK) && (empty_hands(TRUE) & EMPTY_HAND_RARM)) { @@ -1758,27 +1747,12 @@ static void display_player_middle(void) if ((p_ptr->special_defense >> i) & KAMAE_GENBU) break; } if (i < MAX_KAMAE) -#ifdef JP - display_player_one_line(ENTRY_POSTURE, format("%s¤Î¹½¤¨", kamae_shurui[i].desc), TERM_YELLOW); -#else - display_player_one_line(ENTRY_POSTURE, format("%s form", kamae_shurui[i].desc), TERM_YELLOW); -#endif + display_player_one_line(ENTRY_POSTURE, format(_("%sã®æ§ã", "%s form"), kamae_shurui[i].desc), TERM_YELLOW); } else -#ifdef JP - display_player_one_line(ENTRY_POSTURE, "¹½¤¨¤Ê¤·", TERM_YELLOW); -#else - display_player_one_line(ENTRY_POSTURE, "none", TERM_YELLOW); -#endif + display_player_one_line(ENTRY_POSTURE, _("æ§ããªã", "none"), TERM_YELLOW); } - /* Range weapon */ - o_ptr = &inventory[INVEN_BOW]; - - /* Base skill */ - show_tohit = p_ptr->dis_to_h_b; - show_todam = 0; - /* Apply weapon bonuses */ if (object_is_known(o_ptr)) show_tohit += o_ptr->to_h; if (object_is_known(o_ptr)) show_todam += o_ptr->to_d; @@ -1787,7 +1761,9 @@ static void display_player_middle(void) show_tohit += p_ptr->weapon_exp[0][o_ptr->sval] / 400; else show_tohit += (p_ptr->weapon_exp[0][o_ptr->sval] - (WEAPON_EXP_MASTER / 2)) / 200; - + + show_tohit += p_ptr->skill_thb / BTH_PLUS_ADJ; + /* Range attacks */ display_player_one_line(ENTRY_SHOOT_HIT_DAM, format("(%+d,%+d)", show_tohit, show_todam), TERM_L_BLUE); @@ -1848,8 +1824,8 @@ static void display_player_middle(void) } else { - if (m_list[p_ptr->riding].fast) tmp_speed += 10; - if (m_list[p_ptr->riding].slow) tmp_speed -= 10; + if (MON_FAST(&m_list[p_ptr->riding])) tmp_speed += 10; + if (MON_SLOW(&m_list[p_ptr->riding])) tmp_speed -= 10; } if (tmp_speed) @@ -1857,11 +1833,7 @@ static void display_player_middle(void) if (!p_ptr->riding) sprintf(buf, "(%+d%+d)", i-tmp_speed, tmp_speed); else -#ifdef JP - sprintf(buf, "¾èÇÏÃæ (%+d%+d)", i-tmp_speed, tmp_speed); -#else - sprintf(buf, "Riding (%+d%+d)", i-tmp_speed, tmp_speed); -#endif + sprintf(buf, _("ä¹é¦¬ä¸ (%+d%+d)", "Riding (%+d%+d)"), i-tmp_speed, tmp_speed); if (tmp_speed > 0) attr = TERM_YELLOW; @@ -1873,11 +1845,7 @@ static void display_player_middle(void) if (!p_ptr->riding) sprintf(buf, "(%+d)", i); else -#ifdef JP - sprintf(buf, "¾èÇÏÃæ (%+d)", i); -#else - sprintf(buf, "Riding (%+d)", i); -#endif + sprintf(buf, _("ä¹é¦¬ä¸ (%+d)", "Riding (%+d)"), i); } display_player_one_line(ENTRY_SPEED, buf, attr); @@ -1920,13 +1888,8 @@ static void display_player_middle(void) int day, hour, min; extract_day_hour_min(&day, &hour, &min); - sprintf(buf, -#ifdef JP - "%dÆüÌÜ %2d:%02d", -#else - "Day %d %2d:%02d", -#endif - day, hour, min); + if (day < MAX_DAYS) sprintf(buf, _("%dæ¥ç® %2d:%02d", "Day %d %2d:%02d"), day, hour, min); + else sprintf(buf, _("*****æ¥ç® %2d:%02d", "Day ***** %2d:%02d"), hour, min); } display_player_one_line(ENTRY_DAY, buf, TERM_L_GREEN); @@ -1957,8 +1920,12 @@ static void display_player_middle(void) static byte likert_color = TERM_WHITE; -/* +/*! + * @brief æè½ã©ã³ã¯ã®è¡¨ç¤ºåºæºãå®ãã * Returns a "rating" of x depending on y + * @param x æè½å¤ + * @param y æè½å¤ã«å¯¾ããã©ã³ã¯åºæºæ¯ + * @return ãªã */ static cptr likert(int x, int y) { @@ -1971,11 +1938,7 @@ static cptr likert(int x, int y) if (x < 0) { likert_color = TERM_L_DARK; -#ifdef JP - return "ºÇÄã"; -#else - return "Very Bad"; -#endif + return _("æä½", "Very Bad"); } /* Analyze the value */ @@ -1984,53 +1947,29 @@ static cptr likert(int x, int y) case 0: case 1: likert_color = TERM_RED; -#ifdef JP - return "°¤¤"; -#else - return "Bad"; -#endif + return _("æªã", "Bad"); case 2: likert_color = TERM_L_RED; -#ifdef JP - return "Îô¤ë"; -#else - return "Poor"; -#endif + return _("å£ã", "Poor"); case 3: case 4: likert_color = TERM_ORANGE; -#ifdef JP - return "ÉáÄÌ"; -#else - return "Fair"; -#endif + return _("æ®é", "Fair"); case 5: likert_color = TERM_YELLOW; -#ifdef JP - return "Îɤ¤"; -#else - return "Good"; -#endif + return _("è¯ã", "Good"); case 6: likert_color = TERM_YELLOW; -#ifdef JP - return "ÂçÊÑÎɤ¤"; -#else - return "Very Good"; -#endif + return _("大å¤è¯ã", "Very Good"); case 7: case 8: likert_color = TERM_L_GREEN; -#ifdef JP - return "Âî±Û"; -#else - return "Excellent"; -#endif + return _("åè¶", "Excellent"); case 9: case 10: @@ -2038,49 +1977,40 @@ static cptr likert(int x, int y) case 12: case 13: likert_color = TERM_GREEN; -#ifdef JP - return "Ķ±Û"; -#else - return "Superb"; -#endif + return _("è¶ è¶", "Superb"); case 14: case 15: case 16: case 17: likert_color = TERM_BLUE; -#ifdef JP - return "±ÑͺŪ"; -#else - return "Heroic"; -#endif + return _("è±éç", "Heroic"); default: likert_color = TERM_VIOLET; -#ifdef JP - sprintf(dummy, "ÅÁÀâŪ[%d]", (int)((((x / y) - 17) * 5) / 2)); -#else - sprintf(dummy, "Legendary[%d]", (int)((((x / y) - 17) * 5) / 2)); -#endif + sprintf(dummy, _("ä¼èª¬ç[%d]", "Legendary[%d]"), (int)((((x / y) - 17) * 5) / 2)); return dummy; } } -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã¹ãã¼ã¿ã¹ã®1ãã¼ã¸ç®å種詳細ãã¾ã¨ãã¦è¡¨ç¤ºãããµãã«ã¼ãã³ * Prints ratings on certain abilities - * + * @return ãªã + * @details * This code is "imitated" elsewhere to "dump" a character sheet. */ static void display_player_various(void) { - int tmp, damage[2], blows1, blows2, i, basedam; + int tmp, damage[2], to_h[2], blows1, blows2, i, basedam; int xthn, xthb, xfos, xsrh; int xdis, xdev, xsav, xstl; cptr desc; int muta_att = 0; u32b flgs[TR_FLAG_SIZE]; int shots, shot_frac; + bool dokubari; object_type *o_ptr; @@ -2100,7 +2030,7 @@ static void display_player_various(void) /* If the player is wielding one? */ if (o_ptr->k_idx) { - s16b energy_fire = bow_energy(o_ptr->sval); + ENERGY energy_fire = bow_energy(o_ptr->sval); /* Calculate shots per round */ shots = p_ptr->num_fire * 100; @@ -2155,9 +2085,19 @@ static void display_player_various(void) /* Average damage per round */ if (o_ptr->k_idx) { - if (object_is_known(o_ptr)) damage[i] += o_ptr->to_d * 100; + to_h[i] = 0; + dokubari = FALSE; + + if((o_ptr->tval == TV_SWORD) && (o_ptr->sval == SV_DOKUBARI)) dokubari = TRUE; + if (object_is_known(o_ptr)) + { + damage[i] += o_ptr->to_d * 100; + to_h[i] += o_ptr->to_h; + } basedam = ((o_ptr->dd + p_ptr->to_dd[i]) * (o_ptr->ds + p_ptr->to_ds[i] + 1)) * 50; object_flags_known(o_ptr, flgs); + + basedam = calc_expect_crit(o_ptr->weight, to_h[i], basedam, p_ptr->dis_to_h[i], dokubari); if ((o_ptr->ident & IDENT_MENTAL) && ((o_ptr->name1 == ART_VORPAL_BLADE) || (o_ptr->name1 == ART_CHAINSWORD))) { /* vorpal blade */ @@ -2237,8 +2177,15 @@ static void display_player_various(void) -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®è·æ¥ã種æã«å¿ããèæ§ãã©ã°ãè¿ã + * Prints ratings on certain abilities + * @param flgs ãã©ã°ãä¿ç®¡ããé å + * @return ãªã + * @details * Obtain the "flags" for the player as if he was an item + * @todo + * xtra1.cå¨ãã¨å¤éå®è£ ã«ãªã£ã¦ããã®ãä½ã¨ããã */ static void player_flags(u32b flgs[TR_FLAG_SIZE]) { @@ -2280,7 +2227,8 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_SPEED); else { - if (!inventory[INVEN_LARM].tval || p_ptr->hidarite) + if ((!inventory[INVEN_RARM].k_idx || p_ptr->migite) && + (!inventory[INVEN_LARM].k_idx || p_ptr->hidarite)) add_flag(flgs, TR_SPEED); if (p_ptr->lev>24) add_flag(flgs, TR_FREE_ACT); @@ -2326,7 +2274,7 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) switch(p_ptr->mimic_form) { case MIMIC_DEMON: - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); add_flag(flgs, TR_RES_CHAOS); add_flag(flgs, TR_RES_NETHER); add_flag(flgs, TR_RES_FIRE); @@ -2334,7 +2282,7 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_SPEED); break; case MIMIC_DEMON_LORD: - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); add_flag(flgs, TR_RES_CHAOS); add_flag(flgs, TR_RES_NETHER); add_flag(flgs, TR_RES_FIRE); @@ -2350,14 +2298,14 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_SH_FIRE); add_flag(flgs, TR_SEE_INVIS); add_flag(flgs, TR_TELEPATHY); - add_flag(flgs, TR_FEATHER); + add_flag(flgs, TR_LEVITATION); add_flag(flgs, TR_SPEED); break; case MIMIC_VAMPIRE: - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); add_flag(flgs, TR_RES_DARK); add_flag(flgs, TR_RES_NETHER); - if (p_ptr->pclass != CLASS_NINJA) add_flag(flgs, TR_LITE); + if (p_ptr->pclass != CLASS_NINJA) add_flag(flgs, TR_LITE_1); add_flag(flgs, TR_RES_POIS); add_flag(flgs, TR_RES_COLD); add_flag(flgs, TR_SEE_INVIS); @@ -2373,7 +2321,7 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_RES_LITE); break; case RACE_HOBBIT: - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); break; case RACE_GNOME: add_flag(flgs, TR_FREE_ACT); @@ -2389,7 +2337,7 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) if (p_ptr->lev > 14) { add_flag(flgs, TR_REGEN); - if (p_ptr->pclass == CLASS_WARRIOR) + if ((p_ptr->pclass == CLASS_WARRIOR) || (p_ptr->pclass == CLASS_BERSERKER)) { add_flag(flgs, TR_SLOW_DIGEST); /* @@ -2451,7 +2399,7 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_SEE_INVIS); break; case RACE_DRACONIAN: - add_flag(flgs, TR_FEATHER); + add_flag(flgs, TR_LEVITATION); if (p_ptr->lev > 4) add_flag(flgs, TR_RES_FIRE); if (p_ptr->lev > 9) @@ -2482,19 +2430,19 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_RES_POIS); add_flag(flgs, TR_SLOW_DIGEST); if (p_ptr->lev > 34) - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); break; case RACE_SKELETON: add_flag(flgs, TR_SEE_INVIS); add_flag(flgs, TR_RES_SHARDS); - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); add_flag(flgs, TR_RES_POIS); if (p_ptr->lev > 9) add_flag(flgs, TR_RES_COLD); break; case RACE_ZOMBIE: add_flag(flgs, TR_SEE_INVIS); - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); add_flag(flgs, TR_RES_NETHER); add_flag(flgs, TR_RES_POIS); add_flag(flgs, TR_SLOW_DIGEST); @@ -2502,19 +2450,19 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_RES_COLD); break; case RACE_VAMPIRE: - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); add_flag(flgs, TR_RES_DARK); add_flag(flgs, TR_RES_NETHER); - if (p_ptr->pclass != CLASS_NINJA) add_flag(flgs, TR_LITE); + if (p_ptr->pclass != CLASS_NINJA) add_flag(flgs, TR_LITE_1); add_flag(flgs, TR_RES_POIS); add_flag(flgs, TR_RES_COLD); break; case RACE_SPECTRE: - add_flag(flgs, TR_FEATHER); + add_flag(flgs, TR_LEVITATION); add_flag(flgs, TR_FREE_ACT); add_flag(flgs, TR_RES_COLD); add_flag(flgs, TR_SEE_INVIS); - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); add_flag(flgs, TR_RES_NETHER); add_flag(flgs, TR_RES_POIS); add_flag(flgs, TR_SLOW_DIGEST); @@ -2524,7 +2472,7 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) break; case RACE_SPRITE: add_flag(flgs, TR_RES_LITE); - add_flag(flgs, TR_FEATHER); + add_flag(flgs, TR_LEVITATION); if (p_ptr->lev > 9) add_flag(flgs, TR_SPEED); break; @@ -2533,13 +2481,13 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_RES_CONF); break; case RACE_ANGEL: - add_flag(flgs, TR_FEATHER); + add_flag(flgs, TR_LEVITATION); add_flag(flgs, TR_SEE_INVIS); break; case RACE_DEMON: add_flag(flgs, TR_RES_FIRE); add_flag(flgs, TR_RES_NETHER); - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); if (p_ptr->lev > 9) add_flag(flgs, TR_SEE_INVIS); break; @@ -2547,16 +2495,16 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_SUST_CON); break; case RACE_S_FAIRY: - add_flag(flgs, TR_FEATHER); + add_flag(flgs, TR_LEVITATION); break; - case RACE_KUTA: + case RACE_KUTAR: add_flag(flgs, TR_RES_CONF); break; case RACE_ANDROID: add_flag(flgs, TR_FREE_ACT); add_flag(flgs, TR_RES_POIS); add_flag(flgs, TR_SLOW_DIGEST); - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); break; default: ; /* Do nothing */ @@ -2586,12 +2534,12 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) if (p_ptr->muta3 & MUT3_FIRE_BODY) { add_flag(flgs, TR_SH_FIRE); - add_flag(flgs, TR_LITE); + add_flag(flgs, TR_LITE_1); } if (p_ptr->muta3 & MUT3_WINGS) { - add_flag(flgs, TR_FEATHER); + add_flag(flgs, TR_LEVITATION); } if (p_ptr->muta3 & MUT3_FEARLESS) @@ -2621,8 +2569,8 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) { add_flag(flgs, TR_RES_BLIND); add_flag(flgs, TR_RES_CONF); - add_flag(flgs, TR_HOLD_LIFE); - if (p_ptr->pclass != CLASS_NINJA) add_flag(flgs, TR_LITE); + add_flag(flgs, TR_HOLD_EXP); + if (p_ptr->pclass != CLASS_NINJA) add_flag(flgs, TR_LITE_1); if (p_ptr->lev > 9) add_flag(flgs, TR_SPEED); } @@ -2631,7 +2579,7 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) if (p_ptr->special_defense & KAMAE_GENBU) add_flag(flgs, TR_REFLECT); if (p_ptr->special_defense & KAMAE_SUZAKU) - add_flag(flgs, TR_FEATHER); + add_flag(flgs, TR_LEVITATION); if (p_ptr->special_defense & KAMAE_SEIRYU) { add_flag(flgs, TR_RES_FIRE); @@ -2639,7 +2587,7 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_RES_ACID); add_flag(flgs, TR_RES_ELEC); add_flag(flgs, TR_RES_POIS); - add_flag(flgs, TR_FEATHER); + add_flag(flgs, TR_LEVITATION); add_flag(flgs, TR_SH_FIRE); add_flag(flgs, TR_SH_ELEC); add_flag(flgs, TR_SH_COLD); @@ -2658,13 +2606,13 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_RES_CHAOS); add_flag(flgs, TR_RES_DISEN); add_flag(flgs, TR_REFLECT); - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); add_flag(flgs, TR_FREE_ACT); add_flag(flgs, TR_SH_FIRE); add_flag(flgs, TR_SH_ELEC); add_flag(flgs, TR_SH_COLD); - add_flag(flgs, TR_FEATHER); - add_flag(flgs, TR_LITE); + add_flag(flgs, TR_LEVITATION); + add_flag(flgs, TR_LITE_1); add_flag(flgs, TR_SEE_INVIS); add_flag(flgs, TR_TELEPATHY); add_flag(flgs, TR_SLOW_DIGEST); @@ -2678,7 +2626,14 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE]) } } - +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ä¸æçéæ³å¹æã«ããèæ§ãè¿ã + * Prints ratings on certain abilities + * @param flgs ãã©ã°ãä¿ç®¡ããé å + * @return ãªã + * @todo + * xtra1.cå¨ãã¨å¤éå®è£ ã«ãªã£ã¦ããã®ãä½ã¨ããã + */ static void tim_player_flags(u32b flgs[TR_FLAG_SIZE]) { int i; @@ -2739,7 +2694,7 @@ static void tim_player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_RES_CONF); add_flag(flgs, TR_REFLECT); add_flag(flgs, TR_FREE_ACT); - add_flag(flgs, TR_FEATHER); + add_flag(flgs, TR_LEVITATION); } if (p_ptr->tim_res_nether) { @@ -2763,13 +2718,13 @@ static void tim_player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_RES_CHAOS); add_flag(flgs, TR_RES_DISEN); add_flag(flgs, TR_REFLECT); - add_flag(flgs, TR_HOLD_LIFE); + add_flag(flgs, TR_HOLD_EXP); add_flag(flgs, TR_FREE_ACT); add_flag(flgs, TR_SH_FIRE); add_flag(flgs, TR_SH_ELEC); add_flag(flgs, TR_SH_COLD); - add_flag(flgs, TR_FEATHER); - add_flag(flgs, TR_LITE); + add_flag(flgs, TR_LEVITATION); + add_flag(flgs, TR_LITE_1); add_flag(flgs, TR_SEE_INVIS); add_flag(flgs, TR_TELEPATHY); add_flag(flgs, TR_SLOW_DIGEST); @@ -2781,6 +2736,18 @@ static void tim_player_flags(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_SUST_CON); add_flag(flgs, TR_SUST_CHR); } + + /* Hex bonuses */ + if (p_ptr->realm1 == REALM_HEX) + { + if (hex_spelling(HEX_DEMON_AURA)) + { + add_flag(flgs, TR_SH_FIRE); + add_flag(flgs, TR_REGEN); + } + if (hex_spelling(HEX_ICE_ARMOR)) add_flag(flgs, TR_SH_COLD); + if (hex_spelling(HEX_SHOCK_CLOAK)) add_flag(flgs, TR_SH_ELEC); + } } @@ -2790,8 +2757,13 @@ static void tim_player_flags(u32b flgs[TR_FLAG_SIZE]) #define DP_WP 0x08 -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®è£ åä¸è¦§ãã·ã³ãã«ã§ä¸¦ã¹ã * Equippy chars + * @param y 表示ããã³ã³ã½ã¼ã«ã®è¡ + * @param x 表示ããã³ã³ã½ã¼ã«ã®å + * @param mode ãªãã·ã§ã³ + * @return ãªã */ static void display_player_equippy(int y, int x, u16b mode) { @@ -2828,15 +2800,22 @@ static void display_player_equippy(int y, int x, u16b mode) } +/*! + * @brief ãã¬ã¤ã¤ã¼ã®è£ åä¸è¦§ã·ã³ãã«ãåºå®ä½ç½®ã«è¡¨ç¤ºãã + * @return ãªã + */ void print_equippy(void) { display_player_equippy(ROW_EQUIPPY, COL_EQUIPPY, 0); } -/* - * +/*! + * @brief ãã¬ã¤ã¤ã¼ã®è£ åã«ããå ç«ãã©ã°ãè¿ã + * @param flgs ãã©ã°ãä¿ç®¡ããé å + * @return ãªã + * @todo + * xtra1.cå¨ãã¨å¤éå®è£ ã«ãªã£ã¦ããã®ãä½ã¨ããã */ - static void known_obj_immunity(u32b flgs[TR_FLAG_SIZE]) { int i; @@ -2867,6 +2846,13 @@ static void known_obj_immunity(u32b flgs[TR_FLAG_SIZE]) } } +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ç¨®æã«ããå ç«ãã©ã°ãè¿ã + * @param flgs ãã©ã°ãä¿ç®¡ããé å + * @return ãªã + * @todo + * xtra1.cå¨ãã¨å¤éå®è£ ã«ãªã£ã¦ããã®ãä½ã¨ããã + */ static void player_immunity(u32b flgs[TR_FLAG_SIZE]) { int i; @@ -2885,6 +2871,13 @@ static void player_immunity(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_RES_ACID); } +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ä¸æçéæ³å¹æã«ããå ç«ãã©ã°ãè¿ã + * @param flgs ãã©ã°ãä¿ç®¡ããé å + * @return ãªã + * @todo + * xtra1.cå¨ãã¨å¤éå®è£ ã«ãªã£ã¦ããã®ãä½ã¨ããã + */ static void tim_player_immunity(u32b flgs[TR_FLAG_SIZE]) { int i; @@ -2905,6 +2898,13 @@ static void tim_player_immunity(u32b flgs[TR_FLAG_SIZE]) add_flag(flgs, TR_RES_DARK); } +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ç¨®æã«ããå¼±ç¹ãã©ã°ãè¿ã + * @param flgs ãã©ã°ãä¿ç®¡ããé å + * @return ãªã + * @todo + * xtra1.cå¨ãã¨å¤éå®è£ ã«ãªã£ã¦ããã®ãä½ã¨ããã + */ static void player_vuln_flags(u32b flgs[TR_FLAG_SIZE]) { int i; @@ -2943,8 +2943,16 @@ typedef struct { } all_player_flags; -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ç¹æ§ãã©ã°ä¸ç¨®ã表示ãããµãã«ã¼ãã³ / * Helper function, see below + * @param row ã³ã³ã½ã¼ã«è¡¨ç¤ºä½ç½®ã®å·¦ä¸è¡ + * @param col ã³ã³ã½ã¼ã«è¡¨ç¤ºä½ç½®ã®å·¦ä¸å + * @param header ã³ã³ã½ã¼ã«ä¸ã§è¡¨ç¤ºããç¹æ§å + * @param flag1 åç §ããç¹æ§ID + * @param f ãã¬ã¤ã¤ã¼ã®ç¹æ§æ å ±æ§é ä½ + * @param mode 表示ãªãã·ã§ã³ + * @return ãªã */ static void display_flag_aux(int row, int col, cptr header, int flag1, all_player_flags *f, u16b mode) @@ -2952,6 +2960,8 @@ static void display_flag_aux(int row, int col, cptr header, int i; bool vuln = FALSE; int max_i; + byte header_color = TERM_L_DARK; + int header_col = col; if (have_flag(f->player_vuln, flag1) && !(have_flag(f->known_obj_imm, flag1) || @@ -2959,9 +2969,6 @@ static void display_flag_aux(int row, int col, cptr header, have_flag(f->tim_player_imm, flag1))) vuln = TRUE; - /* Header */ - if (!(mode & DP_IMM)) c_put_str(TERM_WHITE, header, row, col); - /* Advance */ col += strlen(header) + 1; @@ -2988,16 +2995,43 @@ static void display_flag_aux(int row, int col, cptr header, /* Check flags */ if (mode & DP_CURSE) { - if ((mode & DP_CURSE) && (o_ptr->curse_flags & (TRC_CURSED | TRC_HEAVY_CURSE))) + if (have_flag(flgs, TR_ADD_L_CURSE) || have_flag(flgs, TR_ADD_H_CURSE)) + { + c_put_str(TERM_L_DARK, "+", row, col); + header_color = TERM_WHITE; + } + if (o_ptr->curse_flags & (TRC_CURSED | TRC_HEAVY_CURSE)) + { c_put_str(TERM_WHITE, "+", row, col); - if ((mode & DP_CURSE) && (o_ptr->curse_flags & TRC_PERMA_CURSE)) + header_color = TERM_WHITE; + } + if (o_ptr->curse_flags & TRC_PERMA_CURSE) + { c_put_str(TERM_WHITE, "*", row, col); + header_color = TERM_WHITE; + } + } + else if (flag1 == TR_LITE_1) + { + if (have_dark_flag(flgs)) + { + c_put_str(TERM_L_DARK, "+", row, col); + header_color = TERM_WHITE; + } + else if (have_lite_flag(flgs)) + { + c_put_str(TERM_WHITE, "+", row, col); + header_color = TERM_WHITE; + } } else { if (have_flag(flgs, flag1)) + { c_put_str((byte)(vuln ? TERM_L_RED : TERM_WHITE), (mode & DP_IMM) ? "*" : "+", row, col); + header_color = TERM_WHITE; + } } /* Advance */ @@ -3005,28 +3039,57 @@ static void display_flag_aux(int row, int col, cptr header, } /* Assume that player flag is already written */ - if (mode & DP_IMM) return; + if (mode & DP_IMM) + { + if (header_color != TERM_L_DARK) + { + /* Overwrite Header Color */ + c_put_str(header_color, header, row, header_col); + } + return; + } /* Default */ c_put_str((byte)(vuln ? TERM_RED : TERM_SLATE), ".", row, col); /* Player flags */ - if (have_flag(f->player_flags, flag1)) c_put_str((byte)(vuln ? TERM_L_RED : TERM_WHITE), "+", row, col); + if (have_flag(f->player_flags, flag1)) + { + c_put_str((byte)(vuln ? TERM_L_RED : TERM_WHITE), "+", row, col); + header_color = TERM_WHITE; + } /* Timed player flags */ - if (have_flag(f->tim_player_flags, flag1)) c_put_str((byte)(vuln ? TERM_ORANGE : TERM_YELLOW), "#", row, col); + if (have_flag(f->tim_player_flags, flag1)) + { + c_put_str((byte)(vuln ? TERM_ORANGE : TERM_YELLOW), "#", row, col); + header_color = TERM_WHITE; + } /* Immunity */ - if (have_flag(f->tim_player_imm, flag1)) c_put_str(TERM_YELLOW, "*", row, col); - if (have_flag(f->player_imm, flag1)) c_put_str(TERM_WHITE, "*", row, col); + if (have_flag(f->tim_player_imm, flag1)) + { + c_put_str(TERM_YELLOW, "*", row, col); + header_color = TERM_WHITE; + } + if (have_flag(f->player_imm, flag1)) + { + c_put_str(TERM_WHITE, "*", row, col); + header_color = TERM_WHITE; + } /* Vulnerability */ if (vuln) c_put_str(TERM_RED, "v", row, col + 1); + + /* Header */ + c_put_str(header_color, header, row, header_col); } -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ç¹æ§ãã©ã°ä¸è¦§è¡¨ç¤ºï¼ / * Special display, part 1 + * @return ãªã */ static void display_player_flag_info(void) { @@ -3052,20 +3115,20 @@ static void display_player_flag_info(void) c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+8); #ifdef JP -display_flag_aux(row+0, col, "ÂÑ»À :", TR_RES_ACID, &f, 0); -display_flag_aux(row+0, col, "ÂÑ»À :", TR_IM_ACID, &f, DP_IMM); -display_flag_aux(row+1, col, "ÂÑÅÅ·â:", TR_RES_ELEC, &f, 0); -display_flag_aux(row+1, col, "ÂÑÅÅ·â:", TR_IM_ELEC, &f, DP_IMM); -display_flag_aux(row+2, col, "ÂѲбê:", TR_RES_FIRE, &f, 0); -display_flag_aux(row+2, col, "ÂѲбê:", TR_IM_FIRE, &f, DP_IMM); -display_flag_aux(row+3, col, "ÂÑÎ䵤:", TR_RES_COLD, &f, 0); -display_flag_aux(row+3, col, "ÂÑÎ䵤:", TR_IM_COLD, &f, DP_IMM); -display_flag_aux(row+4, col, "ÂÑÆÇ :", TR_RES_POIS, &f, 0); -display_flag_aux(row+5, col, "ÂÑÁ®¸÷:", TR_RES_LITE, &f, 0); -display_flag_aux(row+6, col, "ÂѰŹõ:", TR_RES_DARK, &f, 0); -display_flag_aux(row+7, col, "ÂÑÇËÊÒ:", TR_RES_SHARDS, &f, 0); -display_flag_aux(row+8, col, "ÂÑÌÕÌÜ:", TR_RES_BLIND, &f, 0); -display_flag_aux(row+9, col, "ÂѺ®Íð:", TR_RES_CONF, &f, 0); +display_flag_aux(row+0, col, "èé ¸ :", TR_RES_ACID, &f, 0); +display_flag_aux(row+0, col, "èé ¸ :", TR_IM_ACID, &f, DP_IMM); +display_flag_aux(row+1, col, "èé»æ:", TR_RES_ELEC, &f, 0); +display_flag_aux(row+1, col, "èé»æ:", TR_IM_ELEC, &f, DP_IMM); +display_flag_aux(row+2, col, "èç«ç:", TR_RES_FIRE, &f, 0); +display_flag_aux(row+2, col, "èç«ç:", TR_IM_FIRE, &f, DP_IMM); +display_flag_aux(row+3, col, "èå·æ°:", TR_RES_COLD, &f, 0); +display_flag_aux(row+3, col, "èå·æ°:", TR_IM_COLD, &f, DP_IMM); +display_flag_aux(row+4, col, "èæ¯ :", TR_RES_POIS, &f, 0); +display_flag_aux(row+5, col, "èéå :", TR_RES_LITE, &f, 0); +display_flag_aux(row+6, col, "èæé»:", TR_RES_DARK, &f, 0); +display_flag_aux(row+7, col, "èç ´ç:", TR_RES_SHARDS, &f, 0); +display_flag_aux(row+8, col, "èç²ç®:", TR_RES_BLIND, &f, 0); +display_flag_aux(row+9, col, "èæ··ä¹±:", TR_RES_CONF, &f, 0); #else display_flag_aux(row+0, col, "Acid :", TR_RES_ACID, &f, 0); display_flag_aux(row+0, col, "Acid :", TR_IM_ACID, &f, DP_IMM); @@ -3094,16 +3157,16 @@ display_flag_aux(row+9, col, " c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+8); #ifdef JP -display_flag_aux(row+0, col, "Âѹ첻:", TR_RES_SOUND, &f, 0); -display_flag_aux(row+1, col, "ÂÑÃϹö:", TR_RES_NETHER, &f, 0); -display_flag_aux(row+2, col, "ÂÑ°øº®:", TR_RES_NEXUS, &f, 0); -display_flag_aux(row+3, col, "ÂÑ¥«¥ª:", TR_RES_CHAOS, &f, 0); -display_flag_aux(row+4, col, "ÂÑÎô²½:", TR_RES_DISEN, &f, 0); -display_flag_aux(row+5, col, "ÂѶ²ÉÝ:", TR_RES_FEAR, &f, 0); -display_flag_aux(row+6, col, "È¿¼Í :", TR_REFLECT, &f, 0); -display_flag_aux(row+7, col, "²Ð±ê¥ª:", TR_SH_FIRE, &f, 0); -display_flag_aux(row+8, col, "Åŵ¤¥ª:", TR_SH_ELEC, &f, 0); -display_flag_aux(row+9, col, "Î䵤¥ª:", TR_SH_COLD, &f, 0); +display_flag_aux(row+0, col, "èè½é³:", TR_RES_SOUND, &f, 0); +display_flag_aux(row+1, col, "èå°ç:", TR_RES_NETHER, &f, 0); +display_flag_aux(row+2, col, "èå æ··:", TR_RES_NEXUS, &f, 0); +display_flag_aux(row+3, col, "èã«ãª:", TR_RES_CHAOS, &f, 0); +display_flag_aux(row+4, col, "èå£å:", TR_RES_DISEN, &f, 0); +display_flag_aux(row+5, col, "èææ:", TR_RES_FEAR, &f, 0); +display_flag_aux(row+6, col, "åå° :", TR_REFLECT, &f, 0); +display_flag_aux(row+7, col, "ç«çãª:", TR_SH_FIRE, &f, 0); +display_flag_aux(row+8, col, "é»æ°ãª:", TR_SH_ELEC, &f, 0); +display_flag_aux(row+9, col, "å·æ°ãª:", TR_SH_COLD, &f, 0); #else display_flag_aux(row+0, col, "Sound :", TR_RES_SOUND, &f, 0); display_flag_aux(row+1, col, "Nether:", TR_RES_NETHER, &f, 0); @@ -3128,34 +3191,36 @@ display_flag_aux(row+9, col, " c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+12); #ifdef JP -display_flag_aux(row+0, col, "²Ã® :", TR_SPEED, &f, 0); -display_flag_aux(row+1, col, "ÂÑËãáã :", TR_FREE_ACT, &f, 0); -display_flag_aux(row+2, col, "Æ©ÌÀÂλëǧ:", TR_SEE_INVIS, &f, 0); -display_flag_aux(row+3, col, "·Ð¸³ÃÍÊÝ»ý:", TR_HOLD_LIFE, &f, 0); -display_flag_aux(row+4, col, "·Ù¹ð :", TR_WARNING, &f, 0); -display_flag_aux(row+5, col, "Ãپò½ :", TR_SLOW_DIGEST, &f, 0); -display_flag_aux(row+6, col, "µÞ²óÉü :", TR_REGEN, &f, 0); -display_flag_aux(row+7, col, "ÉâÍ· :", TR_FEATHER, &f, 0); -display_flag_aux(row+8, col, "±Ê±ó¸÷¸» :", TR_LITE, &f, 0); -display_flag_aux(row+9, col, "¼ö¤¤ :", 0, &f, DP_CURSE); +display_flag_aux(row+0, col, "å é :", TR_SPEED, &f, 0); +display_flag_aux(row+1, col, "èéº»çº :", TR_FREE_ACT, &f, 0); +display_flag_aux(row+2, col, "éæä½è¦èª:", TR_SEE_INVIS, &f, 0); +display_flag_aux(row+3, col, "çµé¨å¤ä¿æ:", TR_HOLD_EXP, &f, 0); +display_flag_aux(row+4, col, "è¦å :", TR_WARNING, &f, 0); +display_flag_aux(row+5, col, "é æ¶å :", TR_SLOW_DIGEST, &f, 0); +display_flag_aux(row+6, col, "æ¥å復 :", TR_REGEN, &f, 0); +display_flag_aux(row+7, col, "æµ®é :", TR_LEVITATION, &f, 0); +display_flag_aux(row+8, col, "æ°¸é å æº :", TR_LITE_1, &f, 0); +display_flag_aux(row+9, col, "åªã :", 0, &f, DP_CURSE); #else display_flag_aux(row+0, col, "Speed :", TR_SPEED, &f, 0); display_flag_aux(row+1, col, "FreeAction:", TR_FREE_ACT, &f, 0); display_flag_aux(row+2, col, "SeeInvisi.:", TR_SEE_INVIS, &f, 0); - display_flag_aux(row+3, col, "Hold Life :", TR_HOLD_LIFE, &f, 0); + display_flag_aux(row+3, col, "Hold Exp :", TR_HOLD_EXP, &f, 0); display_flag_aux(row+4, col, "Warning :", TR_WARNING, &f, 0); display_flag_aux(row+5, col, "SlowDigest:", TR_SLOW_DIGEST, &f, 0); display_flag_aux(row+6, col, "Regene. :", TR_REGEN, &f, 0); - display_flag_aux(row+7, col, "Levitation:", TR_FEATHER, &f, 0); - display_flag_aux(row+8, col, "Perm Lite :", TR_LITE, &f, 0); + display_flag_aux(row+7, col, "Levitation:", TR_LEVITATION, &f, 0); + display_flag_aux(row+8, col, "Perm Lite :", TR_LITE_1, &f, 0); display_flag_aux(row+9, col, "Cursed :", 0, &f, DP_CURSE); #endif } -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ç¹æ§ãã©ã°ä¸è¦§è¡¨ç¤ºï¼ / * Special display, part 2 + * @return ãªã */ static void display_player_other_flag_info(void) { @@ -3182,34 +3247,34 @@ static void display_player_other_flag_info(void) c_put_str(TERM_WHITE, "ab@", row-1, col+12); #ifdef JP - display_flag_aux(row+ 0, col, "¼Ù° ÇÜÂÇ :", TR_SLAY_EVIL, &f, DP_WP); - display_flag_aux(row+ 0, col, "¼Ù° ÇÜÂÇ :", TR_KILL_EVIL, &f, (DP_WP|DP_IMM)); - display_flag_aux(row+ 1, col, "ÉÔ»à ÇÜÂÇ :", TR_SLAY_UNDEAD, &f, DP_WP); - display_flag_aux(row+ 1, col, "ÉÔ»à ÇÜÂÇ :", TR_KILL_UNDEAD, &f, (DP_WP|DP_IMM)); - display_flag_aux(row+ 2, col, "°Ëâ ÇÜÂÇ :", TR_SLAY_DEMON, &f, DP_WP); - display_flag_aux(row+ 2, col, "°Ëâ ÇÜÂÇ :", TR_KILL_DEMON, &f, (DP_WP|DP_IMM)); - display_flag_aux(row+ 3, col, "ζ ÇÜÂÇ :", TR_SLAY_DRAGON, &f, DP_WP); - display_flag_aux(row+ 3, col, "ζ ÇÜÂÇ :", TR_KILL_DRAGON, &f, (DP_WP|DP_IMM)); - display_flag_aux(row+ 4, col, "¿Í´Ö ÇÜÂÇ :", TR_SLAY_HUMAN, &f, DP_WP); - display_flag_aux(row+ 4, col, "¿Í´Ö ÇÜÂÇ :", TR_KILL_HUMAN, &f, (DP_WP|DP_IMM)); - display_flag_aux(row+ 5, col, "ưʪ ÇÜÂÇ :", TR_SLAY_ANIMAL, &f, DP_WP); - display_flag_aux(row+ 5, col, "ưʪ ÇÜÂÇ :", TR_KILL_ANIMAL, &f, (DP_WP|DP_IMM)); - display_flag_aux(row+ 6, col, "¥ª¡¼¥¯ÇÜÂÇ:", TR_SLAY_ORC, &f, DP_WP); - display_flag_aux(row+ 6, col, "¥ª¡¼¥¯ÇÜÂÇ:", TR_KILL_ORC, &f, (DP_WP|DP_IMM)); - display_flag_aux(row+ 7, col, "¥È¥í¥ëÇÜÂÇ:", TR_SLAY_TROLL, &f, DP_WP); - display_flag_aux(row+ 7, col, "¥È¥í¥ëÇÜÂÇ:", TR_KILL_TROLL, &f, (DP_WP|DP_IMM)); - display_flag_aux(row+ 8, col, "µð¿Í ÇÜÂÇ :", TR_SLAY_GIANT, &f, DP_WP); - display_flag_aux(row+ 8, col, "µð¿Í ÇÜÂÇ :", TR_KILL_GIANT, &f, (DP_WP|DP_IMM)); - display_flag_aux(row+ 9, col, "Íϲò :", TR_BRAND_ACID, &f, DP_WP); - display_flag_aux(row+10, col, "ÅÅ·â :", TR_BRAND_ELEC, &f, DP_WP); - display_flag_aux(row+11, col, "¾Æ´þ :", TR_BRAND_FIRE, &f, DP_WP); - display_flag_aux(row+12, col, "Åà·ë :", TR_BRAND_COLD, &f, DP_WP); - display_flag_aux(row+13, col, "ÆÇ»¦ :", TR_BRAND_POIS, &f, DP_WP); - display_flag_aux(row+14, col, "ÀÚ¤ìÌ£ :", TR_VORPAL, &f, DP_WP); - display_flag_aux(row+15, col, "ÃÏ¿Ì :", TR_IMPACT, &f, DP_WP); - display_flag_aux(row+16, col, "µÛ·ì :", TR_VAMPIRIC, &f, DP_WP); - display_flag_aux(row+17, col, "¥«¥ª¥¹¸ú²Ì:", TR_CHAOTIC, &f, DP_WP); - display_flag_aux(row+18, col, "ÍýÎÏ :", TR_FORCE_WEAPON, &f, DP_WP); + display_flag_aux(row+ 0, col, "éªæª åæ :", TR_SLAY_EVIL, &f, DP_WP); + display_flag_aux(row+ 0, col, "éªæª åæ :", TR_KILL_EVIL, &f, (DP_WP|DP_IMM)); + display_flag_aux(row+ 1, col, "ä¸æ» åæ :", TR_SLAY_UNDEAD, &f, DP_WP); + display_flag_aux(row+ 1, col, "ä¸æ» åæ :", TR_KILL_UNDEAD, &f, (DP_WP|DP_IMM)); + display_flag_aux(row+ 2, col, "æªé åæ :", TR_SLAY_DEMON, &f, DP_WP); + display_flag_aux(row+ 2, col, "æªé åæ :", TR_KILL_DEMON, &f, (DP_WP|DP_IMM)); + display_flag_aux(row+ 3, col, "é¾ åæ :", TR_SLAY_DRAGON, &f, DP_WP); + display_flag_aux(row+ 3, col, "é¾ åæ :", TR_KILL_DRAGON, &f, (DP_WP|DP_IMM)); + display_flag_aux(row+ 4, col, "人é åæ :", TR_SLAY_HUMAN, &f, DP_WP); + display_flag_aux(row+ 4, col, "人é åæ :", TR_KILL_HUMAN, &f, (DP_WP|DP_IMM)); + display_flag_aux(row+ 5, col, "åç© åæ :", TR_SLAY_ANIMAL, &f, DP_WP); + display_flag_aux(row+ 5, col, "åç© åæ :", TR_KILL_ANIMAL, &f, (DP_WP|DP_IMM)); + display_flag_aux(row+ 6, col, "ãªã¼ã¯åæ:", TR_SLAY_ORC, &f, DP_WP); + display_flag_aux(row+ 6, col, "ãªã¼ã¯åæ:", TR_KILL_ORC, &f, (DP_WP|DP_IMM)); + display_flag_aux(row+ 7, col, "ããã«åæ:", TR_SLAY_TROLL, &f, DP_WP); + display_flag_aux(row+ 7, col, "ããã«åæ:", TR_KILL_TROLL, &f, (DP_WP|DP_IMM)); + display_flag_aux(row+ 8, col, "巨人 åæ :", TR_SLAY_GIANT, &f, DP_WP); + display_flag_aux(row+ 8, col, "巨人 åæ :", TR_KILL_GIANT, &f, (DP_WP|DP_IMM)); + display_flag_aux(row+ 9, col, "溶解 :", TR_BRAND_ACID, &f, DP_WP); + display_flag_aux(row+10, col, "é»æ :", TR_BRAND_ELEC, &f, DP_WP); + display_flag_aux(row+11, col, "ç¼æ£ :", TR_BRAND_FIRE, &f, DP_WP); + display_flag_aux(row+12, col, "åçµ :", TR_BRAND_COLD, &f, DP_WP); + display_flag_aux(row+13, col, "æ¯æ®º :", TR_BRAND_POIS, &f, DP_WP); + display_flag_aux(row+14, col, "åãå³ :", TR_VORPAL, &f, DP_WP); + display_flag_aux(row+15, col, "å°é :", TR_IMPACT, &f, DP_WP); + display_flag_aux(row+16, col, "å¸è¡ :", TR_VAMPIRIC, &f, DP_WP); + display_flag_aux(row+17, col, "ã«ãªã¹å¹æ:", TR_CHAOTIC, &f, DP_WP); + display_flag_aux(row+18, col, "çå :", TR_FORCE_WEAPON, &f, DP_WP); #else display_flag_aux(row+ 0, col, "Slay Evil :", TR_SLAY_EVIL, &f, DP_WP); display_flag_aux(row+ 0, col, "Slay Evil :", TR_KILL_EVIL, &f, (DP_WP|DP_IMM)); @@ -3247,49 +3312,49 @@ static void display_player_other_flag_info(void) row = 3; col = col + 12 + 7; - display_player_equippy(row-2, col+12, 0); - c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+12); - -#ifdef JP - display_flag_aux(row+ 0, col, "¥Æ¥ì¥Ñ¥·¡¼:", TR_TELEPATHY, &f, 0); - display_flag_aux(row+ 1, col, "¼Ù°ESP :", TR_ESP_EVIL, &f, 0); - display_flag_aux(row+ 2, col, "̵À¸ÊªESP :", TR_ESP_NONLIVING, &f, 0); - display_flag_aux(row+ 3, col, "Á±ÎÉESP :", TR_ESP_GOOD, &f, 0); - display_flag_aux(row+ 4, col, "ÉÔ»àESP :", TR_ESP_UNDEAD, &f, 0); - display_flag_aux(row+ 5, col, "°ËâESP :", TR_ESP_DEMON, &f, 0); - display_flag_aux(row+ 6, col, "ζESP :", TR_ESP_DRAGON, &f, 0); - display_flag_aux(row+ 7, col, "¿Í´ÖESP :", TR_ESP_HUMAN, &f, 0); - display_flag_aux(row+ 8, col, "ưʪESP :", TR_ESP_ANIMAL, &f, 0); - display_flag_aux(row+ 9, col, "¥ª¡¼¥¯ESP :", TR_ESP_ORC, &f, 0); - display_flag_aux(row+10, col, "¥È¥í¥ëESP :", TR_ESP_TROLL, &f, 0); - display_flag_aux(row+11, col, "µð¿ÍESP :", TR_ESP_GIANT, &f, 0); - - display_flag_aux(row+13, col, "ÏÓÎÏ°Ý»ý :", TR_SUST_STR, &f, 0); - display_flag_aux(row+14, col, "ÃÎÎÏ°Ý»ý :", TR_SUST_INT, &f, 0); - display_flag_aux(row+15, col, "¸¤µ°Ý»ý :", TR_SUST_WIS, &f, 0); - display_flag_aux(row+16, col, "´ïÍÑ°Ý»ý :", TR_SUST_DEX, &f, 0); - display_flag_aux(row+17, col, "Âѵװݻý :", TR_SUST_CON, &f, 0); - display_flag_aux(row+18, col, "Ì¥ÎÏ°Ý»ý :", TR_SUST_CHR, &f, 0); -#else - display_flag_aux(row+ 0, col, "Telepathy :", TR_TELEPATHY, &f, 0); - display_flag_aux(row+ 1, col, "ESP Evil :", TR_ESP_EVIL, &f, 0); - display_flag_aux(row+ 2, col, "ESP Noliv.:", TR_ESP_NONLIVING, &f, 0); - display_flag_aux(row+ 3, col, "ESP Good :", TR_ESP_GOOD, &f, 0); - display_flag_aux(row+ 4, col, "ESP Undead:", TR_ESP_UNDEAD, &f, 0); - display_flag_aux(row+ 5, col, "ESP Demon :", TR_ESP_DEMON, &f, 0); - display_flag_aux(row+ 6, col, "ESP Dragon:", TR_ESP_DRAGON, &f, 0); - display_flag_aux(row+ 7, col, "ESP Human :", TR_ESP_HUMAN, &f, 0); - display_flag_aux(row+ 8, col, "ESP Animal:", TR_ESP_ANIMAL, &f, 0); - display_flag_aux(row+ 9, col, "ESP Orc :", TR_ESP_ORC, &f, 0); - display_flag_aux(row+10, col, "ESP Troll :", TR_ESP_TROLL, &f, 0); - display_flag_aux(row+11, col, "ESP Giant :", TR_ESP_GIANT, &f, 0); - - display_flag_aux(row+13, col, "Sust Str :", TR_SUST_STR, &f, 0); - display_flag_aux(row+14, col, "Sust Int :", TR_SUST_INT, &f, 0); - display_flag_aux(row+15, col, "Sust Wis :", TR_SUST_WIS, &f, 0); - display_flag_aux(row+16, col, "Sust Dex :", TR_SUST_DEX, &f, 0); - display_flag_aux(row+17, col, "Sust Con :", TR_SUST_CON, &f, 0); - display_flag_aux(row+18, col, "Sust Chr :", TR_SUST_CHR, &f, 0); + display_player_equippy(row-2, col+13, 0); + c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+13); + +#ifdef JP + display_flag_aux(row+ 0, col, "ãã¬ãã·ã¼ :", TR_TELEPATHY, &f, 0); + display_flag_aux(row+ 1, col, "éªæªESP :", TR_ESP_EVIL, &f, 0); + display_flag_aux(row+ 2, col, "ç¡çç©ESP :", TR_ESP_NONLIVING, &f, 0); + display_flag_aux(row+ 3, col, "åè¯ESP :", TR_ESP_GOOD, &f, 0); + display_flag_aux(row+ 4, col, "ä¸æ»ESP :", TR_ESP_UNDEAD, &f, 0); + display_flag_aux(row+ 5, col, "æªéESP :", TR_ESP_DEMON, &f, 0); + display_flag_aux(row+ 6, col, "é¾ESP :", TR_ESP_DRAGON, &f, 0); + display_flag_aux(row+ 7, col, "人éESP :", TR_ESP_HUMAN, &f, 0); + display_flag_aux(row+ 8, col, "åç©ESP :", TR_ESP_ANIMAL, &f, 0); + display_flag_aux(row+ 9, col, "ãªã¼ã¯ESP :", TR_ESP_ORC, &f, 0); + display_flag_aux(row+10, col, "ããã«ESP :", TR_ESP_TROLL, &f, 0); + display_flag_aux(row+11, col, "巨人ESP :", TR_ESP_GIANT, &f, 0); + display_flag_aux(row+12, col, "ã¦ãã¼ã¯ESP:", TR_ESP_UNIQUE, &f, 0); + display_flag_aux(row+13, col, "è åç¶æ :", TR_SUST_STR, &f, 0); + display_flag_aux(row+14, col, "ç¥åç¶æ :", TR_SUST_INT, &f, 0); + display_flag_aux(row+15, col, "è³¢ãç¶æ :", TR_SUST_WIS, &f, 0); + display_flag_aux(row+16, col, "å¨ç¨ç¶æ :", TR_SUST_DEX, &f, 0); + display_flag_aux(row+17, col, "èä¹ ç¶æ :", TR_SUST_CON, &f, 0); + display_flag_aux(row+18, col, "é åç¶æ :", TR_SUST_CHR, &f, 0); +#else + display_flag_aux(row+ 0, col, "Telepathy :", TR_TELEPATHY, &f, 0); + display_flag_aux(row+ 1, col, "ESP Evil :", TR_ESP_EVIL, &f, 0); + display_flag_aux(row+ 2, col, "ESP Noliv. :", TR_ESP_NONLIVING, &f, 0); + display_flag_aux(row+ 3, col, "ESP Good :", TR_ESP_GOOD, &f, 0); + display_flag_aux(row+ 4, col, "ESP Undead :", TR_ESP_UNDEAD, &f, 0); + display_flag_aux(row+ 5, col, "ESP Demon :", TR_ESP_DEMON, &f, 0); + display_flag_aux(row+ 6, col, "ESP Dragon :", TR_ESP_DRAGON, &f, 0); + display_flag_aux(row+ 7, col, "ESP Human :", TR_ESP_HUMAN, &f, 0); + display_flag_aux(row+ 8, col, "ESP Animal :", TR_ESP_ANIMAL, &f, 0); + display_flag_aux(row+ 9, col, "ESP Orc :", TR_ESP_ORC, &f, 0); + display_flag_aux(row+10, col, "ESP Troll :", TR_ESP_TROLL, &f, 0); + display_flag_aux(row+11, col, "ESP Giant :", TR_ESP_GIANT, &f, 0); + display_flag_aux(row+12, col, "ESP Unique :", TR_ESP_UNIQUE, &f, 0); + display_flag_aux(row+13, col, "Sust Str :", TR_SUST_STR, &f, 0); + display_flag_aux(row+14, col, "Sust Int :", TR_SUST_INT, &f, 0); + display_flag_aux(row+15, col, "Sust Wis :", TR_SUST_WIS, &f, 0); + display_flag_aux(row+16, col, "Sust Dex :", TR_SUST_DEX, &f, 0); + display_flag_aux(row+17, col, "Sust Con :", TR_SUST_CON, &f, 0); + display_flag_aux(row+18, col, "Sust Chr :", TR_SUST_CHR, &f, 0); #endif @@ -3303,24 +3368,24 @@ static void display_player_other_flag_info(void) c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+14); #ifdef JP - display_flag_aux(row+ 0, col, "Äɲù¶·â :", TR_BLOWS, &f, 0); - display_flag_aux(row+ 1, col, "ºÎ·¡ :", TR_TUNNEL, &f, 0); - display_flag_aux(row+ 2, col, "ÀÖ³°Àþ»ëÎÏ :", TR_INFRA, &f, 0); - display_flag_aux(row+ 3, col, "ËâË¡Æ»¶ñ»ÙÇÛ:", TR_MAGIC_MASTERY, &f, 0); - display_flag_aux(row+ 4, col, "±£Ì© :", TR_STEALTH, &f, 0); - display_flag_aux(row+ 5, col, "õº÷ :", TR_SEARCH, &f, 0); - - display_flag_aux(row+ 7, col, "¾èÇÏ :", TR_RIDING, &f, 0); - display_flag_aux(row+ 8, col, "ÅêÚ³ :", TR_THROW, &f, 0); - display_flag_aux(row+ 9, col, "½ËÊ¡ :", TR_BLESSED, &f, 0); - display_flag_aux(row+10, col, "È¿¥Æ¥ì¥Ý¡¼¥È:", TR_NO_TELE, &f, 0); - display_flag_aux(row+11, col, "È¿ËâË¡ :", TR_NO_MAGIC, &f, 0); - display_flag_aux(row+12, col, "¾ÃÈñËâÎϸº¾¯:", TR_DEC_MANA, &f, 0); - - display_flag_aux(row+14, col, "·Ð¸³Ã͸º¾¯ :", TR_DRAIN_EXP, &f, 0); - display_flag_aux(row+15, col, "Íð¥Æ¥ì¥Ý¡¼¥È:", TR_TELEPORT, &f, 0); - display_flag_aux(row+16, col, "È¿´¶ :", TR_AGGRAVATE, &f, 0); - display_flag_aux(row+17, col, "ÂÀ¸Å¤Î±åÇ° :", TR_TY_CURSE, &f, 0); + display_flag_aux(row+ 0, col, "追å æ»æ :", TR_BLOWS, &f, 0); + display_flag_aux(row+ 1, col, "æ¡æ :", TR_TUNNEL, &f, 0); + display_flag_aux(row+ 2, col, "赤å¤ç·è¦å :", TR_INFRA, &f, 0); + display_flag_aux(row+ 3, col, "éæ³éå ·æ¯é :", TR_MAGIC_MASTERY, &f, 0); + display_flag_aux(row+ 4, col, "é å¯ :", TR_STEALTH, &f, 0); + display_flag_aux(row+ 5, col, "æ¢ç´¢ :", TR_SEARCH, &f, 0); + + display_flag_aux(row+ 7, col, "ä¹é¦¬ :", TR_RIDING, &f, 0); + display_flag_aux(row+ 8, col, "ææ² :", TR_THROW, &f, 0); + display_flag_aux(row+ 9, col, "ç¥ç¦ :", TR_BLESSED, &f, 0); + display_flag_aux(row+10, col, "åãã¬ãã¼ã:", TR_NO_TELE, &f, 0); + display_flag_aux(row+11, col, "åéæ³ :", TR_NO_MAGIC, &f, 0); + display_flag_aux(row+12, col, "æ¶è²»éåæ¸å°:", TR_DEC_MANA, &f, 0); + + display_flag_aux(row+14, col, "çµé¨å¤æ¸å° :", TR_DRAIN_EXP, &f, 0); + display_flag_aux(row+15, col, "ä¹±ãã¬ãã¼ã:", TR_TELEPORT, &f, 0); + display_flag_aux(row+16, col, "åæ :", TR_AGGRAVATE, &f, 0); + display_flag_aux(row+17, col, "太å¤ã®æ¨å¿µ :", TR_TY_CURSE, &f, 0); #else display_flag_aux(row+ 0, col, "Add Blows :", TR_BLOWS, &f, 0); display_flag_aux(row+ 1, col, "Add Tunnel :", TR_TUNNEL, &f, 0); @@ -3345,8 +3410,10 @@ static void display_player_other_flag_info(void) } -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ç¹æ§ãã©ã°ä¸è¦§è¡¨ç¤ºï¼a / * Special display, part 2a + * @return ãªã */ static void display_player_misc_info(void) { @@ -3355,10 +3422,10 @@ static void display_player_misc_info(void) /* Display basics */ #ifdef JP -put_str("̾Á° :", 1, 26); -put_str("ÀÊÌ :", 3, 1); -put_str("¼ï² :", 4, 1); -put_str("¿¦¶È :", 5, 1); +put_str("åå :", 1, 26); +put_str("æ§å¥ :", 3, 1); +put_str("種æ :", 4, 1); +put_str("è·æ¥ :", 5, 1); #else put_str("Name :", 1, 26); put_str("Sex :", 3, 1); @@ -3369,11 +3436,11 @@ put_str(" strcpy(tmp,ap_ptr->title); #ifdef JP if(ap_ptr->no == 1) - strcat(tmp,"¤Î"); + strcat(tmp,"ã®"); #else strcat(tmp," "); #endif - strcat(tmp,player_name); + strcat(tmp,p_ptr->name); c_put_str(TERM_L_BLUE, tmp, 1, 34); c_put_str(TERM_L_BLUE, sp_ptr->title, 3, 9); @@ -3382,9 +3449,9 @@ put_str(" /* Display extras */ #ifdef JP -put_str("¥ì¥Ù¥ë:", 6, 1); -put_str("£È£Ð :", 7, 1); -put_str("£Í£Ð :", 8, 1); +put_str("ã¬ãã«:", 6, 1); +put_str("HP :", 7, 1); +put_str("ï¼ï¼° :", 8, 1); #else put_str("Level :", 6, 1); put_str("Hits :", 7, 1); @@ -3401,9 +3468,12 @@ put_str(" } -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ç¹æ§ãã©ã°ä¸è¦§è¡¨ç¤ºï¼b / * Special display, part 2b - * + * @return ãªã + * @details + *
* How to print out the modifications and sustains. * Positive mods with no sustain will be light green. * Positive mods with a sustain will be dark green. @@ -3411,6 +3481,7 @@ put_str(" * Negative mods (from a curse) will be red. * Huge mods (>9), like from MICoMorgoth, will be a '*' * No mod, no sustain, will be a slate '.' + **/ static void display_player_stat_info(void) { @@ -3435,11 +3506,11 @@ static void display_player_stat_info(void) /* Print out the labels for the columns */ #ifdef JP -c_put_str(TERM_WHITE, "ǽÎÏ", row, stat_col+1); -c_put_str(TERM_BLUE, " ´ðËÜ", row, stat_col+7); -c_put_str(TERM_L_BLUE, " ¼ï ¿¦ À Áõ ", row, stat_col+13); -c_put_str(TERM_L_GREEN, "¹ç·×", row, stat_col+28); -c_put_str(TERM_YELLOW, "¸½ºß", row, stat_col+35); +c_put_str(TERM_WHITE, "è½å", row, stat_col+1); +c_put_str(TERM_BLUE, " åºæ¬", row, stat_col+7); +c_put_str(TERM_L_BLUE, " 種 è· æ§ è£ ", row, stat_col+13); +c_put_str(TERM_L_GREEN, "åè¨", row, stat_col+28); +c_put_str(TERM_YELLOW, "ç¾å¨", row, stat_col+35); #else c_put_str(TERM_WHITE, "Stat", row, stat_col+1); c_put_str(TERM_BLUE, " Base", row, stat_col+7); @@ -3505,11 +3576,7 @@ c_put_str(TERM_YELLOW, " cnv_stat(p_ptr->stat_max[i], buf); if (p_ptr->stat_max[i] == p_ptr->stat_max_max[i]) { -#ifdef JP - c_put_str(TERM_WHITE, "!", row + i+1, stat_col + 6); -#else - c_put_str(TERM_WHITE, "!", row + i+1, stat_col + 4); -#endif + c_put_str(TERM_WHITE, "!", row + i+1, _(stat_col + 6, stat_col + 4)); } c_put_str(TERM_BLUE, buf, row + i+1, stat_col + 13 - strlen(buf)); @@ -3540,12 +3607,7 @@ c_put_str(TERM_YELLOW, " /* Header and Footer */ c_put_str(TERM_WHITE, "abcdefghijkl@", row, col); -#ifdef JP -c_put_str(TERM_L_GREEN, "ǽÎϽ¤Àµ", row - 1, col); -#else - c_put_str(TERM_L_GREEN, "Modification", row - 1, col); -#endif - + c_put_str(TERM_L_GREEN, _("è½åä¿®æ£", "Modification"), row - 1, col); /* Process equipment */ for (i = INVEN_RARM; i < INVEN_TOTAL; i++) @@ -3706,18 +3768,22 @@ c_put_str(TERM_L_GREEN, "ǽ } -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ã¹ãã¼ã¿ã¹è¡¨ç¤ºã¡ã¤ã³å¦ç * Display the character on the screen (various modes) - * + * @param mode 表示ã¢ã¼ãID + * @return ãªã + * @details + *
* The top one and bottom two lines are left blank. - * * Mode 0 = standard display with skills * Mode 1 = standard display with history * Mode 2 = summary of various things * Mode 3 = summary of various things (part 2) * Mode 4 = mutations + **/ -void display_player(int mode) +void display_player(BIT_FLAGS mode) { int i; @@ -3739,9 +3805,9 @@ void display_player(int mode) { /* Name, Sex, Race, Class */ #ifdef JP - sprintf(tmp, "%s%s%s", ap_ptr->title, ap_ptr->no == 1 ? "¤Î":"", player_name); + sprintf(tmp, "%s%s%s", ap_ptr->title, ap_ptr->no == 1 ? "ã®":"", p_ptr->name); #else - sprintf(tmp, "%s %s", ap_ptr->title, player_name); + sprintf(tmp, "%s %s", ap_ptr->title, p_ptr->name); #endif display_player_one_line(ENTRY_NAME, tmp, TERM_L_BLUE); @@ -3762,9 +3828,9 @@ void display_player(int mode) display_player_one_line(ENTRY_PATRON, chaos_patrons[p_ptr->chaos_patron], TERM_L_BLUE); /* Age, Height, Weight, Social */ - /* ¿ÈĹ¤Ï¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¡¢ÂνŤϥ¥í¥°¥é¥à¤ËÊѹ¹¤·¤Æ¤¢¤ê¤Þ¤¹ */ + /* 身é·ã¯ã»ã³ãã¡ã¼ãã«ã«ãä½éã¯ããã°ã©ã ã«å¤æ´ãã¦ããã¾ã */ #ifdef JP - display_player_one_line(ENTRY_AGE, format("%dºÍ" ,(int)p_ptr->age), TERM_L_BLUE); + display_player_one_line(ENTRY_AGE, format("%dæ" ,(int)p_ptr->age), TERM_L_BLUE); display_player_one_line(ENTRY_HEIGHT, format("%dcm" ,(int)((p_ptr->ht*254)/100)), TERM_L_BLUE); display_player_one_line(ENTRY_WEIGHT, format("%dkg" ,(int)((p_ptr->wt*4536)/10000)), TERM_L_BLUE); display_player_one_line(ENTRY_SOCIAL, format("%d " ,(int)p_ptr->sc), TERM_L_BLUE); @@ -3822,11 +3888,7 @@ void display_player(int mode) if (p_ptr->stat_max[i] == p_ptr->stat_max_max[i]) { -#ifdef JP - c_put_str(TERM_WHITE, "!", 3 + i, 58); -#else - c_put_str(TERM_WHITE, "!", 3 + i, 58-2); -#endif + c_put_str(TERM_WHITE, "!", 3 + i, _(58, 58-2)); } } @@ -3834,12 +3896,7 @@ void display_player(int mode) if (mode == 1) { char statmsg[1000]; - -#ifdef JP - put_str("(¥¥ã¥é¥¯¥¿¡¼¤ÎÀ¸¤¤Î©¤Á)", 11, 25); -#else - put_str("(Character Background)", 11, 25); -#endif + put_str(_("(ãã£ã©ã¯ã¿ã¼ã®çãç«ã¡)", "(Character Background)"), 11, 25); for (i = 0; i < 4; i++) { @@ -3848,20 +3905,20 @@ void display_player(int mode) *statmsg = '\0'; - if (p_ptr->is_dead && p_ptr->total_winner) + if (p_ptr->is_dead) { + if (p_ptr->total_winner) + { #ifdef JP - strcpy(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¾¡Íø¤Î¸å°úÂष¤¿¡£"); + sprintf(statmsg, "â¦ããªãã¯åå©ã®å¾%sããã", streq(p_ptr->died_from, "Seppuku") ? "åè ¹" : "å¼é"); #else - strcpy(statmsg, "...You retired from the adventure after the winning."); + sprintf(statmsg, "...You %s after the winning.", streq(p_ptr->died_from, "Seppuku") ? "did Seppuku" : "retired from the adventure"); #endif - } - else if (p_ptr->is_dead) - { - if (!dun_level) + } + else if (!dun_level) { #ifdef JP - sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï%s¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", map_name(), p_ptr->died_from); + sprintf(statmsg, "â¦ããªãã¯%sã§%sã«æ®ºãããã", map_name(), p_ptr->died_from); #else sprintf(statmsg, "...You were killed by %s in %s.", p_ptr->died_from, map_name()); #endif @@ -3870,12 +3927,12 @@ void display_player(int mode) { /* Get the quest text */ /* Bewere that INIT_ASSIGN resets the cur_num. */ - init_flags = INIT_ASSIGN; + init_flags = INIT_NAME_ONLY; process_dungeon_file("q_info.txt", 0, 0, 0, 0); #ifdef JP - sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢¥¯¥¨¥¹¥È¡Ö%s¡×¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", quest[p_ptr->inside_quest].name, p_ptr->died_from); + sprintf(statmsg, "â¦ããªãã¯ãã¯ã¨ã¹ãã%sãã§%sã«æ®ºãããã", quest[p_ptr->inside_quest].name, p_ptr->died_from); #else sprintf(statmsg, "...You were killed by %s in the quest '%s'.", p_ptr->died_from, quest[p_ptr->inside_quest].name); #endif @@ -3883,7 +3940,7 @@ void display_player(int mode) else { #ifdef JP - sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¡¢%s¤Î%d³¬¤Ç%s¤Ë»¦¤µ¤ì¤¿¡£", map_name(), dun_level, p_ptr->died_from); + sprintf(statmsg, "â¦ããªãã¯ã%sã®%déã§%sã«æ®ºãããã", map_name(), (int)dun_level, p_ptr->died_from); #else sprintf(statmsg, "...You were killed by %s on level %d of %s.", p_ptr->died_from, dun_level, map_name()); #endif @@ -3893,11 +3950,7 @@ void display_player(int mode) { if (!dun_level) { -#ifdef JP - sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¸½ºß¡¢ %s ¤Ë¤¤¤ë¡£", map_name()); -#else - sprintf(statmsg, "...Now, you are in %s.", map_name()); -#endif + sprintf(statmsg, _("â¦ããªãã¯ç¾å¨ã %s ã«ããã", "...Now, you are in %s."), map_name()); } else if (p_ptr->inside_quest && is_fixed_quest_idx(p_ptr->inside_quest)) { @@ -3910,20 +3963,16 @@ void display_player(int mode) quest_text_line = 0; /* Get the quest text */ - init_flags = INIT_SHOW_TEXT; + init_flags = INIT_NAME_ONLY; process_dungeon_file("q_info.txt", 0, 0, 0, 0); -#ifdef JP - sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¸½ºß¡¢ ¥¯¥¨¥¹¥È¡Ö%s¡×¤ò¿ë¹ÔÃæ¤À¡£", quest[p_ptr->inside_quest].name); -#else - sprintf(statmsg, "...Now, you are in the quest '%s'.", quest[p_ptr->inside_quest].name); -#endif + sprintf(statmsg, _("â¦ããªãã¯ç¾å¨ã ã¯ã¨ã¹ãã%sããéè¡ä¸ã ã", "...Now, you are in the quest '%s'."), quest[p_ptr->inside_quest].name); } else { #ifdef JP - sprintf(statmsg, "¡Ä¤¢¤Ê¤¿¤Ï¸½ºß¡¢ %s ¤Î %d ³¬¤Çõº÷¤·¤Æ¤¤¤ë¡£", map_name(), dun_level); + sprintf(statmsg, "â¦ããªãã¯ç¾å¨ã %s ã® %d éã§æ¢ç´¢ãã¦ããã", map_name(), (int)dun_level); #else sprintf(statmsg, "...Now, you are exploring level %d of %s.", dun_level, map_name()); #endif @@ -3980,13 +4029,14 @@ void display_player(int mode) } } - -/* - * +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ã¹ãã¼ã¿ã¹è¡¨ç¤ºããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_display_player(FILE *fff) { - int x, y, i; + int x, y; byte a; char c; char buf[1024]; @@ -4014,12 +4064,7 @@ static void dump_aux_display_player(FILE *fff) while ((x > 0) && (buf[x-1] == ' ')) buf[--x] = '\0'; /* End the row */ -#ifdef JP - fprintf(fff, "%s\n", buf); -#else - fprintf(fff, "%s\n", buf); -#endif - + fprintf(fff, _("%s\n", "%s\n"), buf); } /* Display history */ @@ -4110,21 +4155,20 @@ static void dump_aux_display_player(FILE *fff) fprintf(fff, "%s\n", buf); } - for (i = 0; (unsigned int) i < (p_ptr->count / 80); i++) - fprintf(fff, " "); fprintf(fff, "\n"); - for (i = 0; (unsigned int) i < (p_ptr->count % 80); i++) - fprintf(fff, " "); } -/* - * +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ãããæ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_pet(FILE *fff) { int i; bool pet = FALSE; + bool pet_settings = FALSE; char pet_name[80]; for (i = m_max - 1; i >= 1; i--) @@ -4133,26 +4177,48 @@ static void dump_aux_pet(FILE *fff) if (!m_ptr->r_idx) continue; if (!is_pet(m_ptr)) continue; + pet_settings = TRUE; if (!m_ptr->nickname && (p_ptr->riding != i)) continue; if (!pet) { -#ifdef JP - fprintf(fff, "\n [¼ç¤Ê¥Ú¥Ã¥È]\n\n"); -#else - fprintf(fff, "\n [leading pets]\n\n"); -#endif + fprintf(fff, _("\n\n [主ãªããã]\n\n", "\n\n [Leading Pets]\n\n")); pet = TRUE; } monster_desc(pet_name, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE); fprintf(fff, "%s\n", pet_name); } - if (pet) fprintf(fff, "\n"); + if (pet_settings) + { + fprintf(fff, _("\n\n [ãããã¸ã®å½ä»¤]\n", "\n\n [Command for Pets]\n")); + + fprintf(fff, _("\n ãã¢ãéãã: %s", "\n Pets open doors: %s"), + (p_ptr->pet_extra_flags & PF_OPEN_DOORS) ? "ON" : "OFF"); + + fprintf(fff, _("\n ã¢ã¤ãã ãæ¾ã: %s", "\n Pets pick up items: %s"), + (p_ptr->pet_extra_flags & PF_PICKUP_ITEMS) ? "ON" : "OFF"); + + fprintf(fff, _("\n ãã¬ãã¼ãç³»éæ³ã使ã: %s", "\n Allow teleport: %s"), + (p_ptr->pet_extra_flags & PF_TELEPORT) ? "ON" : "OFF"); + + fprintf(fff, _("\n æ»æéæ³ã使ã: %s", "\n Allow cast attack spell: %s"), + (p_ptr->pet_extra_flags & PF_ATTACK_SPELL) ? "ON" : "OFF"); + + fprintf(fff, _("\n å¬åéæ³ã使ã: %s", "\n Allow cast summon spell: %s"), + (p_ptr->pet_extra_flags & PF_SUMMON_SPELL) ? "ON" : "OFF"); + + fprintf(fff, _("\n ãã¬ã¤ã¤ã¼ãå·»ãè¾¼ãç¯å²éæ³ã使ã: %s", "\n Allow involve player in area spell: %s"), + (p_ptr->pet_extra_flags & PF_BALL_SPELL) ? "ON" : "OFF"); + + fputc('\n', fff); + } } -/* - * +/*! + * @brief ãã¬ã¤ã¤ã¼ã®è·æ¥è½åæ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_class_special(FILE *fff) { @@ -4171,12 +4237,7 @@ static void dump_aux_class_special(FILE *fff) for (i=0;i<60;i++) { p[i][0] = '\0'; } -#ifdef JP - strcat(p[col], "\n [³Ø½¬ºÑ¤ß¤ÎÀÄËâË¡]\n"); -#else - strcat(p[col], "\n [Learned blue magic]\n"); -#endif - + strcat(p[col], _("\n\n [å¦ç¿æ¸ã¿ã®ééæ³]\n", "\n\n [Learned Blue Magic]\n")); for (j=1;j<6;j++) { @@ -4185,43 +4246,23 @@ static void dump_aux_class_special(FILE *fff) switch(j) { case MONSPELL_TYPE_BOLT: -#ifdef JP - strcat(p[col], "\n [¥Ü¥ë¥È·¿]\n"); -#else - strcat(p[col], "\n [Bolt type]\n"); -#endif + strcat(p[col], _("\n [ãã«ãå]\n", "\n [Bolt Type]\n")); break; case MONSPELL_TYPE_BALL: -#ifdef JP - strcat(p[col], "\n [¥Ü¡¼¥ë·¿]\n"); -#else - strcat(p[col], "\n [Ball type]\n"); -#endif + strcat(p[col], _("\n [ãã¼ã«å]\n", "\n [Ball Type]\n")); break; case MONSPELL_TYPE_BREATH: -#ifdef JP - strcat(p[col], "\n [¥Ö¥ì¥¹·¿]\n"); -#else - strcat(p[col], "\n [ Breath ]\n"); -#endif + strcat(p[col], _("\n [ãã¬ã¹å]\n", "\n [ Breath ]\n")); break; case MONSPELL_TYPE_SUMMON: -#ifdef JP - strcat(p[col], "\n [¾¤´ËâË¡]\n"); -#else - strcat(p[col], "\n [Summonning]\n"); -#endif + strcat(p[col], _("\n [å¬åéæ³]\n", "\n [Summonning]\n")); break; case MONSPELL_TYPE_OTHER: -#ifdef JP - strcat(p[col], "\n [ ¤½¤Î¾ ]\n"); -#else - strcat(p[col], "\n [Other type]\n"); -#endif + strcat(p[col], _("\n [ ãã®ä» ]\n", "\n [Other Type]\n")); break; } @@ -4263,11 +4304,7 @@ static void dump_aux_class_special(FILE *fff) if (!pcol) { -#ifdef JP - strcat(p[col], "¤Ê¤·"); -#else - strcat(p[col], "None"); -#endif + strcat(p[col], _("ãªã", "None")); } else { @@ -4286,50 +4323,141 @@ static void dump_aux_class_special(FILE *fff) for (i=0;i<=col;i++) { - fprintf(fff, p[i]); + fputs(p[i], fff); + } + } + else if (p_ptr->pclass == CLASS_MAGIC_EATER) + { + char s[EATER_EXT][MAX_NLEN]; + OBJECT_TYPE_VALUE tval; + int ext; + IDX k_idx; + OBJECT_SUBTYPE_VALUE i; + int magic_num; + + fprintf(fff, _("\n\n [åãè¾¼ãã éæ³éå ·]\n", "\n\n [Magic devices eaten]\n")); + + for (ext = 0; ext < 3; ext++) + { + int eat_num = 0; + + /* Dump an extent name */ + switch (ext) + { + case 0: + tval = TV_STAFF; + fprintf(fff, _("\n[æ]\n", "\n[Staffs]\n")); + break; + case 1: + tval = TV_WAND; + fprintf(fff, _("\n[éæ³æ£]\n", "\n[Wands]\n")); + break; + case 2: + tval = TV_ROD; + fprintf(fff, _("\n[ããã]\n", "\n[Rods]\n")); + break; + } + + /* Get magic device names that were eaten */ + for (i = 0; i < EATER_EXT; i++) + { + int idx = EATER_EXT * ext + i; + + magic_num = p_ptr->magic_num2[idx]; + if (!magic_num) continue; + + k_idx = lookup_kind(tval, i); + if (!k_idx) continue; + sprintf(s[eat_num], "%23s (%2d)", (k_name + k_info[k_idx].name), magic_num); + eat_num++; + } + + /* Dump magic devices in this extent */ + if (eat_num > 0) + { + for (i = 0; i < eat_num; i++) + { + fputs(s[i], fff); + if (i % 3 < 2) fputs(" ", fff); + else fputs("\n", fff); + } + + if (i % 3 > 0) fputs("\n", fff); + } + else /* Not found */ + { + fputs(_(" (ãªã)\n", " (none)\n"), fff); + } + } + } + else if (p_ptr->pclass == CLASS_SMITH) + { + int i, id[250], n = 0, row; + + fprintf(fff, _("\n\n [æã«å ¥ããã¨ãã»ã³ã¹]\n\n", "\n\n [Get Essence]\n\n")); + fprintf(fff, _("ã¨ãã»ã³ã¹ åæ° ã¨ãã»ã³ã¹ åæ° ã¨ãã»ã³ã¹ åæ°", + "Essence Num Essence Num Essence Num ")); + for (i = 0; essence_name[i]; i++) + { + if (!essence_name[i][0]) continue; + id[n] = i; + n++; + } + + row = n / 3 + 1; + + for (i = 0; i < row; i++) + { + fprintf(fff, "\n"); + fprintf(fff, "%-11s %5d ", essence_name[id[i]], (int)p_ptr->magic_num1[id[i]]); + if(i + row < n) fprintf(fff, "%-11s %5d ", essence_name[id[i + row]], (int)p_ptr->magic_num1[id[i + row]]); + if(i + row * 2 < n) fprintf(fff, "%-11s %5d", essence_name[id[i + row * 2]], (int)p_ptr->magic_num1[id[i + row * 2]]); } + + fputs("\n", fff); + } } -/* - * +/*! + * @brief ã¯ã¨ã¹ãæ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_quest(FILE *fff) { - int i; - int *quest_num; + IDX i; + IDX *quest_num; int dummy; - -#ifdef JP - fprintf(fff, "\n\n [¥¯¥¨¥¹¥È¾ðÊó]\n"); -#else - fprintf(fff, "\n\n [Quest information]\n"); -#endif + fprintf(fff, _("\n\n [ã¯ã¨ã¹ãæ å ±]\n", "\n\n [Quest Information]\n")); /* Allocate Memory */ - C_MAKE(quest_num, max_quests, int); + C_MAKE(quest_num, max_q_idx, IDX); /* Sort by compete level */ - for (i = 1; i < max_quests; i++) quest_num[i] = i; + for (i = 1; i < max_q_idx; i++) quest_num[i] = i; ang_sort_comp = ang_sort_comp_quest_num; ang_sort_swap = ang_sort_swap_quest_num; - ang_sort(quest_num, &dummy, max_quests); + ang_sort(quest_num, &dummy, max_q_idx); /* Dump Quest Information */ fputc('\n', fff); do_cmd_knowledge_quests_completed(fff, quest_num); fputc('\n', fff); do_cmd_knowledge_quests_failed(fff, quest_num); + fputc('\n', fff); /* Free Memory */ - C_KILL(quest_num, max_quests, int); + C_KILL(quest_num, max_q_idx, IDX); } -/* - * +/*! + * @brief æ»ã®ç´åã¡ãã»ã¼ã¸ä¸¦ã³ã«éºè¨ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_last_message(FILE *fff) { @@ -4339,44 +4467,33 @@ static void dump_aux_last_message(FILE *fff) { int i; -#ifdef JP - fprintf(fff, "\n [»à¤ÌľÁ°¤Î¥á¥Ã¥»¡¼¥¸]\n\n"); -#else - fprintf(fff, "\n [Last messages]\n\n"); -#endif + fprintf(fff, _("\n [æ»ã¬ç´åã®ã¡ãã»ã¼ã¸]\n\n", "\n [Last Messages]\n\n")); for (i = MIN(message_num(), 30); i >= 0; i--) { fprintf(fff,"> %s\n",message_str((s16b)i)); } - fprintf(fff, "\n"); + fputc('\n', fff); } /* Hack -- *Winning* message */ else if (p_ptr->last_message) { -#ifdef JP - fprintf(fff, "\n [*¾¡Íø*¥á¥Ã¥»¡¼¥¸]\n\n"); -#else - fprintf(fff, "\n [*Winning* message]\n\n"); -#endif + fprintf(fff, _("\n [*åå©*ã¡ãã»ã¼ã¸]\n\n", "\n [*Winning* Message]\n\n")); fprintf(fff," %s\n", p_ptr->last_message); + fputc('\n', fff); } } } - -/* - * +/*! + * @brief 帰éå ´ææ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_recall(FILE *fff) { int y; - -#ifdef JP - fprintf(fff, "\n\n [µ¢´Ô¾ì½ê]\n\n"); -#else - fprintf(fff, "\n\n [Recall Depth]\n\n"); -#endif + fprintf(fff, _("\n [帰éå ´æ]\n\n", "\n [Recall Depth]\n\n")); for (y = 1; y < max_d_idx; y++) { @@ -4390,155 +4507,76 @@ static void dump_aux_recall(FILE *fff) } else if (max_dlv[y] == d_info[y].maxdepth) seiha = TRUE; -#ifdef JP - fprintf(fff, " %c%-12s: %3d ³¬\n", seiha ? '!' : ' ', d_name+d_info[y].name, max_dlv[y]); -#else - fprintf(fff, " %c%-16s: level %3d\n", seiha ? '!' : ' ', d_name+d_info[y].name, max_dlv[y]); -#endif + fprintf(fff, _(" %c%-12s: %3d é\n", " %c%-16s: level %3d\n"), + seiha ? '!' : ' ', d_name+d_info[y].name, (int)max_dlv[y]); } } -/* - * +/*! + * @brief ãªãã·ã§ã³æ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_options(FILE *fff) { -#ifdef JP - fprintf(fff, "\n [¥ª¥×¥·¥ç¥óÀßÄê]\n"); -#else - fprintf(fff, "\n [Option settings]\n"); -#endif - + fprintf(fff, _("\n [ãªãã·ã§ã³è¨å®]\n", "\n [Option Settings]\n")); if (preserve_mode) -#ifdef JP - fprintf(fff, "\n Êݸ¥â¡¼¥É: ON"); -#else - fprintf(fff, "\n Preserve Mode: ON"); -#endif + fprintf(fff, _("\n ä¿åã¢ã¼ã: ON", "\n Preserve Mode: ON")); else -#ifdef JP - fprintf(fff, "\n Êݸ¥â¡¼¥É: OFF"); -#else - fprintf(fff, "\n Preserve Mode: OFF"); -#endif - + fprintf(fff, _("\n ä¿åã¢ã¼ã: OFF", "\n Preserve Mode: OFF")); if (ironman_small_levels) -#ifdef JP - fprintf(fff, "\n ¾®¤µ¤¤¥À¥ó¥¸¥ç¥ó: ALWAYS"); -#else - fprintf(fff, "\n Small Levels: ALWAYS"); -#endif - + fprintf(fff, _("\n å°ãããã³ã¸ã§ã³: ALWAYS", "\n Small Levels: ALWAYS")); else if (always_small_levels) -#ifdef JP - fprintf(fff, "\n ¾®¤µ¤¤¥À¥ó¥¸¥ç¥ó: ON"); -#else - fprintf(fff, "\n Small Levels: ON"); -#endif - + fprintf(fff, _("\n å°ãããã³ã¸ã§ã³: ON", "\n Small Levels: ON")); else if (small_levels) -#ifdef JP - fprintf(fff, "\n ¾®¤µ¤¤¥À¥ó¥¸¥ç¥ó: ENABLED"); -#else - fprintf(fff, "\n Small Levels: ENABLED"); -#endif - + fprintf(fff, _("\n å°ãããã³ã¸ã§ã³: ENABLED", "\n Small Levels: ENABLED")); else -#ifdef JP - fprintf(fff, "\n ¾®¤µ¤¤¥À¥ó¥¸¥ç¥ó: OFF"); -#else - fprintf(fff, "\n Small Levels: OFF"); -#endif + fprintf(fff, _("\n å°ãããã³ã¸ã§ã³: OFF", "\n Small Levels: OFF")); if (vanilla_town) -#ifdef JP - fprintf(fff, "\n ¸µÁĤÎÄ®¤Î¤ß: ON"); -#else - fprintf(fff, "\n Vanilla Town: ON"); -#endif - + fprintf(fff, _("\n å ç¥ã®çºã®ã¿: ON", "\n Vanilla Town: ON")); else if (lite_town) -#ifdef JP - fprintf(fff, "\n ¾®µ¬ÌϤÊÄ®: ON"); -#else - fprintf(fff, "\n Lite Town: ON"); -#endif + fprintf(fff, _("\n å°è¦æ¨¡ãªçº: ON", "\n Lite Town: ON")); if (ironman_shops) -#ifdef JP - fprintf(fff, "\n Ź¤Ê¤·: ON"); -#else - fprintf(fff, "\n No Shops: ON"); -#endif - + fprintf(fff, _("\n åºãªã: ON", "\n No Shops: ON")); if (ironman_downward) -#ifdef JP - fprintf(fff, "\n ³¬Ãʤò¾å¤¬¤ì¤Ê¤¤: ON"); -#else - fprintf(fff, "\n Diving Only: ON"); -#endif - + fprintf(fff, _("\n é段ãä¸ãããªã: ON", "\n Diving Only: ON")); if (ironman_rooms) -#ifdef JP - fprintf(fff, "\n ÉáÄ̤Ǥʤ¤Éô²°: ON"); -#else - fprintf(fff, "\n Unusual Rooms: ON"); -#endif - + fprintf(fff, _("\n æ®éã§ãªãé¨å±: ON", "\n Unusual Rooms: ON")); if (ironman_nightmare) -#ifdef JP - fprintf(fff, "\n °Ì´¥â¡¼¥É: ON"); -#else - fprintf(fff, "\n Nightmare Mode: ON"); -#endif + fprintf(fff, _("\n æªå¤¢ã¢ã¼ã: ON", "\n Nightmare Mode: ON")); if (ironman_empty_levels) -#ifdef JP - fprintf(fff, "\n ¥¢¥ê¡¼¥Ê: ALWAYS"); -#else - fprintf(fff, "\n Arena Levels: ALWAYS"); -#endif - + fprintf(fff, _("\n ã¢ãªã¼ã: ALWAYS", "\n Arena Levels: ALWAYS")); else if (empty_levels) -#ifdef JP - fprintf(fff, "\n ¥¢¥ê¡¼¥Ê: ENABLED"); -#else - fprintf(fff, "\n Arena Levels: ENABLED"); -#endif - + fprintf(fff, _("\n ã¢ãªã¼ã: ENABLED", "\n Arena Levels: ENABLED")); else -#ifdef JP - fprintf(fff, "\n ¥¢¥ê¡¼¥Ê: OFF"); -#else - fprintf(fff, "\n Arena Levels: OFF"); -#endif - + fprintf(fff, _("\n ã¢ãªã¼ã: OFF", "\n Arena Levels: OFF")); - fprintf(fff,"\n"); + fputc('\n', fff); if (p_ptr->noscore) -#ifdef JP - fprintf(fff, "\n ²¿¤«ÉÔÀµ¤Ê¤³¤È¤ò¤·¤Æ¤·¤Þ¤Ã¤Æ¤¤¤Þ¤¹¡£"); -#else - fprintf(fff, "\n You have done something illegal."); -#endif + fprintf(fff, _("\n ä½ãä¸æ£ãªãã¨ããã¦ãã¾ã£ã¦ãã¾ãã\n", "\n You have done something illegal.\n")); - fprintf(fff,"\n"); + fputc('\n', fff); } -/* - * +/*! + * @brief éæå ´ã®æ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_arena(FILE *fff) { @@ -4548,16 +4586,12 @@ static void dump_aux_arena(FILE *fff) { if (p_ptr->arena_number <= ARENA_DEFEATED_OLD_VER) { -#ifdef JP - fprintf(fff, "\n Æ®µ»¾ì: ÇÔËÌ\n"); -#else - fprintf(fff, "\n Arena: Defeated\n"); -#endif + fprintf(fff, _("\n éæå ´: æå\n", "\n Arena: Defeated\n")); } else { #ifdef JP - fprintf(fff, "\n Æ®µ»¾ì: %d²óÀï¤Ç%s¤ÎÁ°¤ËÇÔËÌ\n", -p_ptr->arena_number, + fprintf(fff, "\n éæå ´: %dåæ¦ã§%sã®åã«æå\n", -p_ptr->arena_number, r_name + r_info[arena_info[-1 - p_ptr->arena_number].r_idx].name); #else fprintf(fff, "\n Arena: Defeated by %s in the %d%s fight\n", @@ -4568,24 +4602,16 @@ static void dump_aux_arena(FILE *fff) } else if (p_ptr->arena_number > MAX_ARENA_MONS + 2) { -#ifdef JP - fprintf(fff, "\n Æ®µ»¾ì: ¿¿¤Î¥Á¥ã¥ó¥Ô¥ª¥ó\n"); -#else - fprintf(fff, "\n Arena: True Champion\n"); -#endif + fprintf(fff, _("\n éæå ´: çã®ãã£ã³ããªã³\n", "\n Arena: True Champion\n")); } else if (p_ptr->arena_number > MAX_ARENA_MONS - 1) { -#ifdef JP - fprintf(fff, "\n Æ®µ»¾ì: ¥Á¥ã¥ó¥Ô¥ª¥ó\n"); -#else - fprintf(fff, "\n Arena: Champion\n"); -#endif + fprintf(fff, _("\n éæå ´: ãã£ã³ããªã³\n", "\n Arena: Champion\n")); } else { #ifdef JP - fprintf(fff, "\n Æ®µ»¾ì: %2d¾¡\n", (p_ptr->arena_number > MAX_ARENA_MONS ? MAX_ARENA_MONS : p_ptr->arena_number)); + fprintf(fff, "\n éæå ´: %2då\n", (p_ptr->arena_number > MAX_ARENA_MONS ? MAX_ARENA_MONS : p_ptr->arena_number)); #else fprintf(fff, "\n Arena: %2d Victor%s\n", (p_ptr->arena_number > MAX_ARENA_MONS ? MAX_ARENA_MONS : p_ptr->arena_number), (p_ptr->arena_number > 1) ? "ies" : "y"); #endif @@ -4595,26 +4621,24 @@ static void dump_aux_arena(FILE *fff) } -/* - * +/*! + * @brief æç ´ã¢ã³ã¹ã¿ã¼ã®æ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_monsters(FILE *fff) { /* Monsters slain */ - int k; - unsigned long uniq_total = 0; - unsigned long norm_total = 0; - s16b *who; + IDX k; + long uniq_total = 0; + long norm_total = 0; + IDX *who; /* Sort by monster level */ u16b why = 2; -#ifdef JP - fprintf(fff, "\n [Åݤ·¤¿¥â¥ó¥¹¥¿¡¼]\n\n"); -#else - fprintf(fff, "\n [Defeated monsters]\n\n"); -#endif + fprintf(fff, _("\n [åããã¢ã³ã¹ã¿ã¼]\n\n", "\n [Defeated Monsters]\n\n")); /* Allocate the "who" array */ C_MAKE(who, max_r_idx, s16b); @@ -4654,20 +4678,16 @@ static void dump_aux_monsters(FILE *fff) /* No monsters is defeated */ if (norm_total < 1) { -#ifdef JP - fprintf(fff,"¤Þ¤ÀŨ¤òÅݤ·¤Æ¤¤¤Þ¤»¤ó¡£\n"); -#else - fprintf(fff,"You have defeated no enemies yet.\n"); -#endif + fprintf(fff,_("ã¾ã æµãåãã¦ãã¾ããã\n", "You have defeated no enemies yet.\n")); } /* Defeated more than one normal monsters */ else if (uniq_total == 0) { #ifdef JP - fprintf(fff,"%luÂΤÎŨ¤òÅݤ·¤Æ¤¤¤Þ¤¹¡£\n", norm_total); + fprintf(fff,"%ldä½ã®æµãåãã¦ãã¾ãã\n", norm_total); #else - fprintf(fff,"You have defeated %lu %s.\n", norm_total, norm_total == 1 ? "enemy" : "enemies"); + fprintf(fff,"You have defeated %ld %s.\n", norm_total, norm_total == 1 ? "enemy" : "enemies"); #endif } @@ -4675,9 +4695,9 @@ static void dump_aux_monsters(FILE *fff) else /* if (uniq_total > 0) */ { #ifdef JP - fprintf(fff, "%luÂΤΥæ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤ò´Þ¤à¡¢¹ç·×%luÂΤÎŨ¤òÅݤ·¤Æ¤¤¤Þ¤¹¡£\n", uniq_total, norm_total); + fprintf(fff, "%ldä½ã®ã¦ãã¼ã¯ã»ã¢ã³ã¹ã¿ã¼ãå«ããåè¨%ldä½ã®æµãåãã¦ãã¾ãã\n", uniq_total, norm_total); #else - fprintf(fff, "You have defeated %lu %s including %lu unique monster%s in total.\n", norm_total, norm_total == 1 ? "enemy" : "enemies", uniq_total, (uniq_total == 1 ? "" : "s")); + fprintf(fff, "You have defeated %ld %s including %ld unique monster%s in total.\n", norm_total, norm_total == 1 ? "enemy" : "enemies", uniq_total, (uniq_total == 1 ? "" : "s")); #endif @@ -4687,23 +4707,13 @@ static void dump_aux_monsters(FILE *fff) /* Sort the array by dungeon depth of monsters */ ang_sort(who, &why, uniq_total); - -#ifdef JP - fprintf(fff, "\n¡Ô¾å°Ì%luÂΤΥæ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¡Õ\n", MIN(uniq_total, 10)); -#else - fprintf(fff, "\n< Unique monsters top %lu >\n", MIN(uniq_total, 10)); -#endif + fprintf(fff, _("\nãä¸ä½%ldä½ã®ã¦ãã¼ã¯ã»ã¢ã³ã¹ã¿ã¼ã\n", "\n< Unique monsters top %ld >\n"), MIN(uniq_total, 10)); /* Print top 10 */ for (k = uniq_total - 1; k >= 0 && k >= uniq_total - 10; k--) { monster_race *r_ptr = &r_info[who[k]]; - -#ifdef JP - fprintf(fff, " %-40s (¥ì¥Ù¥ë%3d)\n", (r_name + r_ptr->name), r_ptr->level); -#else - fprintf(fff, " %-40s (level %3d)\n", (r_name + r_ptr->name), r_ptr->level); -#endif + fprintf(fff, _(" %-40s (ã¬ãã«%3d)\n", " %-40s (level %3d)\n"), (r_name + r_ptr->name), (int)r_ptr->level); } } @@ -4713,8 +4723,10 @@ static void dump_aux_monsters(FILE *fff) } -/* - * +/*! + * @brief å 種ææ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_race_history(FILE *fff) { @@ -4722,11 +4734,7 @@ static void dump_aux_race_history(FILE *fff) { int i; -#ifdef JP - fprintf(fff, "\n\n ¤¢¤Ê¤¿¤Ï%s¤È¤·¤ÆÀ¸¤Þ¤ì¤¿¡£", race_info[p_ptr->start_race].title); -#else - fprintf(fff, "\n\n You were born as %s.", race_info[p_ptr->start_race].title); -#endif + fprintf(fff, _("\n\n ããªãã¯%sã¨ãã¦çã¾ããã", "\n\n You were born as %s."), race_info[p_ptr->start_race].title); for (i = 0; i < MAX_RACES; i++) { if (p_ptr->start_race == i) continue; @@ -4738,18 +4746,18 @@ static void dump_aux_race_history(FILE *fff) { if (!(p_ptr->old_race2 & 1L << (i-32))) continue; } -#ifdef JP - fprintf(fff, "\n ¤¢¤Ê¤¿¤Ï¤«¤Ä¤Æ%s¤À¤Ã¤¿¡£", race_info[i].title); -#else - fprintf(fff, "\n You were a %s before.", race_info[i].title); -#endif + fprintf(fff, _("\n ããªãã¯ãã¤ã¦%sã ã£ãã", "\n You were a %s before."), race_info[i].title); } + + fputc('\n', fff); } } -/* - * +/*! + * @brief å éæ³é åæ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_realm_history(FILE *fff) { @@ -4757,64 +4765,72 @@ static void dump_aux_realm_history(FILE *fff) { int i; + fputc('\n', fff); for (i = 0; i < MAX_MAGIC; i++) { if (!(p_ptr->old_realm & 1L << i)) continue; -#ifdef JP - fprintf(fff, "\n ¤¢¤Ê¤¿¤Ï¤«¤Ä¤Æ%sËâË¡¤ò»È¤¨¤¿¡£", realm_names[i+1]); -#else - fprintf(fff, "\n You were able to use %s magic before.", realm_names[i+1]); -#endif + fprintf(fff, _("\n ããªãã¯ãã¤ã¦%séæ³ã使ããã", "\n You were able to use %s magic before."), realm_names[i+1]); } + fputc('\n', fff); } } -/* - * +/*! + * @brief å¾³ã®æ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_virtues(FILE *fff) { -#ifdef JP - fprintf(fff, "\n\n [¥×¥ì¥¤¥ä¡¼¤ÎÆÁ]\n\n"); -#else - fprintf(fff, "\n\n [Virtues]\n\n"); -#endif + int v_nr, percent; + + fprintf(fff, _("\n\n [èªåã«é¢ããæ å ±]\n\n", "\n\n [HP-rate & Max stat & Virtues]\n\n")); + + percent = (int)(((long)p_ptr->player_hp[PY_MAX_LEVEL - 1] * 200L) / + (2 * p_ptr->hitdie + + ((PY_MAX_LEVEL - 1+3) * (p_ptr->hitdie + 1)))); #ifdef JP - fprintf(fff, "°À : %s\n", your_alignment()); + if (p_ptr->knowledge & KNOW_HPRATE) fprintf(fff, "ç¾å¨ã®ä½åã©ã³ã¯ : %d/100\n\n", percent); + else fprintf(fff, "ç¾å¨ã®ä½åã©ã³ã¯ : ???\n\n"); + fprintf(fff, "è½åã®æ大å¤\n"); #else - fprintf(fff, "Your alighnment : %s\n", your_alignment()); + if (p_ptr->knowledge & KNOW_HPRATE) fprintf(fff, "Your current Life Rating is %d/100.\n\n", percent); + else fprintf(fff, "Your current Life Rating is ???.\n\n"); + fprintf(fff, "Limits of maximum stats\n"); #endif + for (v_nr = 0; v_nr < 6; v_nr++) + { + if ((p_ptr->knowledge & KNOW_STAT) || p_ptr->stat_max[v_nr] == p_ptr->stat_max_max[v_nr]) fprintf(fff, "%s 18/%d\n", stat_names[v_nr], p_ptr->stat_max_max[v_nr]-18); + else fprintf(fff, "%s ???\n", stat_names[v_nr]); + } + fprintf(fff, _("\nå±æ§ : %s\n", "\nYour alighnment : %s\n"), your_alignment()); fprintf(fff, "\n"); dump_virtues(fff); } -/* - * +/*! + * @brief çªç¶å¤ç°ã®æ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_mutations(FILE *fff) { if (p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3) { -#ifdef JP - fprintf(fff, "\n\n [ÆÍÁ³ÊÑ°Û]\n\n"); -#else - fprintf(fff, "\n\n [Mutations]\n\n"); -#endif - + fprintf(fff, _("\n\n [çªç¶å¤ç°]\n\n", "\n\n [Mutations]\n\n")); dump_mutations(fff); } - - /* Skip some lines */ - fprintf(fff, "\n\n"); } -/* - * +/*! + * @brief ææåã®æ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_equipment_inventory(FILE *fff) { @@ -4824,21 +4840,12 @@ static void dump_aux_equipment_inventory(FILE *fff) /* Dump the equipment */ if (equip_cnt) { -#ifdef JP - fprintf(fff, " [¥¥ã¥é¥¯¥¿¤ÎÁõÈ÷]\n\n"); -#else - fprintf(fff, " [Character Equipment]\n\n"); -#endif - + fprintf(fff, _(" [ãã£ã©ã¯ã¿ã®è£ å]\n\n", " [Character Equipment]\n\n")); for (i = INVEN_RARM; i < INVEN_TOTAL; i++) { object_desc(o_name, &inventory[i], 0); - if ((i == INVEN_LARM) && p_ptr->ryoute) -#ifdef JP - strcpy(o_name, "(Éð´ï¤òξ¼ê»ý¤Á)"); -#else - strcpy(o_name, "(wielding with two-hands)"); -#endif + if ((((i == INVEN_RARM) && p_ptr->hidarite) || ((i == INVEN_LARM) && p_ptr->migite)) && p_ptr->ryoute) + strcpy(o_name, _("(æ¦å¨ã両ææã¡)", "(wielding with two-hands)")); fprintf(fff, "%c) %s\n", index_to_label(i), o_name); @@ -4847,11 +4854,7 @@ static void dump_aux_equipment_inventory(FILE *fff) } /* Dump the inventory */ -#ifdef JP - fprintf(fff, " [¥¥ã¥é¥¯¥¿¤Î»ý¤Áʪ]\n\n"); -#else - fprintf(fff, " [Character Inventory]\n\n"); -#endif + fprintf(fff, _(" [ãã£ã©ã¯ã¿ã®æã¡ç©]\n\n", " [Character Inventory]\n\n")); for (i = 0; i < INVEN_PACK; i++) { @@ -4868,8 +4871,10 @@ static void dump_aux_equipment_inventory(FILE *fff) } -/* - * +/*! + * @brief æã家ã¨åç©é¤¨ã®ãªãã¸ã§ã¯ãæ å ±ããã¡ã¤ã«ã«ãã³ããã + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ãªã */ static void dump_aux_home_museum(FILE *fff) { @@ -4888,21 +4893,13 @@ static void dump_aux_home_museum(FILE *fff) int i; int x = 1; -#ifdef JP - fprintf(fff, " [²æ¤¬²È¤Î¥¢¥¤¥Æ¥à]\n"); -#else - fprintf(fff, " [Home Inventory]\n"); -#endif + fprintf(fff, _(" [æã家ã®ã¢ã¤ãã ]\n", " [Home Inventory]\n")); /* Dump all available items */ for (i = 0; i < st_ptr->stock_num; i++) { if ((i % 12) == 0) -#ifdef JP - fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++); -#else - fprintf(fff, "\n ( page %d )\n", x++); -#endif + fprintf(fff, _("\n ( %d ãã¼ã¸ )\n", "\n ( page %d )\n"), x++); object_desc(o_name, &st_ptr->stock[i], 0); fprintf(fff, "%c) %s\n", I2A(i%12), o_name); } @@ -4921,17 +4918,13 @@ static void dump_aux_home_museum(FILE *fff) int i; int x = 1; -#ifdef JP - fprintf(fff, " [Çîʪ´Û¤Î¥¢¥¤¥Æ¥à]\n"); -#else - fprintf(fff, " [Museum]\n"); -#endif + fprintf(fff, _(" [åç©é¤¨ã®ã¢ã¤ãã ]\n", " [Museum]\n")); /* Dump all available items */ for (i = 0; i < st_ptr->stock_num; i++) { #ifdef JP - if ((i % 12) == 0) fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++); + if ((i % 12) == 0) fprintf(fff, "\n ( %d ãã¼ã¸ )\n", x++); object_desc(o_name, &st_ptr->stock[i], 0); fprintf(fff, "%c) %s\n", I2A(i%12), o_name); #else @@ -4948,13 +4941,16 @@ static void dump_aux_home_museum(FILE *fff) } -/* +/*! + * @brief ãã³ãåºåã®ã¡ã¤ã³ã«ã¼ãã³ * Output the character dump to a file + * @param fff ãã¡ã¤ã«ãã¤ã³ã¿ + * @return ã¨ã©ã¼ã³ã¼ã */ errr make_character_dump(FILE *fff) { #ifdef JP - fprintf(fff, " [ÊѶòÈÚÅÜ %d.%d.%d ¥¥ã¥é¥¯¥¿¾ðÊó]\n\n", + fprintf(fff, " [å¤æè®æ %d.%d.%d ãã£ã©ã¯ã¿æ å ±]\n\n", FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH); #else fprintf(fff, " [Hengband %d.%d.%d Character Dump]\n\n", @@ -4976,21 +4972,20 @@ errr make_character_dump(FILE *fff) dump_aux_class_special(fff); dump_aux_mutations(fff); dump_aux_pet(fff); + fputs("\n\n", fff); dump_aux_equipment_inventory(fff); dump_aux_home_museum(fff); -#ifdef JP - fprintf(fff, " [¥Á¥§¥Ã¥¯¥µ¥à: \"%s\"]\n\n", get_check_sum()); -#else - fprintf(fff, " [Check Sum: \"%s\"]\n\n", get_check_sum()); -#endif - + fprintf(fff, _(" [ãã§ãã¯ãµã : \"%s\"]\n\n", " [Check Sum: \"%s\"]\n\n"), get_check_sum()); return 0; } -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã¹ãã¼ã¿ã¹ããã¡ã¤ã«ãã³ãåºåãã * Hack -- Dump a character description file - * + * @param name åºåãã¡ã¤ã«å + * @return ã¨ã©ã¼ã³ã¼ã + * @details * XXX XXX XXX Allow the "full" flag to dump additional info, * and trigger its usage from various places in the code. */ @@ -5018,12 +5013,7 @@ errr file_character(cptr name) (void)fd_close(fd); /* Build query */ -#ifdef JP - (void)sprintf(out_val, "¸½Â¸¤¹¤ë¥Õ¥¡¥¤¥ë %s ¤Ë¾å½ñ¤¤·¤Þ¤¹¤«? ", buf); -#else - (void)sprintf(out_val, "Replace existing file %s? ", buf); -#endif - + (void)sprintf(out_val, _("ç¾åãããã¡ã¤ã« %s ã«ä¸æ¸ããã¾ãã? ", "Replace existing file %s? "), buf); /* Ask */ if (get_check_strict(out_val, CHECK_NO_HISTORY)) fd = -1; @@ -5036,11 +5026,7 @@ errr file_character(cptr name) if (!fff) { /* Message */ -#ifdef JP - prt("¥¥ã¥é¥¯¥¿¾ðÊó¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤½Ð¤·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡ª", 0, 0); -#else - prt("Character dump failed!", 0, 0); -#endif + prt(_("ãã£ã©ã¯ã¿æ å ±ã®ãã¡ã¤ã«ã¸ã®æ¸ãåºãã«å¤±æãã¾ããï¼", "Character dump failed!"), 0, 0); (void)inkey(); @@ -5055,12 +5041,7 @@ errr file_character(cptr name) /* Message */ -#ifdef JP -msg_print("¥¥ã¥é¥¯¥¿¾ðÊó¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤½Ð¤·¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£"); -#else - msg_print("Character dump successful."); -#endif - + msg_print(_("ãã£ã©ã¯ã¿æ å ±ã®ãã¡ã¤ã«ã¸ã®æ¸ãåºãã«æåãã¾ããã", "Character dump successful.")); msg_print(NULL); /* Success */ @@ -5068,15 +5049,21 @@ msg_print(" } -/* +/*! + * @brief ãã¡ã¤ã«å 容ã®ä¸è¡ãã³ã³ã½ã¼ã«ã«åºåãã * Display single line of on-line help file - * + * @param str åºåããæåå + * @param cy ã³ã³ã½ã¼ã«ã®è¡ + * @param shower 確èªä¸ + * @return ãªã + * @details + *
* You can insert some special color tag to change text color. * Such as... * WHITETEXT [[[[y|SOME TEXT WHICH IS DISPLAYED IN YELLOW| WHITETEXT - * * A colored segment is between "[[[[y|" and the last "|". * You can use any single character in place of the "|". + **/ static void show_file_aux_line(cptr str, int cy, cptr shower) { @@ -5108,7 +5095,7 @@ static void show_file_aux_line(cptr str, int cy, cptr shower) /* Search for a shower string in the line */ if (shower) { - ptr = my_strstr(&lcstr[i], shower); + ptr = my_strstr(&lcstr[i], shower); if (ptr) showercol = ptr - &lcstr[i]; } @@ -5191,15 +5178,23 @@ static void show_file_aux_line(cptr str, int cy, cptr shower) } -/* +/*! + * @brief ãã¡ã¤ã«å 容ãã³ã³ã½ã¼ã«ã«åºåãã * Recursive file perusal. - * + * @param show_version TRUEãªãã°ã³ã³ã½ã¼ã«ä¸ã«ã²ã¼ã ã®ãã¼ã¸ã§ã³ã表示ãã + * @param name ãã¡ã¤ã«åã®æåå + * @param what å 容ãã£ãã·ã§ã³ã®æåå + * @param line 表示ã®ç¾å¨è¡ + * @param mode ãªãã·ã§ã³ + * @return ãªã + * @details + *
* Process various special text in the input file, including * the "menu" structures used by the "help file" system. - * * Return FALSE on 'q' to exit from a deep, otherwise TRUE. + **/ -bool show_file(bool show_version, cptr name, cptr what, int line, int mode) +bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode) { int i, n, skey; @@ -5227,6 +5222,7 @@ bool show_file(bool show_version, cptr name, cptr what, int line, int mode) /* Hold strings to find/show */ char finder_str[81]; char shower_str[81]; + char back_str[81]; /* String to show */ cptr shower = NULL; @@ -5304,12 +5300,7 @@ bool show_file(bool show_version, cptr name, cptr what, int line, int mode) if (!fff) { /* Caption */ -#ifdef JP -sprintf(caption, "¥Ø¥ë¥×¡¦¥Õ¥¡¥¤¥ë'%s'", name); -#else - sprintf(caption, "Help file '%s'", name); -#endif - + sprintf(caption, _("ãã«ãã»ãã¡ã¤ã«'%s'", "Help file '%s'"), name); /* Build the filename */ path_build(path, sizeof(path), ANGBAND_DIR_HELP, name); @@ -5322,12 +5313,7 @@ sprintf(caption, " if (!fff) { /* Caption */ -#ifdef JP -sprintf(caption, "¥¹¥Ý¥¤¥é¡¼¡¦¥Õ¥¡¥¤¥ë'%s'", name); -#else - sprintf(caption, "Info file '%s'", name); -#endif - + sprintf(caption, _("ã¹ãã¤ã©ã¼ã»ãã¡ã¤ã«'%s'", "Info file '%s'"), name); /* Build the filename */ path_build(path, sizeof(path), ANGBAND_DIR_INFO, name); @@ -5347,11 +5333,7 @@ sprintf(caption, " path[i] = PATH_SEP[0]; /* Caption */ -#ifdef JP -sprintf(caption, "¥¹¥Ý¥¤¥é¡¼¡¦¥Õ¥¡¥¤¥ë'%s'", name); -#else - sprintf(caption, "Info file '%s'", name); -#endif + sprintf(caption, _("ã¹ãã¤ã©ã¼ã»ãã¡ã¤ã«'%s'", "Info file '%s'"), name); /* Open the file */ fff = my_fopen(path, "r"); @@ -5361,12 +5343,7 @@ sprintf(caption, " if (!fff) { /* Message */ -#ifdef JP -msg_format("'%s'¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¡£", name); -#else - msg_format("Cannot open '%s'.", name); -#endif - + msg_format(_("'%s'ããªã¼ãã³ã§ãã¾ããã", "Cannot open '%s'."), name); msg_print(NULL); /* Oops */ @@ -5528,24 +5505,13 @@ msg_format("'%s' /* Show a general "title" */ if (show_version) { - prt(format( -#ifdef JP - "[ÊѶòÈÚÅÜ %d.%d.%d, %s, %d/%d]", -#else - "[Hengband %d.%d.%d, %s, Line %d/%d]", -#endif - + prt(format(_("[å¤æè®æ %d.%d.%d, %s, %d/%d]", "[Hengband %d.%d.%d, %s, Line %d/%d]"), FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH, caption, line, size), 0, 0); } else { - prt(format( -#ifdef JP - "[%s, %d/%d]", -#else - "[%s, Line %d/%d]", -#endif + prt(format(_("[%s, %d/%d]", "[%s, Line %d/%d]"), caption, line, size), 0, 0); } @@ -5553,12 +5519,7 @@ msg_format("'%s' if (size <= rows) { /* Wait for it */ -#ifdef JP -prt("[¥¡¼:(?)¥Ø¥ë¥× (ESC)½ªÎ»]", hgt - 1, 0); -#else - prt("[Press ESC to exit.]", hgt - 1, 0); -#endif - + prt(_("[ãã¼:(?)ãã«ã (ESC)çµäº]", "[Press ESC to exit.]"), hgt - 1, 0); } /* Prompt -- large files */ @@ -5566,9 +5527,9 @@ prt("[ { #ifdef JP if(reverse) - prt("[¥¡¼:(RET/¥¹¥Ú¡¼¥¹)¢¬ (-)¢ (?)¥Ø¥ë¥× (ESC)½ªÎ»]", hgt - 1, 0); + prt("[ãã¼:(RET/ã¹ãã¼ã¹)â (-)â (?)ãã«ã (ESC)çµäº]", hgt - 1, 0); else - prt("[¥¡¼:(RET/¥¹¥Ú¡¼¥¹)¢ (-)¢¬ (?)¥Ø¥ë¥× (ESC)½ªÎ»]", hgt - 1, 0); + prt("[ãã¼:(RET/ã¹ãã¼ã¹)â (-)â (?)ãã«ã (ESC)çµäº]", hgt - 1, 0); #else prt("[Press Return, Space, -, =, /, |, or ESC to exit.]", hgt - 1, 0); #endif @@ -5577,155 +5538,139 @@ prt("[ /* Get a special key code */ skey = inkey_special(TRUE); - /* Show the help for the help */ - if (skey == '?') + switch (skey) { + /* Show the help for the help */ + case '?': /* Hack - prevent silly recursion */ -#ifdef JP - if (strcmp(name, "jhelpinfo.txt") != 0) - show_file(TRUE, "jhelpinfo.txt", NULL, 0, mode); -#else - if (strcmp(name, "helpinfo.txt") != 0) - show_file(TRUE, "helpinfo.txt", NULL, 0, mode); -#endif - } + if (strcmp(name, _("jhelpinfo.txt", "helpinfo.txt")) != 0) + show_file(TRUE, _("jhelpinfo.txt", "helpinfo.txt"), NULL, 0, mode); + break; /* Hack -- try showing */ - if (skey == '=') - { + case '=': /* Get "shower" */ -#ifdef JP - prt("¶¯Ä´: ", hgt - 1, 0); -#else - prt("Show: ", hgt - 1, 0); -#endif + prt(_("強調: ", "Show: "), hgt - 1, 0); - (void)askfor(shower_str, 80); - - /* Make it lowercase */ - str_tolower(shower_str); + strcpy(back_str, shower_str); + if (askfor(shower_str, 80)) + { + if (shower_str[0]) + { + /* Make it lowercase */ + str_tolower(shower_str); - /* Show it */ - shower = shower_str; - } + /* Show it */ + shower = shower_str; + } + else shower = NULL; /* Stop showing */ + } + else strcpy(shower_str, back_str); + break; /* Hack -- try finding */ - if (skey == '/' || skey == KTRL('s')) - { + case '/': + case KTRL('s'): /* Get "finder" */ -#ifdef JP - prt("¸¡º÷: ", hgt - 1, 0); -#else - prt("Find: ", hgt - 1, 0); -#endif - + prt(_("æ¤ç´¢: ", "Find: "), hgt - 1, 0); + strcpy(back_str, finder_str); if (askfor(finder_str, 80)) { - /* Find it */ - find = finder_str; - back = line; - line = line + 1; + if (finder_str[0]) + { + /* Find it */ + find = finder_str; + back = line; + line = line + 1; - /* Make finder lowercase */ - str_tolower(finder_str); + /* Make finder lowercase */ + str_tolower(finder_str); - /* Show it */ - shower = finder_str; + /* Show it */ + shower = finder_str; + } + else shower = NULL; /* Stop showing */ } - } + else strcpy(finder_str, back_str); + break; /* Hack -- go to a specific line */ - if (skey == '#') - { - char tmp[81]; -#ifdef JP -prt("¹Ô: ", hgt - 1, 0); -#else - prt("Goto Line: ", hgt - 1, 0); -#endif - - strcpy(tmp, "0"); - - if (askfor(tmp, 80)) + case '#': { - line = atoi(tmp); + char tmp[81]; + prt(_("è¡: ", "Goto Line: "), hgt - 1, 0); + strcpy(tmp, "0"); + + if (askfor(tmp, 80)) line = atoi(tmp); } - } + break; /* Hack -- go to the top line */ - if (skey == SKEY_TOP) - { + case SKEY_TOP: line = 0; - } + break; /* Hack -- go to the bottom line */ - if (skey == SKEY_BOTTOM) - { - line = ((size-1)/rows)*rows; - } + case SKEY_BOTTOM: + line = ((size - 1) / rows) * rows; + break; /* Hack -- go to a specific file */ - if (skey == '%') - { - char tmp[81]; -#ifdef JP -prt("¥Õ¥¡¥¤¥ë¡¦¥Í¡¼¥à: ", hgt - 1, 0); -strcpy(tmp, "jhelp.hlp"); -#else - prt("Goto File: ", hgt - 1, 0); - strcpy(tmp, "help.hlp"); -#endif - - - if (askfor(tmp, 80)) + case '%': { - if (!show_file(TRUE, tmp, NULL, 0, mode)) skey = 'q'; + char tmp[81]; + prt(_("ãã¡ã¤ã«ã»ãã¼ã : ", "Goto File: "), hgt - 1, 0); + strcpy(tmp, _("jhelp.hlp", "help.hlp")); + + if (askfor(tmp, 80)) + { + if (!show_file(TRUE, tmp, NULL, 0, mode)) skey = 'q'; + } } - } + break; /* Allow backing up */ - if (skey == '-') - { + case '-': line = line + (reverse ? rows : -rows); if (line < 0) line = 0; - } + break; /* One page up */ - if (skey == SKEY_PGUP) - { + case SKEY_PGUP: line = line - rows; if (line < 0) line = 0; - } + break; /* Advance a single line */ - if ((skey == '\n') || (skey == '\r')) - { + case '\n': + case '\r': line = line + (reverse ? -1 : 1); if (line < 0) line = 0; - } - + break; /* Move up / down */ - if (skey == '8' || skey == SKEY_UP) - { + case '8': + case SKEY_UP: line--; if (line < 0) line = 0; - } + break; - if (skey == '2' || skey == SKEY_DOWN) line++; + case '2': + case SKEY_DOWN: + line++; + break; /* Advance one page */ - if (skey == ' ') - { + case ' ': line = line + (reverse ? -rows : rows); if (line < 0) line = 0; - } + break; /* One page down */ - if (skey == SKEY_PGDOWN) - { + case SKEY_PGDOWN: line = line + rows; + break; } /* Recurse on numbers */ @@ -5753,15 +5698,8 @@ strcpy(tmp, "jhelp.hlp"); strcpy (xtmp, ""); -#ifdef JP - if (!get_string("¥Õ¥¡¥¤¥ë̾: ", xtmp, 80)) -#else - if (!get_string("File name: ", xtmp, 80)) -#endif - { - continue; - } - + if (!get_string(_("ãã¡ã¤ã«å: ", "File name: "), xtmp, 80)) continue; + /* Close it */ my_fclose(fff); @@ -5776,17 +5714,12 @@ strcpy(tmp, "jhelp.hlp"); /* Oops */ if (!(fff && ffp)) { -#ifdef JP -msg_print("¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"); -#else - msg_print("Failed to open file."); -#endif - + msg_print(_("ãã¡ã¤ã«ãéãã¾ããã", "Failed to open file.")); skey = ESCAPE; break; } - sprintf(xtmp, "%s: %s", player_name, what); + sprintf(xtmp, "%s: %s", p_ptr->name, what ? what : caption); my_fputs(ffp, xtmp, 80); my_fputs(ffp, "\n", 80); @@ -5802,8 +5735,7 @@ msg_print(" } /* Return to last screen */ - if (skey == ESCAPE) break; - if (skey == '<') break; + if ((skey == ESCAPE) || (skey == '<')) break; /* Exit on the ^q */ if (skey == KTRL('q')) skey = 'q'; @@ -5823,8 +5755,11 @@ msg_print(" } -/* +/*! + * @brief ãã«ãã表示ããã³ãã³ãã®ã¡ã¤ã³ã«ã¼ãã³ * Peruse the On-Line-Help + * @return ãªã + * @details */ void do_cmd_help(void) { @@ -5832,20 +5767,19 @@ void do_cmd_help(void) screen_save(); /* Peruse the main help file */ -#ifdef JP -(void)show_file(TRUE, "jhelp.hlp", NULL, 0, 0); -#else - (void)show_file(TRUE, "help.hlp", NULL, 0, 0); -#endif - + (void)show_file(TRUE, _("jhelp.hlp", "help.hlp"), NULL, 0, 0); /* Load screen */ screen_load(); } -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ååããã§ãã¯ãã¦ä¿®æ£ãã * Process the player name. + * @param sf ã»ã¼ããã¡ã¤ã«åã«åãããä¿®æ£ãè¡ããªãã°TRUE + * @return ãªã + * @details * Extract a clean "base name". * Build the savefile name if needed. */ @@ -5857,42 +5791,28 @@ void process_player_name(bool sf) if (character_generated) strcpy(old_player_base, player_base); /* Cannot be too long */ -#if defined(MACINTOSH) || defined(MSDOS) || defined(USE_EMX) || defined(AMIGA) || defined(ACORN) || defined(VM) -#ifdef MSDOS - if (strlen(player_name) > 8) -#else - if (strlen(player_name) > 15) -#endif +#if defined(MACINTOSH) || defined(ACORN) + if (strlen(p_ptr->name) > 15) { /* Name too long */ -#ifdef JP -quit_fmt("'%s'¤È¤¤¤¦Ì¾Á°¤ÏŤ¹¤®¤Þ¤¹¡ª", player_name); -#else - quit_fmt("The name '%s' is too long!", player_name); -#endif - + quit_fmt(_("'%s'ã¨ããååã¯é·ããã¾ãï¼", "The name '%s' is too long!"), p_ptr->name); } #endif /* Cannot contain "icky" characters */ - for (i = 0; player_name[i]; i++) + for (i = 0; p_ptr->name[i]; i++) { /* No control characters */ #ifdef JP - if (iskanji(player_name[i])){i++;continue;} - if (iscntrl( (unsigned char)player_name[i])) + if (iskanji(p_ptr->name[i])){i++;continue;} + if (iscntrl( (unsigned char)p_ptr->name[i])) #else - if (iscntrl(player_name[i])) + if (iscntrl(p_ptr->name[i])) #endif { /* Illegal characters */ -#ifdef JP -quit_fmt("'%s' ¤È¤¤¤¦Ì¾Á°¤ÏÉÔÀµ¤Ê¥³¥ó¥È¥í¡¼¥ë¥³¡¼¥É¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£", player_name); -#else - quit_fmt("The name '%s' contains control chars!", player_name); -#endif - + quit_fmt(_("'%s' ã¨ããååã¯ä¸æ£ãªã³ã³ããã¼ã«ã³ã¼ããå«ãã§ãã¾ãã", "The name '%s' contains control chars!"), p_ptr->name); } } @@ -5900,12 +5820,12 @@ quit_fmt("'%s' #ifdef MACINTOSH /* Extract "useful" letters */ - for (i = 0; player_name[i]; i++) + for (i = 0; p_ptr->name[i]; i++) { #ifdef JP - unsigned char c = player_name[i]; + unsigned char c = p_ptr->name[i]; #else - char c = player_name[i]; + char c = p_ptr->name[i]; #endif @@ -5919,21 +5839,21 @@ quit_fmt("'%s' #else /* Extract "useful" letters */ - for (i = 0; player_name[i]; i++) + for (i = 0; p_ptr->name[i]; i++) { #ifdef JP - unsigned char c = player_name[i]; + unsigned char c = p_ptr->name[i]; #else - char c = player_name[i]; + char c = p_ptr->name[i]; #endif /* Accept some letters */ #ifdef JP if(iskanji(c)){ - if(k + 2 >= sizeof(player_base) || !player_name[i+1]) break; + if(k + 2 >= sizeof(player_base) || !p_ptr->name[i+1]) break; player_base[k++] = c; i++; - player_base[k++] = player_name[i]; + player_base[k++] = p_ptr->name[i]; } #ifdef SJIS else if (iskana(c)) player_base[k++] = c; @@ -5941,27 +5861,19 @@ quit_fmt("'%s' else #endif /* Convert path separator to underscore */ - if (!strncmp(PATH_SEP, player_name+i, strlen(PATH_SEP))){ + if (!strncmp(PATH_SEP, p_ptr->name+i, strlen(PATH_SEP))){ player_base[k++] = '_'; i += strlen(PATH_SEP); } -#ifdef MSDOS - /* Convert space, dot, and underscore to underscore */ - else if (my_strchr(". _", c)) player_base[k++] = '_'; + /* Convert some characters to underscore */ +#if defined(WINDOWS) + else if (my_strchr("\"*,/:;<>?\\|", c)) player_base[k++] = '_'; #endif else if (isprint(c)) player_base[k++] = c; } #endif - -#if defined(MSDOS) - - /* Hack -- max length */ - if (k > 8) k = 8; - -#endif - /* Terminate */ player_base[k] = '\0'; @@ -6008,11 +5920,6 @@ quit_fmt("'%s' (void)sprintf(temp, "%s", player_base); #endif -#ifdef VM - /* Hack -- support "flat directory" usage on VM/ESA */ - (void)sprintf(temp, "%s.sv", player_base); -#endif /* VM */ - /* Build the filename */ path_build(savefile, sizeof(savefile), ANGBAND_DIR_SAVE, temp); } @@ -6025,47 +5932,46 @@ quit_fmt("'%s' } -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®ååãå¤æ´ããã³ãã³ãã®ã¡ã¤ã³ã«ã¼ãã³ * Gets a name for the character, reacting to name changes. - * + * @return ãªã + * @details + *
* Assumes that "display_player(0)" has just been called - * * Perhaps we should NOT ask for a name (at "birth()") on * Unix machines? XXX XXX - * * What a horrible name for a global function. XXX XXX XXX + **/ void get_name(void) { char tmp[64]; /* Save the player name */ - strcpy(tmp, player_name); + strcpy(tmp, p_ptr->name); /* Prompt for a new name */ -#ifdef JP - if (get_string("¥¥ã¥é¥¯¥¿¡¼¤Î̾Á°¤òÆþÎϤ·¤Æ²¼¤µ¤¤: ", tmp, 15)) -#else - if (get_string("Enter a name for your character: ", tmp, 15)) -#endif + if (get_string(_("ãã£ã©ã¯ã¿ã¼ã®ååãå ¥åãã¦ä¸ãã: ", "Enter a name for your character: "), tmp, 15)) { /* Use the name */ - strcpy(player_name, tmp); + strcpy(p_ptr->name, tmp); } - else if (0 == strlen(player_name)) + + if (0 == strlen(p_ptr->name)) { /* Use default name */ - strcpy(player_name, "PLAYER"); + strcpy(p_ptr->name, "PLAYER"); } strcpy(tmp,ap_ptr->title); #ifdef JP if(ap_ptr->no == 1) - strcat(tmp,"¤Î"); + strcat(tmp,"ã®"); #else strcat(tmp, " "); #endif - strcat(tmp,player_name); + strcat(tmp,p_ptr->name); /* Re-Draw the name (in light blue) */ Term_erase(34, 1, 255); @@ -6077,8 +5983,11 @@ void get_name(void) -/* +/*! + * @brief èªæ®ºããã³ãã³ãã®ã¡ã¤ã³ã«ã¼ãã³ * Hack -- commit suicide + * @return ãªã + * @details */ void do_cmd_suicide(void) { @@ -6091,39 +6000,28 @@ void do_cmd_suicide(void) if (p_ptr->total_winner) { /* Verify */ -#ifdef JP -if (!get_check_strict("°úÂष¤Þ¤¹¤«? ", CHECK_NO_HISTORY)) return; -#else - if (!get_check_strict("Do you want to retire? ", CHECK_NO_HISTORY)) return; -#endif - + if (!get_check_strict(_("å¼éãã¾ãã? ", "Do you want to retire? "), CHECK_NO_HISTORY)) return; } /* Verify Suicide */ else { /* Verify */ -#ifdef JP -if (!get_check("ËÜÅö¤Ë¼«»¦¤·¤Þ¤¹¤«¡©")) return; -#else - if (!get_check("Do you really want to commit suicide? ")) return; -#endif + if (!get_check(_("æ¬å½ã«èªæ®ºãã¾ããï¼", "Do you really want to commit suicide? "))) return; } if (!p_ptr->noscore) { /* Special Verification for suicide */ -#ifdef JP -prt("³Îǧ¤Î¤¿¤á '@' ¤ò²¡¤·¤Æ²¼¤µ¤¤¡£", 0, 0); -#else - prt("Please verify SUICIDE by typing the '@' sign: ", 0, 0); -#endif + prt(_("確èªã®ãã '@' ãæ¼ãã¦ä¸ããã", "Please verify SUICIDE by typing the '@' sign: "), 0, 0); flush(); i = inkey(); prt("", 0, 0); if (i != '@') return; + + play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_GAMEOVER); } /* Initialize "last message" buffer */ @@ -6134,12 +6032,12 @@ prt(" if (p_ptr->total_winner && last_words) { char buf[1024] = ""; - -#ifdef JP - while (!get_string("*¾¡Íø*¥á¥Ã¥»¡¼¥¸: ", buf, sizeof buf)) ; -#else - while (!get_string("*Winning* message: ", buf, sizeof buf)) ; -#endif + play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_WINNER); + do + { + while (!get_string(_("*åå©*ã¡ãã»ã¼ã¸: ", "*Winning* message: "), buf, sizeof buf)) ; + } + while (!get_check_strict(_("ããããã§ããï¼", "Are you sure? "), CHECK_NO_HISTORY)); if (buf[0]) { @@ -6159,46 +6057,34 @@ prt(" if (!p_ptr->total_winner) { -#ifdef JP - do_cmd_write_nikki(NIKKI_BUNSHOU, 0, "¥À¥ó¥¸¥ç¥ó¤Îõº÷¤ËÀä˾¤·¤Æ¼«»¦¤·¤¿¡£"); - do_cmd_write_nikki(NIKKI_GAMESTART, 1, "-------- ¥²¡¼¥à¥ª¡¼¥Ð¡¼ --------"); -#else - do_cmd_write_nikki(NIKKI_BUNSHOU, 0, "give up all hope to commit suicide."); - do_cmd_write_nikki(NIKKI_GAMESTART, 1, "-------- Game Over --------"); -#endif + do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("ãã³ã¸ã§ã³ã®æ¢ç´¢ã«çµ¶æãã¦èªæ®ºããã", "give up all hope to commit suicide.")); + do_cmd_write_nikki(NIKKI_GAMESTART, 1, _("-------- ã²ã¼ã ãªã¼ãã¼ --------", "-------- Game Over --------")); do_cmd_write_nikki(NIKKI_BUNSHOU, 1, "\n\n\n\n"); } /* Cause of death */ -#ifdef JP -(void)strcpy(p_ptr->died_from, "ÅÓÃ潪λ"); -#else - (void)strcpy(p_ptr->died_from, "Quitting"); -#endif - + (void)strcpy(p_ptr->died_from, _("éä¸çµäº", "Quitting")); } - -/* +/*! + * @brief ã»ã¼ãããã³ãã³ãã®ã¡ã¤ã³ã«ã¼ãã³ * Save the game + * @param is_autosave ãªã¼ãã»ã¼ãä¸ã®å¦çãªãã°TRUE + * @return ãªã + * @details */ void do_cmd_save_game(int is_autosave) { /* Autosaves do not disturb */ if (is_autosave) { -#ifdef JP -msg_print("¼«Æ°¥»¡¼¥ÖÃæ"); -#else - msg_print("Autosaving the game..."); -#endif - + msg_print(_("èªåã»ã¼ãä¸", "Autosaving the game...")); } else { /* Disturb the player */ - disturb(1, 0); + disturb(1, 1); } /* Clear messages */ @@ -6208,23 +6094,13 @@ msg_print(" handle_stuff(); /* Message */ -#ifdef JP -prt("¥²¡¼¥à¤ò¥»¡¼¥Ö¤·¤Æ¤¤¤Þ¤¹...", 0, 0); -#else - prt("Saving game...", 0, 0); -#endif - + prt(_("ã²ã¼ã ãã»ã¼ããã¦ãã¾ã...", "Saving game..."), 0, 0); /* Refresh */ Term_fresh(); /* The player is not dead */ -#ifdef JP -(void)strcpy(p_ptr->died_from, "(¥»¡¼¥Ö)"); -#else - (void)strcpy(p_ptr->died_from, "(saved)"); -#endif - + (void)strcpy(p_ptr->died_from, _("(ã»ã¼ã)", "(saved)")); /* Forbid suspend */ signals_ignore_tstp(); @@ -6232,23 +6108,13 @@ prt(" /* Save the player */ if (save_player()) { -#ifdef JP -prt("¥²¡¼¥à¤ò¥»¡¼¥Ö¤·¤Æ¤¤¤Þ¤¹... ½ªÎ»", 0, 0); -#else - prt("Saving game... done.", 0, 0); -#endif - + prt(_("ã²ã¼ã ãã»ã¼ããã¦ãã¾ã... çµäº", "Saving game... done."), 0, 0); } /* Save failed (oops) */ else { -#ifdef JP -prt("¥²¡¼¥à¤ò¥»¡¼¥Ö¤·¤Æ¤¤¤Þ¤¹... ¼ºÇÔ¡ª", 0, 0); -#else - prt("Saving game... failed!", 0, 0); -#endif - + prt(_("ã²ã¼ã ãã»ã¼ããã¦ãã¾ã... 失æï¼", "Saving game... failed!"), 0, 0); } /* Allow suspend again */ @@ -6258,25 +6124,27 @@ prt(" Term_fresh(); /* Note that the player is not dead */ -#ifdef JP -(void)strcpy(p_ptr->died_from, "(¸µµ¤¤ËÀ¸¤¤Æ¤¤¤ë)"); -#else - (void)strcpy(p_ptr->died_from, "(alive and well)"); -#endif + (void)strcpy(p_ptr->died_from, _("(å æ°ã«çãã¦ãã)", "(alive and well)")); /* HACK -- don't get sanity blast on updating view */ - hack_mind = FALSE; + is_loading_now = FALSE; /* Update stuff */ update_stuff(); + /* Initialize monster process */ + mproc_init(); + /* HACK -- reset the hackish flag */ - hack_mind = TRUE; + is_loading_now = TRUE; } -/* +/*! + * @brief ã»ã¼ãå¾ã«ã²ã¼ã ä¸æãã©ã°ãç«ã¦ã/ * Save the game and exit + * @return ãªã + * @details */ void do_cmd_save_and_exit(void) { @@ -6284,21 +6152,20 @@ void do_cmd_save_and_exit(void) /* Leaving */ p_ptr->leaving = TRUE; -#ifdef JP - do_cmd_write_nikki(NIKKI_GAMESTART, 0, "----¥²¡¼¥àÃæÃÇ----"); -#else - do_cmd_write_nikki(NIKKI_GAMESTART, 0, "---- Save and Exit Game ----"); -#endif + do_cmd_write_nikki(NIKKI_GAMESTART, 0, _("----ã²ã¼ã ä¸æ----", "---- Save and Exit Game ----")); } -/* +/*! + * @brief ã¹ã³ã¢ãè¨ç®ãã / * Hack -- Calculates the total number of points earned -JWT- + * @return ãªã + * @details */ long total_points(void) { int i, mult = 100; - s16b max_dl = 0; + DEPTH max_dl = 0; u32b point, point_h, point_l; int arena_win = MIN(p_ptr->arena_number, MAX_ARENA_MONS); @@ -6353,9 +6220,13 @@ long total_points(void) } +#define GRAVE_LINE_WIDTH 31 -/* - * Centers a string within a 31 character string -JWT- +/*! + * @brief å¢ç³ã®çãä¸ã«æååãæ¸ãè¾¼ã / + * Centers a string within a GRAVE_LINE_WIDTH character string -JWT- + * @return ãªã + * @details */ static void center_string(char *buf, cptr str) { @@ -6365,21 +6236,23 @@ static void center_string(char *buf, cptr str) i = strlen(str); /* Necessary border */ - j = 15 - i / 2; + j = GRAVE_LINE_WIDTH / 2 - i / 2; /* Mega-Hack */ - (void)sprintf(buf, "%*s%s%*s", j, "", str, 31 - i - j, ""); + (void)sprintf(buf, "%*s%s%*s", j, "", str, GRAVE_LINE_WIDTH - i - j, ""); } #if 0 -/* +/*! + * @brief 骨ãã¡ã¤ã«åºå / * Save a "bones" file for a dead character - * + * @details + *
* Note that we will not use these files until Angband 2.8.0, and * then we will only use the name and level on which death occured. - * * Should probably attempt some form of locking... + **/ static void make_bones(void) { @@ -6427,7 +6300,7 @@ static void make_bones(void) if (!fp) return; /* Save the info */ - fprintf(fp, "%s\n", player_name); + fprintf(fp, "%s\n", p_ptr->name); fprintf(fp, "%d\n", p_ptr->mhp); fprintf(fp, "%d\n", p_ptr->prace); fprintf(fp, "%d\n", p_ptr->pclass); @@ -6446,8 +6319,10 @@ static void make_bones(void) bool (*tombstone_aux)(void) = NULL; -/* +/*! + * @brief å¢ç³ã®ã¢ã¹ãã¼ã¢ã¼ã表示 / * Display a "tomb-stone" + * @return ãªã */ static void print_tomb(void) { @@ -6463,30 +6338,22 @@ static void print_tomb(void) /* Print the text-tombstone */ if (!done) { - cptr p; - - char tmp[160]; - - char buf[1024]; -#ifndef JP - char dummy[80]; + cptr p; + char tmp[160]; + char buf[1024]; + char dummy[80]; + char *t; + FILE *fp; + time_t ct = time((time_t)0); +#ifdef JP + int extra_line = 0; #endif - FILE *fp; - - time_t ct = time((time_t)0); - - /* Clear screen */ Term_clear(); /* Build the filename */ -#ifdef JP - path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, "dead_j.txt"); -#else - path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, "dead.txt"); -#endif - + path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, _("dead_j.txt", "dead.txt")); /* Open the News file */ fp = my_fopen(buf, "r"); @@ -6507,17 +6374,15 @@ static void print_tomb(void) my_fclose(fp); } - /* King or Queen */ if (p_ptr->total_winner || (p_ptr->lev > PY_MAX_LEVEL)) { #ifdef JP - /* ±ÑÆüÀÚ¤êÂؤ¨ */ - p= "°ÎÂç¤Ê¤ë¼Ô"; + /* è±æ¥åãæ¿ã */ + p= "å大ãªãè "; #else p = "Magnificent"; #endif - } /* Normal */ @@ -6526,7 +6391,7 @@ static void print_tomb(void) p = player_title[p_ptr->pclass][(p_ptr->lev - 1) / 5]; } - center_string(buf, player_name); + center_string(buf, p_ptr->name); put_str(buf, 6, 11); #ifndef JP @@ -6537,127 +6402,139 @@ static void print_tomb(void) center_string(buf, p); put_str(buf, 8, 11); - center_string(buf, cp_ptr->title); - put_str(buf, 10, 11); -#ifdef JP -(void)sprintf(tmp, "¥ì¥Ù¥ë: %d", (int)p_ptr->lev); -#else - (void)sprintf(tmp, "Level: %d", (int)p_ptr->lev); -#endif - + (void)sprintf(tmp, _("ã¬ãã«: %d", "Level: %d"), (int)p_ptr->lev); center_string(buf, tmp); put_str(buf, 11, 11); -#ifdef JP -(void)sprintf(tmp, "·Ð¸³ÃÍ: %ld", (long)p_ptr->exp); -#else - (void)sprintf(tmp, "Exp: %ld", (long)p_ptr->exp); -#endif - + (void)sprintf(tmp, _("çµé¨å¤: %ld", "Exp: %ld"), (long)p_ptr->exp); center_string(buf, tmp); put_str(buf, 12, 11); -#ifdef JP -(void)sprintf(tmp, "½ê»ý¶â: %ld", (long)p_ptr->au); -#else - (void)sprintf(tmp, "AU: %ld", (long)p_ptr->au); -#endif - + (void)sprintf(tmp, _("ææé: %ld", "AU: %ld"), (long)p_ptr->au); center_string(buf, tmp); put_str(buf, 13, 11); #ifdef JP - /* Êè¤Ë¹ï¤à¸ÀÍÕ¤ò¥ª¥ê¥¸¥Ê¥ë¤è¤êºÙ¤«¤¯É½¼¨ */ - if (streq(p_ptr->died_from, "ÅÓÃ潪λ")) - { - strcpy(tmp, "<¼«»¦>"); - } - else - { - if (streq(p_ptr->died_from, "ripe")) + /* å¢ã«å»ãè¨èããªãªã¸ãã«ããç´°ãã表示 */ + if (streq(p_ptr->died_from, "éä¸çµäº")) { - strcpy(tmp, "°úÂà¸å¤ËÅ·¼÷¤òÁ´¤¦"); + strcpy(tmp, "<èªæ®º>"); } - else if (streq(p_ptr->died_from, "Seppuku")) + else if (streq(p_ptr->died_from, "ripe")) { - strcpy(tmp, "¾¡Íø¤Î¸å¡¢ÀÚÊ¢"); + strcpy(tmp, "å¼éå¾ã«å¤©å¯¿ãå ¨ã"); } - else + else if (streq(p_ptr->died_from, "Seppuku")) { - strcpy(tmp, p_ptr->died_from); + strcpy(tmp, "åå©ã®å¾ãåè ¹"); } - } - center_string(buf, tmp); - put_str(buf, 14, 11); - - if(!streq(p_ptr->died_from, "ripe") && !streq(p_ptr->died_from, "Seppuku")) - { - if( dun_level == 0 ) + else { - cptr town = (p_ptr->town_num ? "³¹" : "¹ÓÌî"); - if(streq(p_ptr->died_from, "ÅÓÃ潪λ")) - { - sprintf(tmp, "%s¤Ç»à¤ó¤À", town); - } - else + roff_to_buf(p_ptr->died_from, GRAVE_LINE_WIDTH + 1, tmp, sizeof tmp); + t = tmp + strlen(tmp) + 1; + if (*t) { - sprintf(tmp, "¤Ë%s¤Ç»¦¤µ¤ì¤¿", town); + strcpy(dummy, t); /* 2nd line */ + if (*(t + strlen(t) + 1)) /* Does 3rd line exist? */ + { + for (t = dummy + strlen(dummy) - 2; iskanji(*(t - 1)); t--) /* Loop */; + strcpy(t, "â¦"); + } + else if (my_strstr(tmp, "ã") && suffix(dummy, "ã")) + { + char dummy2[80]; + char *name_head = my_strstr(tmp, "ã"); + sprintf(dummy2, "%s%s", name_head, dummy); + if (strlen(dummy2) <= GRAVE_LINE_WIDTH) + { + strcpy(dummy, dummy2); + *name_head = '\0'; + } + } + else if (my_strstr(tmp, "ã") && suffix(dummy, "ã")) + { + char dummy2[80]; + char *name_head = my_strstr(tmp, "ã"); + sprintf(dummy2, "%s%s", name_head, dummy); + if (strlen(dummy2) <= GRAVE_LINE_WIDTH) + { + strcpy(dummy, dummy2); + *name_head = '\0'; + } + } + center_string(buf, dummy); + put_str(buf, 15, 11); + extra_line = 1; } } - else + center_string(buf, tmp); + put_str(buf, 14, 11); + + if (!streq(p_ptr->died_from, "ripe") && !streq(p_ptr->died_from, "Seppuku")) { - if(streq(p_ptr->died_from, "ÅÓÃ潪λ")) + if (dun_level == 0) { - sprintf(tmp, "Ãϲ¼ %d ³¬¤Ç»à¤ó¤À", dun_level); + cptr field_name = p_ptr->town_num ? "è¡" : "èé"; + if (streq(p_ptr->died_from, "éä¸çµäº")) + { + sprintf(tmp, "%sã§æ»ãã ", field_name); + } + else + { + sprintf(tmp, "ã«%sã§æ®ºããã", field_name); + } } else { - sprintf(tmp, "¤ËÃϲ¼ %d ³¬¤Ç»¦¤µ¤ì¤¿", dun_level); + if (streq(p_ptr->died_from, "éä¸çµäº")) + { + sprintf(tmp, "å°ä¸ %d éã§æ»ãã ", (int)dun_level); + } + else + { + sprintf(tmp, "ã«å°ä¸ %d éã§æ®ºããã", (int)dun_level); + } } + center_string(buf, tmp); + put_str(buf, 15 + extra_line, 11); } - center_string(buf, tmp); - put_str(buf, 15, 11); - } #else (void)sprintf(tmp, "Killed on Level %d", dun_level); center_string(buf, tmp); put_str(buf, 14, 11); - - if (strlen(p_ptr->died_from) > 24) - { - strncpy(dummy, p_ptr->died_from, 24); - dummy[24] = '\0'; - (void)sprintf(tmp, "by %s.", dummy); - } - else - (void)sprintf(tmp, "by %s.", p_ptr->died_from); - + roff_to_buf(format("by %s.", p_ptr->died_from), GRAVE_LINE_WIDTH + 1, tmp, sizeof tmp); center_string(buf, tmp); put_str(buf, 15, 11); + t = tmp + strlen(tmp) + 1; + if (*t) + { + strcpy(dummy, t); /* 2nd line */ + if (*(t + strlen(t) + 1)) /* Does 3rd line exist? */ + { + int dummy_len = strlen(dummy); + strcpy(dummy + MIN(dummy_len, GRAVE_LINE_WIDTH - 3), "..."); + } + center_string(buf, dummy); + put_str(buf, 16, 11); + } #endif - - (void)sprintf(tmp, "%-.24s", ctime(&ct)); center_string(buf, tmp); put_str(buf, 17, 11); - -#ifdef JP -msg_format("¤µ¤è¤¦¤Ê¤é¡¢%s!", player_name); -#else - msg_format("Goodbye, %s!", player_name); -#endif - + msg_format(_("ããããªãã%s!", "Goodbye, %s!"), p_ptr->name); } } -/* +/*! + * @brief æ»äº¡ãå¼éæã®ç°¡æã¹ãã¼ã¿ã¹è¡¨ç¤º / * Display some character info + * @return ãªã */ static void show_info(void) { @@ -6710,14 +6587,8 @@ static void show_info(void) /* Describe options */ -#ifdef JP -prt("¥¥ã¥é¥¯¥¿¡¼¤ÎµÏ¿¤ò¥Õ¥¡¥¤¥ë¤Ë½ñ¤½Ð¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£", 21, 0); -prt("¥ê¥¿¡¼¥ó¥¡¼¤Ç¥¥ã¥é¥¯¥¿¡¼¤ò¸«¤Þ¤¹¡£ESC¤ÇÃæÃǤ·¤Þ¤¹¡£", 22, 0); -#else - prt("You may now dump a character record to one or more files.", 21, 0); - prt("Then, hit RETURN to see the character, or ESC to abort.", 22, 0); -#endif - + prt(_("ãã£ã©ã¯ã¿ã¼ã®è¨é²ããã¡ã¤ã«ã«æ¸ãåºããã¨ãã§ãã¾ãã", "You may now dump a character record to one or more files."), 21, 0); + prt(_("ãªã¿ã¼ã³ãã¼ã§ãã£ã©ã¯ã¿ã¼ãè¦ã¾ããESCã§ä¸æãã¾ãã", "Then, hit RETURN to see the character, or ESC to abort."), 22, 0); /* Dump character records as requested */ while (TRUE) @@ -6725,12 +6596,7 @@ prt(" char out_val[160]; /* Prompt */ -#ifdef JP -put_str("¥Õ¥¡¥¤¥ë¥Í¡¼¥à: ", 23, 0); -#else - put_str("Filename: ", 23, 0); -#endif - + put_str(_("ãã¡ã¤ã«ãã¼ã : ", "Filename: "), 23, 0); /* Default */ strcpy(out_val, ""); @@ -6757,12 +6623,7 @@ put_str(" display_player(0); /* Prompt for inventory */ -#ifdef JP -prt("²¿¤«¥¡¼¤ò²¡¤¹¤È¤µ¤é¤Ë¾ðÊó¤¬Â³¤¤Þ¤¹ (ESC¤ÇÃæÃÇ): ", 23, 0); -#else - prt("Hit any key to see more information (ESC to abort): ", 23, 0); -#endif - + prt(_("ä½ããã¼ãæ¼ãã¨ããã«æ å ±ãç¶ãã¾ã (ESCã§ä¸æ): ", "Hit any key to see more information (ESC to abort): "), 23, 0); /* Allow abort at this point */ if (inkey() == ESCAPE) return; @@ -6776,11 +6637,7 @@ prt(" Term_clear(); item_tester_full = TRUE; (void)show_equip(0); -#ifdef JP -prt("ÁõÈ÷¤·¤Æ¤¤¤¿¥¢¥¤¥Æ¥à: -³¤¯-", 0, 0); -#else - prt("You are using: -more-", 0, 0); -#endif + prt(_("è£ åãã¦ããã¢ã¤ãã : -ç¶ã-", "You are using: -more-"), 0, 0); if (inkey() == ESCAPE) return; } @@ -6791,11 +6648,7 @@ prt(" Term_clear(); item_tester_full = TRUE; (void)show_inven(0); -#ifdef JP -prt("»ý¤Ã¤Æ¤¤¤¿¥¢¥¤¥Æ¥à: -³¤¯-", 0, 0); -#else - prt("You are carrying: -more-", 0, 0); -#endif + prt(_("æã£ã¦ããã¢ã¤ãã : -ç¶ã-", "You are carrying: -more-"), 0, 0); if (inkey() == ESCAPE) return; } @@ -6833,12 +6686,7 @@ prt(" } /* Caption */ -#ifdef JP -prt(format("²æ¤¬²È¤ËÃÖ¤¤¤Æ¤¢¤Ã¤¿¥¢¥¤¥Æ¥à ( %d ¥Ú¡¼¥¸): -³¤¯-", k+1), 0, 0); -#else - prt(format("Your home contains (page %d): -more-", k+1), 0, 0); -#endif - + prt(format(_("æã家ã«ç½®ãã¦ãã£ãã¢ã¤ãã ( %d ãã¼ã¸): -ç¶ã-", "Your home contains (page %d): -more-"), k+1), 0, 0); /* Wait for it */ if (inkey() == ESCAPE) return; @@ -6847,7 +6695,11 @@ prt(format(" } } - +/*! + * @brief ã¹ã³ã¢ãã¡ã¤ã«åºå + * Display some character info + * @return ãªã + */ static bool check_score(void) { /* Clear screen */ @@ -6856,12 +6708,7 @@ static bool check_score(void) /* No score file */ if (highscore_fd < 0) { -#ifdef JP -msg_print("¥¹¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬»ÈÍѤǤ¤Þ¤»¤ó¡£"); -#else - msg_print("Score file unavailable."); -#endif - + msg_print(_("ã¹ã³ã¢ã»ãã¡ã¤ã«ã使ç¨ã§ãã¾ããã", "Score file unavailable.")); msg_print(NULL); return FALSE; } @@ -6870,12 +6717,7 @@ msg_print(" /* Wizard-mode pre-empts scoring */ if (p_ptr->noscore & 0x000F) { -#ifdef JP -msg_print("¥¦¥£¥¶¡¼¥É¡¦¥â¡¼¥É¤Ç¤Ï¥¹¥³¥¢¤¬µÏ¿¤µ¤ì¤Þ¤»¤ó¡£"); -#else - msg_print("Score not registered for wizards."); -#endif - + msg_print(_("ã¦ã£ã¶ã¼ãã»ã¢ã¼ãã§ã¯ã¹ã³ã¢ãè¨é²ããã¾ããã", "Score not registered for wizards.")); msg_print(NULL); return FALSE; } @@ -6885,12 +6727,7 @@ msg_print(" /* Borg-mode pre-empts scoring */ if (p_ptr->noscore & 0x00F0) { -#ifdef JP -msg_print("¥Ü¡¼¥°¡¦¥â¡¼¥É¤Ç¤Ï¥¹¥³¥¢¤¬µÏ¿¤µ¤ì¤Þ¤»¤ó¡£"); -#else - msg_print("Score not registered for borgs."); -#endif - + msg_print(_("ãã¼ã°ã»ã¢ã¼ãã§ã¯ã¹ã³ã¢ãè¨é²ããã¾ããã", "Score not registered for borgs.")); msg_print(NULL); return FALSE; } @@ -6900,66 +6737,45 @@ msg_print(" /* Cheaters are not scored */ if (p_ptr->noscore & 0xFF00) { -#ifdef JP -msg_print("º¾µ½¤ò¤ä¤Ã¤¿¿Í¤Ï¥¹¥³¥¢¤¬µÏ¿¤µ¤ì¤Þ¤»¤ó¡£"); -#else - msg_print("Score not registered for cheaters."); -#endif - + msg_print(_("è©æ¬ºããã£ã人ã¯ã¹ã³ã¢ãè¨é²ããã¾ããã", "Score not registered for cheaters.")); msg_print(NULL); return FALSE; } #endif /* Interupted */ -#ifdef JP -if (!p_ptr->total_winner && streq(p_ptr->died_from, "¶¯À©½ªÎ»")) -#else - if (!p_ptr->total_winner && streq(p_ptr->died_from, "Interrupting")) -#endif - + if (!p_ptr->total_winner && streq(p_ptr->died_from, _("å¼·å¶çµäº", "Interrupting"))) { -#ifdef JP -msg_print("¶¯À©½ªÎ»¤Î¤¿¤á¥¹¥³¥¢¤¬µÏ¿¤µ¤ì¤Þ¤»¤ó¡£"); -#else - msg_print("Score not registered due to interruption."); -#endif - + msg_print(_("å¼·å¶çµäºã®ããã¹ã³ã¢ãè¨é²ããã¾ããã", "Score not registered due to interruption.")); msg_print(NULL); return FALSE; } /* Quitter */ -#ifdef JP -if (!p_ptr->total_winner && streq(p_ptr->died_from, "ÅÓÃ潪λ")) -#else - if (!p_ptr->total_winner && streq(p_ptr->died_from, "Quitting")) -#endif - + if (!p_ptr->total_winner && streq(p_ptr->died_from, _("éä¸çµäº", "Quitting"))) { -#ifdef JP -msg_print("ÅÓÃ潪λ¤Î¤¿¤á¥¹¥³¥¢¤¬µÏ¿¤µ¤ì¤Þ¤»¤ó¡£"); -#else - msg_print("Score not registered due to quitting."); -#endif - + msg_print(_("éä¸çµäºã®ããã¹ã³ã¢ãè¨é²ããã¾ããã", "Score not registered due to quitting.")); msg_print(NULL); return FALSE; } return TRUE; } -/* +/*! + * @brief ã²ã¼ã çµäºå¦ç / * Close up the current game (player may or may not be dead) - * + * @return ãªã + * @details + *
* This function is called only from "main.c" and "signals.c". + **/ void close_game(void) { char buf[1024]; bool do_send = TRUE; -/* cptr p = "[i:¥¥ã¥é¥¯¥¿¤Î¾ðÊó, f:¥Õ¥¡¥¤¥ë½ñ¤½Ð¤·, t:¥¹¥³¥¢, x:*´ÕÄê*, ESC:¥²¡¼¥à½ªÎ»]"; */ +/* cptr p = "[i:ãã£ã©ã¯ã¿ã®æ å ±, f:ãã¡ã¤ã«æ¸ãåºã, t:ã¹ã³ã¢, x:*éå®*, ESC:ã²ã¼ã çµäº]"; */ /* Handle stuff */ handle_stuff(); @@ -6998,18 +6814,9 @@ void close_game(void) if (p_ptr->total_winner) kingly(); /* Save memories */ -#ifdef JP - if (!cheat_save || get_check("»à¤ó¤À¥Ç¡¼¥¿¤ò¥»¡¼¥Ö¤·¤Þ¤¹¤«¡© ")) -#else - if (!cheat_save || get_check("Save death? ")) -#endif + if (!cheat_save || get_check(_("æ»ãã ãã¼ã¿ãã»ã¼ããã¾ããï¼ ", "Save death? "))) { - -#ifdef JP -if (!save_player()) msg_print("¥»¡¼¥Ö¼ºÇÔ¡ª"); -#else - if (!save_player()) msg_print("death save failed!"); -#endif + if (!save_player()) msg_print(_("ã»ã¼ã失æï¼", "death save failed!")); } else do_send = FALSE; @@ -7028,19 +6835,12 @@ if (!save_player()) msg_print(" { if ((!send_world_score(do_send))) { -#ifdef JP - if (get_check_strict("¸å¤Ç¥¹¥³¥¢¤òÅÐÏ¿¤¹¤ë¤¿¤á¤ËÂÔµ¡¤·¤Þ¤¹¤«¡©", (CHECK_NO_ESCAPE | CHECK_NO_HISTORY))) -#else - if (get_check_strict("Stand by for later score registration? ", (CHECK_NO_ESCAPE | CHECK_NO_HISTORY))) -#endif + if (get_check_strict(_("å¾ã§ã¹ã³ã¢ãç»é²ããããã«å¾ æ©ãã¾ããï¼", "Stand by for later score registration? "), + (CHECK_NO_ESCAPE | CHECK_NO_HISTORY))) { p_ptr->wait_report_score = TRUE; p_ptr->is_dead = FALSE; -#ifdef JP - if (!save_player()) msg_print("¥»¡¼¥Ö¼ºÇÔ¡ª"); -#else - if (!save_player()) msg_print("death save failed!"); -#endif + if (!save_player()) msg_print(_("ã»ã¼ã失æï¼", "death save failed!")); } } if (!p_ptr->wait_report_score) @@ -7063,12 +6863,8 @@ if (!save_player()) msg_print(" do_cmd_save_game(FALSE); /* Prompt for scores XXX XXX XXX */ -#ifdef JP -prt("¥ê¥¿¡¼¥ó¥¡¼¤« ESC ¥¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤¡£", 0, 40); -#else - prt("Press Return (or Escape).", 0, 40); -#endif - + prt(_("ãªã¿ã¼ã³ãã¼ã ESC ãã¼ãæ¼ãã¦ä¸ããã", "Press Return (or Escape)."), 0, 40); + play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_EXIT); /* Predict score (or ESCAPE) */ if (inkey() != ESCAPE) predict_score(); @@ -7089,23 +6885,22 @@ prt(" } -/* +/*! + * @brief ç°å¸¸çºçæã®ã²ã¼ã ç·æ¥çµäºå¦ç / * Handle abrupt death of the visual system - * + * @return ãªã + * @details + *
* This routine is called only in very rare situations, and only * by certain visual systems, when they experience fatal errors. - * * XXX XXX Hack -- clear the death flag when creating a HANGUP * save file so that player can see tombstone when restart. + **/ void exit_game_panic(void) { /* If nothing important has happened, just quit */ -#ifdef JP - if (!character_generated || character_saved) quit("¶ÛµÞ»öÂÖ"); -#else - if (!character_generated || character_saved) quit("panic"); -#endif + if (!character_generated || character_saved) quit(_("ç·æ¥äºæ ", "panic")); /* Mega-Hack -- see "msg_print()" */ msg_flag = FALSE; @@ -7114,7 +6909,7 @@ void exit_game_panic(void) prt("", 0, 0); /* Hack -- turn off some things */ - disturb(1, 0); + disturb(1, 1); /* Mega-Hack -- Delay death */ if (p_ptr->chp < 0) p_ptr->is_dead = FALSE; @@ -7126,33 +6921,27 @@ void exit_game_panic(void) signals_ignore_tstp(); /* Indicate panic save */ -#ifdef JP - (void)strcpy(p_ptr->died_from, "(¶ÛµÞ¥»¡¼¥Ö)"); -#else - (void)strcpy(p_ptr->died_from, "(panic save)"); -#endif - + (void)strcpy(p_ptr->died_from, _("(ç·æ¥ã»ã¼ã)", "(panic save)")); /* Panic save, or get worried */ -#ifdef JP - if (!save_player()) quit("¶ÛµÞ¥»¡¼¥Ö¼ºÇÔ¡ª"); -#else - if (!save_player()) quit("panic save failed!"); -#endif - + if (!save_player()) quit(_("ç·æ¥ã»ã¼ã失æï¼", "panic save failed!")); /* Successful panic save */ -#ifdef JP - quit("¶ÛµÞ¥»¡¼¥ÖÀ®¸ù¡ª"); -#else - quit("panic save succeeded!"); -#endif + quit(_("ç·æ¥ã»ã¼ãæåï¼", "panic save succeeded!")); } -/* +/*! + * @brief ãã¡ã¤ã«ããã©ã³ãã ã«è¡ãä¸ã¤åå¾ãã / * Get a random line from a file + * @param file_name ãã¡ã¤ã«å + * @param entry ç¹å®æ¡ä»¶æã®N:ã¿ã°ãããID + * @param output åºåå ã®æåååç §ãã¤ã³ã¿ + * @return ã¨ã©ã¼ã³ã¼ã + * @details + *
* Based on the monster speech patch by Matt Graham, + **/ errr get_rnd_line(cptr file_name, int entry, char *output) { @@ -7256,6 +7045,15 @@ errr get_rnd_line(cptr file_name, int entry, char *output) #ifdef JP +/*! + * @brief ãã¡ã¤ã«ããã©ã³ãã ã«è¡ãä¸ã¤åå¾ãã(æ¥æ¬èªæååã®ã¿) / + * @param file_name ãã¡ã¤ã«å + * @param entry ç¹å®æ¡ä»¶æã®N:ã¿ã°ãããID + * @param output åºåå ã®æåååç §ãã¤ã³ã¿ + * @param count 試è¡åæ° + * @return ã¨ã©ã¼ã³ã¼ã + * @details + */ errr get_rnd_line_jonly(cptr file_name, int entry, char *output, int count) { int i, j, kanji; @@ -7273,8 +7071,10 @@ errr get_rnd_line_jonly(cptr file_name, int entry, char *output, int count) } #endif -/* - * Process file for auto picker/destroyer. +/*! + * @brief èªåæ¾ããã¡ã¤ã«ãèªã¿è¾¼ã / + * @param name ãã¡ã¤ã«å + * @details */ errr process_autopick_file(cptr name) { @@ -7292,8 +7092,12 @@ errr process_autopick_file(cptr name) } -/* +/*! + * @brief ãã¬ã¤ã¤ã¼ã®çãç«ã¡ãã¡ã¤ã«ãèªã¿è¾¼ã / * Process file for player's history editor. + * @param name ãã¡ã¤ã«å + * @return ã¨ã©ã¼ã³ã¼ã + * @details */ errr process_histpref_file(cptr name) { @@ -7315,7 +7119,14 @@ errr process_histpref_file(cptr name) return (err); } - +/*! + * @brief ãã¡ã¤ã«ä½ç½®ãã·ã¼ã¯ / + * @param fd ãã¡ã¤ã«ãã£ã¹ã¯ãªãã¿ + * @param where ãã¡ã¤ã«ãã¤ãä½ç½® + * @param flag FALSEãªãã°ç¾ãã¡ã¤ã«ãè¶ ããä½ç½®ã¸ã·ã¼ã¯æã¨ã©ã¼ãTRUEãªã足ããªãéã0ã§åãå°½ãã + * @return ã¨ã©ã¼ã³ã¼ã + * @details + */ static errr counts_seek(int fd, u32b where, bool flag) { huge seekpoint; @@ -7356,17 +7167,19 @@ static errr counts_seek(int fd, u32b where, bool flag) return fd_seek(fd, seekpoint + where * sizeof(u32b)); } +/*! + * @brief ãã¡ã¤ã«ä½ç½®ãèªã¿è¾¼ã + * @param where ãã¡ã¤ã«ãã¤ãä½ç½® + * @return ã¨ã©ã¼ã³ã¼ã + * @details + */ u32b counts_read(int where) { int fd; u32b count = 0; char buf[1024]; -#ifdef JP - path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, "z_info_j.raw"); -#else - path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, "z_info.raw"); -#endif + path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, _("z_info_j.raw", "z_info.raw")); fd = fd_open(buf, O_RDONLY); if (counts_seek(fd, where, FALSE) || @@ -7378,17 +7191,20 @@ u32b counts_read(int where) return count; } +/*! + * @brief ãã¡ã¤ã«ä½ç½®ã«æ¸ãè¾¼ã / + * @param where ãã¡ã¤ã«ãã¤ãä½ç½® + * @param count æ¸ãè¾¼ãå¤ + * @return ã¨ã©ã¼ã³ã¼ã + * @details + */ errr counts_write(int where, u32b count) { int fd; char buf[1024]; errr err; -#ifdef JP - path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, "z_info_j.raw"); -#else - path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, "z_info.raw"); -#endif + path_build(buf, sizeof(buf), ANGBAND_DIR_DATA, _("z_info_j.raw", "z_info.raw")); /* Grab permissions */ safe_setuid_grab(); @@ -7448,9 +7264,11 @@ errr counts_write(int where, u32b count) #include
* This function was causing a *huge* number of problems, so it has * been simplified greatly. We keep a global variable which counts * the number of times the user attempts to kill the process, and * we commit suicide if the user does this a certain number of times. - * * We attempt to give "feedback" to the user as he approaches the * suicide thresh-hold, but without penalizing accidental keypresses. - * * To prevent messy accidents, we should reset this global variable * whenever the user enters a keypress, or something like that. + **/ static void handle_signal_simple(int sig) { @@ -7517,11 +7337,7 @@ static void handle_signal_simple(int sig) if (p_ptr->is_dead) { /* Mark the savefile */ -#ifdef JP -(void)strcpy(p_ptr->died_from, "¶¯À©½ªÎ»"); -#else - (void)strcpy(p_ptr->died_from, "Abortion"); -#endif + (void)strcpy(p_ptr->died_from, _("å¼·å¶çµäº", "Abortion")); forget_lite(); forget_view(); @@ -7531,24 +7347,14 @@ static void handle_signal_simple(int sig) close_game(); /* Quit */ -#ifdef JP -quit("¶¯À©½ªÎ»"); -#else - quit("interrupt"); -#endif - + quit(_("å¼·å¶çµäº", "interrupt")); } /* Allow suicide (after 5) */ else if (signal_count >= 5) { /* Cause of "death" */ -#ifdef JP -(void)strcpy(p_ptr->died_from, "¶¯À©½ªÎ»Ãæ"); -#else - (void)strcpy(p_ptr->died_from, "Interrupting"); -#endif - + (void)strcpy(p_ptr->died_from, _("å¼·å¶çµäºä¸", "Interrupting")); forget_lite(); forget_view(); @@ -7567,12 +7373,7 @@ quit(" close_game(); /* Quit */ -#ifdef JP -quit("¶¯À©½ªÎ»"); -#else - quit("interrupt"); -#endif - + quit(_("å¼·å¶çµäº", "interrupt")); } /* Give warning (after 4) */ @@ -7585,12 +7386,7 @@ quit(" Term_erase(0, 0, 255); /* Display the cause */ -#ifdef JP -Term_putstr(0, 0, -1, TERM_WHITE, "½Ïθ¤Î¾å¤Î¼«»¦¡ª"); -#else - Term_putstr(0, 0, -1, TERM_WHITE, "Contemplating suicide!"); -#endif - + Term_putstr(0, 0, -1, TERM_WHITE, _("çæ ®ã®ä¸ã®èªæ®ºï¼", "Contemplating suicide!")); /* Flush */ Term_fresh(); @@ -7608,15 +7404,28 @@ Term_putstr(0, 0, -1, TERM_WHITE, " } -/* +/*! + * @brief OSããã®ã·ã°ãã«ãåãã¦å¼·å¶çµäºãã / * Handle signal -- abort, kill, etc + * @param sig åãåã£ãã·ã°ãã« + * @return ãªã + * @details + *
+ * This function was causing a *huge* number of problems, so it has + * been simplified greatly. We keep a global variable which counts + * the number of times the user attempts to kill the process, and + * we commit suicide if the user does this a certain number of times. + * We attempt to give "feedback" to the user as he approaches the + * suicide thresh-hold, but without penalizing accidental keypresses. + * To prevent messy accidents, we should reset this global variable + * whenever the user enters a keypress, or something like that. + **/ static void handle_signal_abort(int sig) { - int wid, hgt, rows; + int wid, hgt; Term_get_size(&wid, &hgt); - rows = hgt - 4; /* Disable handler */ (void)signal(sig, SIG_IGN); @@ -7635,20 +7444,13 @@ static void handle_signal_abort(int sig) /* Give a warning */ Term_putstr(0, hgt - 1, -1, TERM_RED, -#ifdef JP -"¶²¤í¤·¤¤¥½¥Õ¥È¤Î¥Ð¥°¤¬Èô¤Ó¤«¤«¤Ã¤Æ¤¤¿¡ª"); -#else - "A gruesome software bug LEAPS out at you!"); -#endif + _("æãããã½ããã®ãã°ãé£ã³ããã£ã¦ããï¼", "A gruesome software bug LEAPS out at you!")); /* Message */ -#ifdef JP -Term_putstr(45, hgt - 1, -1, TERM_RED, "¶ÛµÞ¥»¡¼¥Ö..."); -#else - Term_putstr(45, hgt - 1, -1, TERM_RED, "Panic save..."); -#endif + Term_putstr(45, hgt - 1, -1, TERM_RED, _("ç·æ¥ã»ã¼ã...", "Panic save...")); + do_cmd_write_nikki(NIKKI_GAMESTART, 0, _("----ã²ã¼ã ç°å¸¸çµäº----", "---- Panic Save and Abort Game ----")); /* Flush output */ Term_fresh(); @@ -7657,12 +7459,7 @@ Term_putstr(45, hgt - 1, -1, TERM_RED, " p_ptr->panic_save = 1; /* Panic save */ -#ifdef JP -(void)strcpy(p_ptr->died_from, "(¶ÛµÞ¥»¡¼¥Ö)"); -#else - (void)strcpy(p_ptr->died_from, "(panic save)"); -#endif - + (void)strcpy(p_ptr->died_from, _("(ç·æ¥ã»ã¼ã)", "(panic save)")); /* Forbid suspend */ signals_ignore_tstp(); @@ -7670,42 +7467,27 @@ Term_putstr(45, hgt - 1, -1, TERM_RED, " /* Attempt to save */ if (save_player()) { -#ifdef JP -Term_putstr(45, hgt - 1, -1, TERM_RED, "¶ÛµÞ¥»¡¼¥ÖÀ®¸ù¡ª"); -#else - Term_putstr(45, hgt - 1, -1, TERM_RED, "Panic save succeeded!"); -#endif - + Term_putstr(45, hgt - 1, -1, TERM_RED, _("ç·æ¥ã»ã¼ãæåï¼", "Panic save succeeded!")); } /* Save failed */ else { -#ifdef JP -Term_putstr(45, hgt - 1, -1, TERM_RED, "¶ÛµÞ¥»¡¼¥Ö¼ºÇÔ¡ª"); -#else - Term_putstr(45, hgt - 1, -1, TERM_RED, "Panic save failed!"); -#endif - + Term_putstr(45, hgt - 1, -1, TERM_RED, _("ç·æ¥ã»ã¼ã失æï¼", "Panic save failed!")); } /* Flush output */ Term_fresh(); /* Quit */ -#ifdef JP -quit("¥½¥Õ¥È¤Î¥Ð¥°"); -#else - quit("software bug"); -#endif - + quit(_("ã½ããã®ãã°", "software bug")); } - - - -/* +/*! + * @brief OSããã®SIGTSTPã·ã°ãã«ãç¡è¦ããé¢æ° / * Ignore SIGTSTP signals (keyboard suspend) + * @return ãªã + * @details */ void signals_ignore_tstp(void) { @@ -7716,8 +7498,11 @@ void signals_ignore_tstp(void) } -/* +/*! + * @brief OSããã®SIGTSTPã·ã°ãã«ãã³ãã© / * Handle SIGTSTP signals (keyboard suspend) + * @return ãªã + * @details */ void signals_handle_tstp(void) { @@ -7729,8 +7514,11 @@ void signals_handle_tstp(void) } -/* +/*! + * @brief OSããã®ã·ã°ãã«ãã³ãã«ãåæåãã / * Prepare to handle the relevant signals + * @return ãªã + * @details */ void signals_init(void) { @@ -7816,21 +7604,24 @@ void signals_init(void) #else /* HANDLE_SIGNALS */ -/* +/*! + * @brief ããã¼ / * Do nothing */ void signals_ignore_tstp(void) { } -/* +/*! + * @brief ããã¼ / * Do nothing */ void signals_handle_tstp(void) { } -/* +/*! + * @brief ããã¼ / * Do nothing */ void signals_init(void)