X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcmd5.c;h=1264072020defd60eaab072ab2ae32deeb321ae6;hb=9d4b877c27a36774ae5256db6237264298837607;hp=193fd6f17d2110eaec32c2d031da7cf487e40034;hpb=1e16b0fb1915f8b2a5cbac6c29f84b5a6fedfac9;p=hengband%2Fhengband.git diff --git a/src/cmd5.c b/src/cmd5.c index 193fd6f17..126407202 100644 --- a/src/cmd5.c +++ b/src/cmd5.c @@ -1,6 +1,6 @@ -/*! +/*! * @file cmd5.c - * @brief ¥×¥ì¥¤¥ä¡¼¤ÎËâË¡¤Ë´Ø¤¹¤ë¥³¥Þ¥ó¥É¤Î¼ÂÁõ / Spell/Prayer commands + * @brief ãã¬ã¤ã¤ã¼ã®éæ³ã«é¢ããã³ãã³ãã®å®è£ / Spell/Prayer commands * @date 2014/01/02 * @author * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke @@ -14,23 +14,23 @@ #include "angband.h" /*! - * @brief ÎΰèËâË¡¤Ë±þ¤¸¤Æµ»Ç½¤Î̾¾Î¤òÊÖ¤¹¡£ - * @param tval ËâË¡½ñ¤Îtval - * @return ÎΰèËâË¡¤Îµ»Ç½Ì¾¾Î¤òÊݴɤ·¤¿Ê¸»úÎó¥Ý¥¤¥ó¥¿ + * @brief é åéæ³ã«å¿ãã¦æè½ã®å称ãè¿ãã + * @param tval éæ³æ¸ã®tval + * @return é åéæ³ã®æè½å称ãä¿ç®¡ããæååãã¤ã³ã¿ */ -cptr spell_category_name(int tval) +cptr spell_category_name(OBJECT_TYPE_VALUE tval) { switch (tval) { #ifdef JP case TV_HISSATSU_BOOK: - return "ɬ»¦µ»"; + return "å¿ æ®ºæ"; case TV_LIFE_BOOK: - return "µ§¤ê"; + return "ç¥ã"; case TV_MUSIC_BOOK: - return "²Î"; + return "æ"; default: - return "¼öʸ"; + return "åªæ"; #else case TV_HISSATSU_BOOK: return "art"; @@ -48,13 +48,13 @@ cptr spell_category_name(int tval) bool select_the_force = FALSE; /*! - * @brief ÎΰèËâË¡¤Î±ÜÍ÷¡¢³Ø½¬¡¢»ÈÍÑÁªÂò¤¹¤ë¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹½èÍý + * @brief é åéæ³ã®é²è¦§ãå¦ç¿ã使ç¨é¸æããã¤ã³ã¿ã¼ãã§ã¤ã¹å¦ç * Allow user to choose a spell/prayer from the given book. - * @param sn ÁªÂò¤·¤¿ËâË¡ID¤òÊÖ¤¹»²¾È¥Ý¥¤¥ó¥¿ - * @param prompt ËâË¡¤òÍøÍѤ¹¤ëºÝ¤ÎÆ°»ìɽµ - * @param sval ËâÆ»½ñ¤Îsval - * @param learned ±ÜÍ÷/»ÈÍÑÁªÂò¤Ê¤é¤ÐTRUE¡¢³Ø½¬½èÍý¤Ê¤éFALSE - * @param use_realm ËâË¡ÎΰèID + * @param sn é¸æããéæ³IDãè¿ãåç §ãã¤ã³ã¿ + * @param prompt éæ³ãå©ç¨ããéã®åè©è¡¨è¨ + * @param sval ééæ¸ã®sval + * @param learned é²è¦§/使ç¨é¸æãªãã°TRUEãå¦ç¿å¦çãªãFALSE + * @param use_realm éæ³é åID * @return *
* If a valid spell is chosen, saves it in '*sn' and returns TRUE @@ -64,14 +64,14 @@ bool select_the_force = FALSE; * The "known" should be TRUE for cast/pray, FALSE for study **/ -static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm) +static int get_spell(COMMAND_CODE *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX use_realm) { int i; - int spell = -1; + SPELL_IDX spell = -1; int num = 0; int ask = TRUE; - int need_mana; - byte spells[64]; + MANA_POINT need_mana; + SPELL_IDX spells[64]; bool flag, redraw, okay; char choice; const magic_type *s_ptr; @@ -146,8 +146,8 @@ static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm /* Build a prompt (accept all spells) */ #ifdef JP - jverb1( prompt, jverb_buf ); - (void) strnfmt(out_val, 78, "(%^s:%c-%c, '*'¤Ç°ìÍ÷, ESC¤ÇÃæÃÇ) ¤É¤Î%s¤ò%^s¤Þ¤¹¤«? ", + jverb( prompt, jverb_buf, JVERB_AND ); + (void) strnfmt(out_val, 78, "(%^s:%c-%c, '*'ã§ä¸è¦§, ESCã§ä¸æ) ã©ã®%sã%^sã¾ãã? ", p, I2A(0), I2A(num - 1), p, jverb_buf ); #else (void)strnfmt(out_val, 78, "(%^ss %c-%c, *=List, ESC=exit) %^s which %s? ", @@ -242,7 +242,7 @@ static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm ask = (isupper(choice)); /* Lowercase */ - if (ask) choice = tolower(choice); + if (ask) choice = (char)tolower(choice); /* Extract request */ i = (islower(choice) ? A2I(choice) : -1); @@ -263,7 +263,7 @@ static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm { bell(); #ifdef JP - msg_format("¤½¤Î%s¤ò%s¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¡£", p, prompt); + msg_format("ãã®%sã%sãã¨ã¯ã§ãã¾ããã", p, prompt); #else msg_format("You may not %s that %s.", prompt, p); #endif @@ -298,9 +298,9 @@ static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm /* Prompt */ #ifdef JP - jverb1( prompt, jverb_buf ); - /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½¤ËÂбþ */ - (void) strnfmt(tmp_val, 78, "%s(MP%d, ¼ºÇÔΨ%d%%)¤ò%s¤Þ¤¹¤«? ", + jverb( prompt, jverb_buf, JVERB_AND ); + /* è±æ¥åãæ¿ãæ©è½ã«å¯¾å¿ */ + (void) strnfmt(tmp_val, 78, "%s(MP%d, 失æç%d%%)ã%sã¾ãã? ", do_spell(use_realm, spell, SPELL_NAME), need_mana, spell_chance(spell, use_realm),jverb_buf); #else @@ -347,9 +347,9 @@ static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm } /*! - * @brief ¥ª¥Ö¥¸¥§¥¯¥È¤¬¥×¥ì¥¤¥ä¡¼¤¬»ÈÍѲÄǽ¤ÊËâÆ»½ñ¤«¤É¤¦¤«¤òȽÄꤹ¤ë - * @param o_ptr ȽÄꤷ¤¿¤¤¥ª¥Ö²ñ¥¸¥§¥¯¥È¤Î¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿ - * @return ³Ø½¬¤Ç¤¤ëËâÆ»½ñ¤Ê¤é¤ÐTRUE¤òÊÖ¤¹ + * @brief ãªãã¸ã§ã¯ãããã¬ã¤ã¤ã¼ã使ç¨å¯è½ãªééæ¸ãã©ãããå¤å®ãã + * @param o_ptr å¤å®ããããªãä¼ã¸ã§ã¯ãã®æ§é ä½åç §ãã¤ã³ã¿ + * @return å¦ç¿ã§ããééæ¸ãªãã°TRUEãè¿ã */ static bool item_tester_learn_spell(object_type *o_ptr) { @@ -376,8 +376,8 @@ static bool item_tester_learn_spell(object_type *o_ptr) } /*! - * @brief ¥×¥ì¥¤¥ä¡¼¤¬ËâÆ»½ñ¤ò°ìºý¤â»ý¤Ã¤Æ¤¤¤Ê¤¤¤«¤òȽÄꤹ¤ë - * @return ËâÆ»½ñ¤ò°ìºý¤â»ý¤Ã¤Æ¤¤¤Ê¤¤¤Ê¤éTRUE¤òÊÖ¤¹ + * @brief ãã¬ã¤ã¤ã¼ãééæ¸ãä¸åãæã£ã¦ããªãããå¤å®ãã + * @return ééæ¸ãä¸åãæã£ã¦ããªããªãTRUEãè¿ã */ static bool player_has_no_spellbooks(void) { @@ -390,7 +390,7 @@ static bool player_has_no_spellbooks(void) if (o_ptr->k_idx && check_book_realm(o_ptr->tval, o_ptr->sval)) return FALSE; } - for (i = cave[py][px].o_idx; i; i = o_ptr->next_o_idx) + for (i = cave[p_ptr->y][p_ptr->x].o_idx; i; i = o_ptr->next_o_idx) { o_ptr = &o_list[i]; if (o_ptr->k_idx && (o_ptr->marked & OM_FOUND) && check_book_realm(o_ptr->tval, o_ptr->sval)) return FALSE; @@ -400,13 +400,13 @@ static bool player_has_no_spellbooks(void) } /*! - * @brief ¥×¥ì¥¤¥ä¡¼¤Î¿¦¶È¤¬Îýµ¤½Ñ»Õ¤Î»þ¡¢ÎΰèËâË¡¤ÈÎýµ¤½Ñ¤òÀڤ괹¤¨¤ë½èÍý¤Î¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹ - * @param browse_only ËâË¡¤Èµ»Ç½¤Î±ÜÍ÷¤ò¹Ô¤¦¤Ê¤é¤ÐTRUE - * @return ËâÆ»½ñ¤ò°ìºý¤â»ý¤Ã¤Æ¤¤¤Ê¤¤¤Ê¤éTRUE¤òÊÖ¤¹ + * @brief ãã¬ã¤ã¤ã¼ã®è·æ¥ãç·´æ°è¡å¸«ã®æãé åéæ³ã¨ç·´æ°è¡ãåãæããå¦çã®ã¤ã³ã¿ã¼ãã§ã¤ã¹ + * @param browse_only éæ³ã¨æè½ã®é²è¦§ãè¡ããªãã°TRUE + * @return ééæ¸ãä¸åãæã£ã¦ããªããªãTRUEãè¿ã */ static void confirm_use_force(bool browse_only) { - int item; + SPELL_IDX item; char which; #ifdef ALLOW_REPEAT @@ -421,11 +421,7 @@ static void confirm_use_force(bool browse_only) #endif /* ALLOW_REPEAT */ /* Show the prompt */ -#ifdef JP - prt("('w'Îýµ¤½Ñ, ESC) 'w'¤«ESC¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£ ", 0, 0); -#else - prt("(w for the Force, ESC) Hit 'w' or ESC. ", 0, 0); -#endif + prt(_("('w'ç·´æ°è¡, ESC) 'w'ãESCãæ¼ãã¦ãã ããã ", "(w for the Force, ESC) Hit 'w' or ESC. "), 0, 0); while (1) { @@ -457,9 +453,9 @@ static void confirm_use_force(bool browse_only) /*! - * @brief ¥×¥ì¥¤¥ä¡¼¤ÎËâË¡¤Èµ»Ç½¤ò±ÜÍ÷¤¹¤ë¥³¥Þ¥ó¥É¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó / + * @brief ãã¬ã¤ã¤ã¼ã®éæ³ã¨æè½ãé²è¦§ããã³ãã³ãã®ã¡ã¤ã³ã«ã¼ãã³ / * Peruse the spells/prayers in a book - * @return ¤Ê¤· + * @return ãªã * @details *
* Note that *all* spells in the book are listed @@ -470,12 +466,15 @@ static void confirm_use_force(bool browse_only) */ void do_cmd_browse(void) { - int item, sval, use_realm = 0, j, line; - int spell = -1; + OBJECT_IDX item; + OBJECT_SUBTYPE_VALUE sval; + REALM_IDX use_realm = 0; + int j, line; + SPELL_IDX spell = -1; int num = 0; - byte spells[64]; - char temp[62*4]; + int spells[64]; + char temp[62*4]; object_type *o_ptr; @@ -484,12 +483,7 @@ void do_cmd_browse(void) /* Warriors are illiterate */ if (!(p_ptr->realm1 || p_ptr->realm2) && (p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_RED_MAGE)) { -#ifdef JP - msg_print("ËܤòÆɤळ¤È¤¬¤Ç¤¤Ê¤¤¡ª"); -#else - msg_print("You cannot read books!"); -#endif - + msg_print(_("æ¬ãèªããã¨ãã§ããªãï¼", "You cannot read books!")); return; } @@ -513,17 +507,8 @@ void do_cmd_browse(void) else item_tester_hook = item_tester_learn_spell; /* Get an item */ -#ifdef JP - q = "¤É¤ÎËܤòÆɤߤޤ¹¤«? "; -#else - q = "Browse which book? "; -#endif - -#ifdef JP - s = "Æɤá¤ëËܤ¬¤Ê¤¤¡£"; -#else - s = "You have no books that you can read."; -#endif + q = _("ã©ã®æ¬ãèªã¿ã¾ãã? ", "Browse which book? "); + s = _("èªããæ¬ããªãã", "You have no books that you can read."); if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) { @@ -584,11 +569,7 @@ void do_cmd_browse(void) while(TRUE) { /* Ask for a spell, allow cancel */ -#ifdef JP - if (!get_spell(&spell, "Æɤà", o_ptr->sval, TRUE, use_realm)) -#else - if (!get_spell(&spell, "browse", o_ptr->sval, TRUE, use_realm)) -#endif + if (!get_spell(&spell, _("èªã", "browse"), o_ptr->sval, TRUE, use_realm)) { /* If cancelled, leave immediately. */ if (spell == -1) break; @@ -598,17 +579,9 @@ void do_cmd_browse(void) /* Notify that there's nothing to see, and wait. */ if (use_realm == REALM_HISSATSU) -#ifdef JP - prt("Æɤá¤ëµ»¤¬¤Ê¤¤¡£", 0, 0); -#else - prt("No techniques to browse.", 0, 0); -#endif + prt(_("èªããæããªãã", "No techniques to browse."), 0, 0); else -#ifdef JP - prt("Æɤá¤ë¼öʸ¤¬¤Ê¤¤¡£", 0, 0); -#else - prt("No spells to browse.", 0, 0); -#endif + prt(_("èªããåªæããªãã", "No spells to browse."), 0, 0); (void)inkey(); @@ -638,11 +611,11 @@ void do_cmd_browse(void) } /*! - * @brief ¥×¥ì¥¤¥ä¡¼¤ÎÂèÆóËâË¡Îΰè¤òÊѹ¹¤¹¤ë / - * @param next_realm Êѹ¹Àè¤ÎËâË¡ÎΰèID - * @return ¤Ê¤· + * @brief ãã¬ã¤ã¤ã¼ã®ç¬¬äºéæ³é åãå¤æ´ãã / + * @param next_realm å¤æ´å ã®éæ³é åID + * @return ãªã */ -static void change_realm2(int next_realm) +static void change_realm2(CHARACTER_IDX next_realm) { int i, j = 0; char tmp[80]; @@ -663,11 +636,7 @@ static void change_realm2(int next_realm) p_ptr->spell_worked2 = 0L; p_ptr->spell_forgotten2 = 0L; -#ifdef JP - sprintf(tmp,"ËâË¡¤ÎÎΰè¤ò%s¤«¤é%s¤ËÊѹ¹¤·¤¿¡£", realm_names[p_ptr->realm2], realm_names[next_realm]); -#else - sprintf(tmp,"change magic realm from %s to %s.", realm_names[p_ptr->realm2], realm_names[next_realm]); -#endif + sprintf(tmp,_("éæ³ã®é åã%sãã%sã«å¤æ´ããã", "change magic realm from %s to %s."), realm_names[p_ptr->realm2], realm_names[next_realm]); do_cmd_write_nikki(NIKKI_BUNSHOU, 0, tmp); p_ptr->old_realm |= 1 << (p_ptr->realm2-1); p_ptr->realm2 = next_realm; @@ -682,18 +651,20 @@ static void change_realm2(int next_realm) /*! - * @brief ËâË¡¤ò³Ø½¬¤¹¤ë¥³¥Þ¥ó¥É¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó / + * @brief éæ³ãå¦ç¿ããã³ãã³ãã®ã¡ã¤ã³ã«ã¼ãã³ / * Study a book to gain a new spell/prayer - * @return ¤Ê¤· + * @return ãªã */ void do_cmd_study(void) { - int i, item, sval; + int i; + OBJECT_IDX item; + OBJECT_SUBTYPE_VALUE sval; int increment = 0; bool learned = FALSE; /* Spells of realm2 will have an increment of +32 */ - int spell = -1; + SPELL_IDX spell = -1; cptr p = spell_category_name(mp_ptr->spell_book); @@ -703,45 +674,25 @@ void do_cmd_study(void) if (!p_ptr->realm1) { -#ifdef JP -msg_print("ËܤòÆɤळ¤È¤¬¤Ç¤¤Ê¤¤¡ª"); -#else - msg_print("You cannot read books!"); -#endif - + msg_print(_("æ¬ãèªããã¨ãã§ããªãï¼", "You cannot read books!")); return; } if (p_ptr->blind || no_lite()) { -#ifdef JP -msg_print("Ìܤ¬¸«¤¨¤Ê¤¤¡ª"); -#else - msg_print("You cannot see!"); -#endif - + msg_print(_("ç®ãè¦ããªãï¼", "You cannot see!")); return; } if (p_ptr->confused) { -#ifdef JP -msg_print("º®Í𤷤Ƥ¤¤ÆÆɤá¤Ê¤¤¡ª"); -#else - msg_print("You are too confused!"); -#endif - + msg_print(_("æ··ä¹±ãã¦ãã¦èªããªãï¼", "You are too confused!")); return; } if (!(p_ptr->new_spells)) { -#ifdef JP -msg_format("¿·¤·¤¤%s¤ò³Ð¤¨¤ë¤³¤È¤Ï¤Ç¤¤Ê¤¤¡ª", p); -#else - msg_format("You cannot learn any new %ss!", p); -#endif - + msg_format(_("æ°ãã%sãè¦ãããã¨ã¯ã§ããªãï¼", "You cannot learn any new %ss!"), p); return; } @@ -752,9 +703,9 @@ msg_format(" #ifdef JP if( p_ptr->new_spells < 10 ){ - msg_format("¤¢¤È %d ¤Ä¤Î%s¤ò³Ø¤Ù¤ë¡£", p_ptr->new_spells, p); + msg_format("ã㨠%d ã¤ã®%sãå¦ã¹ãã", p_ptr->new_spells, p); }else{ - msg_format("¤¢¤È %d ¸Ä¤Î%s¤ò³Ø¤Ù¤ë¡£", p_ptr->new_spells, p); + msg_format("ã㨠%d åã®%sãå¦ã¹ãã", p_ptr->new_spells, p); } #else msg_format("You can learn %d new %s%s.", p_ptr->new_spells, p, @@ -769,17 +720,8 @@ msg_format(" else item_tester_hook = item_tester_learn_spell; /* Get an item */ -#ifdef JP -q = "¤É¤ÎËܤ«¤é³Ø¤Ó¤Þ¤¹¤«? "; -#else - q = "Study which book? "; -#endif - -#ifdef JP -s = "Æɤá¤ëËܤ¬¤Ê¤¤¡£"; -#else - s = "You have no books that you can read."; -#endif + q = _("ã©ã®æ¬ããå¦ã³ã¾ãã? ", "Study which book? "); + s = _("èªããæ¬ããªãã", "You have no books that you can read."); if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return; @@ -801,11 +743,7 @@ s = " if (o_ptr->tval == REALM2_BOOK) increment = 32; else if (o_ptr->tval != REALM1_BOOK) { -#ifdef JP - if (!get_check("ËÜÅö¤ËËâË¡¤ÎÎΰè¤òÊѹ¹¤·¤Þ¤¹¤«¡©")) return; -#else - if (!get_check("Really, change magic realm? ")) return; -#endif + if (!get_check(_("æ¬å½ã«éæ³ã®é åãå¤æ´ãã¾ããï¼", "Really, change magic realm? "))) return; change_realm2(tval2realm(o_ptr->tval)); increment = 32; } @@ -821,7 +759,7 @@ s = " { /* Ask for a spell, allow cancel */ #ifdef JP - if (!get_spell(&spell, "³Ø¤Ö", sval, FALSE, o_ptr->tval - TV_LIFE_BOOK + 1) + if (!get_spell(&spell, "å¦ã¶", sval, FALSE, o_ptr->tval - TV_LIFE_BOOK + 1) && (spell == -1)) return; #else if (!get_spell(&spell, "study", sval, FALSE, o_ptr->tval - TV_LIFE_BOOK + 1) @@ -863,12 +801,7 @@ s = " if (spell < 0) { /* Message */ -#ifdef JP -msg_format("¤½¤ÎËܤˤϳؤ֤٤%s¤¬¤Ê¤¤¡£", p); -#else - msg_format("You cannot learn any %ss in that book.", p); -#endif - + msg_format(_("ãã®æ¬ã«ã¯å¦ã¶ã¹ã%sããªãã", "You cannot learn any %ss in that book."), p); /* Abort */ return; @@ -898,15 +831,11 @@ msg_format(" if (old_exp >= max_exp) { -#ifdef JP - msg_format("¤½¤Î%s¤Ï´°Á´¤Ë»È¤¤¤³¤Ê¤»¤ë¤Î¤Ç³Ø¤ÖɬÍפϤʤ¤¡£", p); -#else - msg_format("You don't need to study this %s anymore.", p); -#endif + msg_format(_("ãã®%sã¯å®å ¨ã«ä½¿ãããªããã®ã§å¦ã¶å¿ è¦ã¯ãªãã", "You don't need to study this %s anymore."), p); return; } #ifdef JP - if (!get_check(format("%s¤Î%s¤ò¤µ¤é¤Ë³Ø¤Ó¤Þ¤¹¡£¤è¤í¤·¤¤¤Ç¤¹¤«¡©", name, p))) + if (!get_check(format("%sã®%sãããã«å¦ã³ã¾ããããããã§ããï¼", name, p))) #else if (!get_check(format("You will study a %s of %s again. Are you sure? ", p, name))) #endif @@ -934,11 +863,7 @@ msg_format(" p_ptr->spell_exp[spell] = SPELL_EXP_BEGINNER + old_exp / 3; new_rank = EXP_LEVEL_BEGINNER; } -#ifdef JP - msg_format("%s¤Î½ÏÎýÅÙ¤¬%s¤Ë¾å¤¬¤Ã¤¿¡£", name, exp_level_str[new_rank]); -#else - msg_format("Your proficiency of %s is now %s rank.", name, exp_level_str[new_rank]); -#endif + msg_format(_("%sã®ç練度ã%sã«ä¸ãã£ãã", "Your proficiency of %s is now %s rank."), name, exp_level_str[new_rank]); } else { @@ -954,15 +879,15 @@ msg_format(" /* Mention the result */ #ifdef JP - /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½¤ËÂбþ */ + /* è±æ¥åãæ¿ãæ©è½ã«å¯¾å¿ */ if (mp_ptr->spell_book == TV_MUSIC_BOOK) { - msg_format("%s¤ò³Ø¤ó¤À¡£", + msg_format("%sãå¦ãã ã", do_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell % 32, SPELL_NAME)); } else { - msg_format("%s¤Î%s¤ò³Ø¤ó¤À¡£", + msg_format("%sã®%sãå¦ãã ã", do_spell(increment ? p_ptr->realm2 : p_ptr->realm1, spell % 32, SPELL_NAME) ,p); } #else @@ -972,7 +897,7 @@ msg_format(" } /* Take a turn */ - energy_use = 100; + p_ptr->energy_use = 100; switch (mp_ptr->spell_book) { @@ -1001,8 +926,8 @@ msg_format(" { /* Message */ #ifdef JP - if (p_ptr->new_spells < 10) msg_format("¤¢¤È %d ¤Ä¤Î%s¤ò³Ø¤Ù¤ë¡£", p_ptr->new_spells, p); - else msg_format("¤¢¤È %d ¸Ä¤Î%s¤ò³Ø¤Ù¤ë¡£", p_ptr->new_spells, p); + if (p_ptr->new_spells < 10) msg_format("ã㨠%d ã¤ã®%sãå¦ã¹ãã", p_ptr->new_spells, p); + else msg_format("ã㨠%d åã®%sãå¦ã¹ãã", p_ptr->new_spells, p); #else msg_format("You can learn %d more %s%s.", p_ptr->new_spells, p, (p_ptr->new_spells != 1) ? "s" : ""); @@ -1019,17 +944,17 @@ msg_format(" } /*! - * @brief ±¿Ì¿¤ÎÎØ¡¢Ê¤Ӥ˥«¥ª¥¹Åª¤Ê¸ú²Ì¤Îȯư - * @param spell ¥é¥ó¥À¥à¤Ê¸ú²Ì¤òÁªÂò¤¹¤ë¤¿¤á¤Î´ð½àID - * @return ¤Ê¤· + * @brief éå½ã®è¼ªã並ã³ã«ã«ãªã¹çãªå¹æã®çºå + * @param spell ã©ã³ãã ãªå¹æãé¸æããããã®åºæºID + * @return ãªã */ static void wild_magic(int spell) { int counter = 0; - int type = SUMMON_BIZARRE1 + randint0(6); + int type = SUMMON_MOLD + randint0(6); - if (type < SUMMON_BIZARRE1) type = SUMMON_BIZARRE1; - else if (type > SUMMON_BIZARRE6) type = SUMMON_BIZARRE6; + if (type < SUMMON_MOLD) type = SUMMON_MOLD; + else if (type > SUMMON_MIMIC) type = SUMMON_MIMIC; switch (randint1(spell) + randint1(8) + 1) { @@ -1067,7 +992,7 @@ static void wild_magic(int spell) break; case 19: case 20: - trap_creation(py, px); + trap_creation(p_ptr->y, p_ptr->x); break; case 21: case 22: @@ -1079,7 +1004,7 @@ static void wild_magic(int spell) aggravate_monsters(0); break; case 26: - earthquake(py, px, 5); + earthquake(p_ptr->y, p_ptr->x, 5); break; case 27: case 28: @@ -1102,15 +1027,15 @@ static void wild_magic(int spell) case 35: while (counter++ < 8) { - (void)summon_specific(0, py, px, (dun_level * 3) / 2, type, (PM_ALLOW_GROUP | PM_NO_PET)); + (void)summon_specific(0, p_ptr->y, p_ptr->x, (dun_level * 3) / 2, type, (PM_ALLOW_GROUP | PM_NO_PET)); } break; case 36: case 37: - activate_hi_summon(py, px, FALSE); + activate_hi_summon(p_ptr->y, p_ptr->x, FALSE); break; case 38: - (void)summon_cyber(-1, py, px); + (void)summon_cyber(-1, p_ptr->y, p_ptr->x); break; default: { @@ -1125,13 +1050,16 @@ static void wild_magic(int spell) /*! - * @brief ËâË¡¤ò±Ó¾§¤¹¤ë¥³¥Þ¥ó¥É¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó / + * @brief éæ³ãè© å±ããã³ãã³ãã®ã¡ã¤ã³ã«ã¼ãã³ / * Cast a spell - * @return ¤Ê¤· + * @return ãªã */ void do_cmd_cast(void) { - int item, sval, spell, realm; + OBJECT_IDX item; + OBJECT_SUBTYPE_VALUE sval; + SPELL_IDX spell; + REALM_IDX realm; int chance; int increment = 0; int use_realm; @@ -1150,12 +1078,7 @@ void do_cmd_cast(void) /* Require spell ability */ if (!p_ptr->realm1 && (p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_RED_MAGE)) { -#ifdef JP - msg_print("¼öʸ¤ò¾§¤¨¤é¤ì¤Ê¤¤¡ª"); -#else - msg_print("You cannot cast spells!"); -#endif - + msg_print(_("åªæãå±ããããªãï¼", "You cannot cast spells!")); return; } @@ -1165,11 +1088,7 @@ void do_cmd_cast(void) if (p_ptr->pclass == CLASS_FORCETRAINER) confirm_use_force(FALSE); else { -#ifdef JP - msg_print("Ìܤ¬¸«¤¨¤Ê¤¤¡ª"); -#else - msg_print("You cannot see!"); -#endif + msg_print(_("ç®ãè¦ããªãï¼", "You cannot see!")); flush(); } return; @@ -1178,11 +1097,7 @@ void do_cmd_cast(void) /* Not when confused */ if (p_ptr->confused) { -#ifdef JP - msg_print("º®Í𤷤Ƥ¤¤Æ¾§¤¨¤é¤ì¤Ê¤¤¡ª"); -#else - msg_print("You are too confused!"); -#endif + msg_print(_("æ··ä¹±ãã¦ãã¦å±ããããªãï¼", "You are too confused!")); flush(); return; } @@ -1193,11 +1108,7 @@ void do_cmd_cast(void) if (hex_spell_fully()) { bool flag = FALSE; -#ifdef JP - msg_print("¤³¤ì°Ê¾å¿·¤·¤¤¼öʸ¤ò±Ó¾§¤¹¤ë¤³¤È¤Ï¤Ç¤¤Ê¤¤¡£"); -#else - msg_print("Can not spell new spells more."); -#endif + msg_print(_("ãã以ä¸æ°ããåªæãè© å±ãããã¨ã¯ã§ããªãã", "Can not spell new spells more.")); flush(); if (p_ptr->lev >= 35) flag = stop_hex_spell(); if (!flag) return; @@ -1220,17 +1131,8 @@ void do_cmd_cast(void) item_tester_tval = mp_ptr->spell_book; /* Get an item */ -#ifdef JP - q = "¤É¤Î¼öʸ½ñ¤ò»È¤¤¤Þ¤¹¤«? "; -#else - q = "Use which book? "; -#endif - -#ifdef JP - s = "¼öʸ½ñ¤¬¤Ê¤¤¡ª"; -#else - s = "You have no spell books!"; -#endif + q = _("ã©ã®åªææ¸ã使ãã¾ãã? ", "Use which book? "); + s = _("åªææ¸ããªãï¼", "You have no spell books!"); if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) { @@ -1277,10 +1179,10 @@ void do_cmd_cast(void) /* Ask for a spell */ #ifdef JP if (!get_spell(&spell, - ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "±Ó¾§¤¹¤ë" : (mp_ptr->spell_book == TV_MUSIC_BOOK) ? "²Î¤¦" : "¾§¤¨¤ë"), + ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "è© å±ãã" : (mp_ptr->spell_book == TV_MUSIC_BOOK) ? "æã" : "å±ãã"), sval, TRUE, realm)) { - if (spell == -2) msg_format("¤½¤ÎËܤˤÏÃΤäƤ¤¤ë%s¤¬¤Ê¤¤¡£", prayer); + if (spell == -2) msg_format("ãã®æ¬ã«ã¯ç¥ã£ã¦ãã%sããªãã", prayer); return; } #else @@ -1301,11 +1203,7 @@ void do_cmd_cast(void) { if (hex_spelling(spell)) { -#ifdef JP - msg_print("¤½¤Î¼öʸ¤Ï¤¹¤Ç¤Ë±Ó¾§Ãæ¤À¡£"); -#else - msg_print("You are already casting it."); -#endif + msg_print(_("ãã®åªæã¯ãã§ã«è© å±ä¸ã ã", "You are already casting it.")); return; } } @@ -1329,8 +1227,8 @@ void do_cmd_cast(void) /* Warning */ #ifdef JP -msg_format("¤½¤Î%s¤ò%s¤Î¤Ë½½Ê¬¤Ê¥Þ¥¸¥Ã¥¯¥Ý¥¤¥ó¥È¤¬¤Ê¤¤¡£",prayer, - ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "±Ó¾§¤¹¤ë" : (mp_ptr->spell_book == TV_LIFE_BOOK) ? "²Î¤¦" : "¾§¤¨¤ë")); +msg_format("ãã®%sã%sã®ã«ååãªãã¸ãã¯ãã¤ã³ãããªãã",prayer, + ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "è© å±ãã" : (mp_ptr->spell_book == TV_LIFE_BOOK) ? "æã" : "å±ãã")); #else msg_format("You do not have enough mana to %s this %s.", ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "recite" : "cast"), @@ -1341,12 +1239,7 @@ msg_format(" if (!over_exert) return; /* Verify */ -#ifdef JP - if (!get_check_strict("¤½¤ì¤Ç¤âÄ©À路¤Þ¤¹¤«? ", CHECK_OKAY_CANCEL)) return; -#else - if (!get_check_strict("Attempt it anyway? ", CHECK_OKAY_CANCEL)) return; -#endif - + if (!get_check_strict(_("ããã§ãææ¦ãã¾ãã? ", "Attempt it anyway? "), CHECK_OKAY_CANCEL)) return; } /* Spell failure chance */ @@ -1367,13 +1260,8 @@ msg_format(" if (randint0(100) < chance) { if (flush_failure) flush(); - -#ifdef JP -msg_format("%s¤ò¤¦¤Þ¤¯¾§¤¨¤é¤ì¤Ê¤«¤Ã¤¿¡ª", prayer); -#else - msg_format("You failed to get the %s off!", prayer); -#endif - + + msg_format(_("%sããã¾ãå±ããããªãã£ãï¼", "You failed to get the %s off!"), prayer); sound(SOUND_FAIL); switch (realm) @@ -1407,12 +1295,7 @@ msg_format("%s if ((o_ptr->tval == TV_CHAOS_BOOK) && (randint1(100) < spell)) { -#ifdef JP -msg_print("¥«¥ª¥¹Åª¤Ê¸ú²Ì¤òȯÀ¸¤·¤¿¡ª"); -#else - msg_print("You produce a chaotic effect!"); -#endif - + msg_print(_("ã«ãªã¹çãªå¹æãçºçããï¼", "You produce a chaotic effect!")); wild_magic(spell); } else if ((o_ptr->tval == TV_DEATH_BOOK) && (randint1(100) < spell)) @@ -1423,17 +1306,8 @@ msg_print(" } else { -#ifdef JP - msg_print("Äˤ¤¡ª"); -#else - msg_print("It hurts!"); -#endif - -#ifdef JP - take_hit(DAMAGE_LOSELIFE, damroll(o_ptr->sval + 1, 6), "°Å¹õËâË¡¤ÎµÕή", -1); -#else - take_hit(DAMAGE_LOSELIFE, damroll(o_ptr->sval + 1, 6), "a miscast Death spell", -1); -#endif + msg_print(_("çãï¼", "It hurts!")); + take_hit(DAMAGE_LOSELIFE, damroll(o_ptr->sval + 1, 6), _("æé»éæ³ã®éæµ", "a miscast Death spell"), -1); if ((spell > 15) && one_in_(6) && !p_ptr->hold_exp) lose_exp(spell * 250); @@ -1441,12 +1315,7 @@ msg_print(" } else if ((o_ptr->tval == TV_MUSIC_BOOK) && (randint1(200) < spell)) { -#ifdef JP -msg_print("¤¤¤ä¤Ê²»¤¬¶Á¤¤¤¿"); -#else -msg_print("An infernal sound echoed."); -#endif - + msg_print(_("ãããªé³ãé¿ãã", "An infernal sound echoed.")); aggravate_monsters(0); } if (randint1(100) >= chance) @@ -1592,7 +1461,7 @@ msg_print("An infernal sound echoed."); } /* Take a turn */ - energy_use = 100; + p_ptr->energy_use = 100; /* Over-exert the player */ @@ -1605,12 +1474,7 @@ msg_print("An infernal sound echoed."); p_ptr->csp_frac = 0; /* Message */ -#ifdef JP -msg_print("Àº¿À¤ò½¸Ã椷¤¹¤®¤Æµ¤¤ò¼º¤Ã¤Æ¤·¤Þ¤Ã¤¿¡ª"); -#else - msg_print("You faint from the effort!"); -#endif - + msg_print(_("ç²¾ç¥ãéä¸ãããã¦æ°ã失ã£ã¦ãã¾ã£ãï¼", "You faint from the effort!")); /* Hack -- Bypass free action */ (void)set_paralyzed(p_ptr->paralyzed + randint1(5 * oops + 1)); @@ -1646,12 +1510,7 @@ msg_print(" bool perm = (randint0(100) < 25); /* Message */ -#ifdef JP -msg_print("ÂΤò°¤¯¤·¤Æ¤·¤Þ¤Ã¤¿¡ª"); -#else - msg_print("You have damaged your health!"); -#endif - + msg_print(_("ä½ãæªããã¦ãã¾ã£ãï¼", "You have damaged your health!")); /* Reduce constitution */ (void)dec_stat(A_CON, 15 + randint1(10), perm); @@ -1664,12 +1523,12 @@ msg_print(" } /*! - * @brief ¥Ú¥Ã¥È¤Ë¤Ê¤Ã¤Æ¤¤¤ë¥â¥ó¥¹¥¿¡¼¤ò¥½¡¼¥È¤¹¤ë¤¿¤á¤ÎÈæ³Ó½èÍý - * @param u ¥â¥ó¥¹¥¿¡¼¤Î¹½Â¤ÂÎÇÛÎó - * @param v ̤»ÈÍÑ - * @param a Èæ³ÓÂоݤΥâ¥ó¥¹¥¿¡¼ID1 - * @param b Èæ³ÓÂоݤΥâ¥ó¥¹¥¿¡¼ID2 - * @return 2ÈÖÌܤ¬Âç¤Ê¤é¤ÐTRUE¤òÊÖ¤¹ + * @brief ãããã«ãªã£ã¦ããã¢ã³ã¹ã¿ã¼ãã½ã¼ãããããã®æ¯è¼å¦ç + * @param u ã¢ã³ã¹ã¿ã¼ã®æ§é ä½é å + * @param v æªä½¿ç¨ + * @param a æ¯è¼å¯¾è±¡ã®ã¢ã³ã¹ã¿ã¼ID1 + * @param b æ¯è¼å¯¾è±¡ã®ã¢ã³ã¹ã¿ã¼ID2 + * @return 2çªç®ã大ãªãã°TRUEãè¿ã */ static bool ang_sort_comp_pet_dismiss(vptr u, vptr v, int a, int b) { @@ -1708,10 +1567,10 @@ static bool ang_sort_comp_pet_dismiss(vptr u, vptr v, int a, int b) } /*! - * @brief ¥Ú¥Ã¥È¤ÎÁ±°Â°À¤Ë±þ¤¸¤¿°Ý»ý¥³¥¹¥È¤ÎÅÓÃæ·×»»½èÍý - * @param m_ptr ·×»»´ð½à¤È¤Ê¤ë¥â¥ó¥¹¥¿¡¼¤Î¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿ - * @param inc m_ptr¤Ç»ØÄꤷ¤¿¥â¥ó¥¹¥¿¡¼¤ò°Ý»ý¥³¥¹¥È·×»»¤Ë²Ã¤¨¤ë¤Ê¤éTRUE¡¢³°¤¹¤Ê¤éFALSE¤ò»ØÄê - * @return ¤Ê¤· + * @brief ãããã®åæªå±æ§ã«å¿ããç¶æã³ã¹ãã®éä¸è¨ç®å¦ç + * @param m_ptr è¨ç®åºæºã¨ãªãã¢ã³ã¹ã¿ã¼ã®æ§é ä½åç §ãã¤ã³ã¿ + * @param inc m_ptrã§æå®ããã¢ã³ã¹ã¿ã¼ãç¶æã³ã¹ãè¨ç®ã«å ãããªãTRUEãå¤ããªãFALSEãæå® + * @return ãªã */ void check_pets_num_and_align(monster_type *m_ptr, bool inc) { @@ -1735,13 +1594,13 @@ void check_pets_num_and_align(monster_type *m_ptr, bool inc) } /*! - * @brief ¥Ú¥Ã¥È¤Î°Ý»ý¥³¥¹¥È·×»» - * @return °Ý»ý¥³¥¹¥È(%) + * @brief ãããã®ç¶æã³ã¹ãè¨ç® + * @return ç¶æã³ã¹ã(%) */ int calculate_upkeep(void) { s32b old_friend_align = friend_align; - int m_idx; + MONSTER_IDX m_idx; bool have_a_unique = FALSE; s32b total_friend_levels = 0; @@ -1797,17 +1656,18 @@ int calculate_upkeep(void) } /*! - * @brief ¥Ú¥Ã¥È¤ò³«Êü¤¹¤ë¥³¥Þ¥ó¥É¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó - * @return ¤Ê¤· + * @brief ããããéæ¾ããã³ãã³ãã®ã¡ã¤ã³ã«ã¼ãã³ + * @return ãªã */ void do_cmd_pet_dismiss(void) { monster_type *m_ptr; bool all_pets = FALSE; - int pet_ctr, i; + MONSTER_IDX pet_ctr; + int i; int Dismissed = 0; - u16b *who; + MONSTER_IDX *who; u16b dummy_why; int max_pet = 0; int cu, cv; @@ -1818,7 +1678,7 @@ void do_cmd_pet_dismiss(void) Term->scr->cv = 1; /* Allocate the "who" array */ - C_MAKE(who, max_m_idx, u16b); + C_MAKE(who, max_m_idx, MONSTER_IDX); /* Process the monsters (backwards) */ for (pet_ctr = m_max - 1; pet_ctr >= 1; pet_ctr--) @@ -1856,7 +1716,7 @@ void do_cmd_pet_dismiss(void) /* Hack -- handle stuff */ handle_stuff(); - msg_format(_("%s¤òÊü¤·¤Þ¤¹¤«¡© [Yes/No/Unnamed (%dÂÎ)]","Dismiss %s? [Yes/No/Unnamed (%d remain)]"), friend_name, max_pet - i); + msg_format(_("%sãæ¾ãã¾ããï¼ [Yes/No/Unnamed (%dä½)]","Dismiss %s? [Yes/No/Unnamed (%d remain)]"), friend_name, max_pet - i); if (m_ptr->ml) move_cursor_relative(m_ptr->fy, m_ptr->fx); @@ -1871,7 +1731,7 @@ void do_cmd_pet_dismiss(void) if (kakunin) { - msg_format(_("ËÜÅö¤Ë¤è¤í¤·¤¤¤Ç¤¹¤«¡© (%s) ","Are you sure? (%s) "), friend_name); + msg_format(_("æ¬å½ã«ããããã§ããï¼ (%s) ","Are you sure? (%s) "), friend_name); ch = inkey(); if (ch != 'Y' && ch != 'y') delete_this = FALSE; @@ -1904,7 +1764,7 @@ void do_cmd_pet_dismiss(void) if (pet_ctr == p_ptr->riding) { - msg_format(_("%s¤«¤é¹ß¤ê¤¿¡£","You have got off %s. "), friend_name); + msg_format(_("%sããéããã","You have got off %s. "), friend_name); p_ptr->riding = 0; @@ -1914,7 +1774,7 @@ void do_cmd_pet_dismiss(void) } /* HACK : Add the line to message buffer */ - msg_format(_("%s ¤òÊü¤·¤¿¡£","Dismissed %s."), friend_name); + msg_format(_("%s ãæ¾ããã","Dismissed %s."), friend_name); p_ptr->window |= (PW_MESSAGE); window_stuff(); @@ -1927,33 +1787,29 @@ void do_cmd_pet_dismiss(void) Term->scr->cv = cv; Term_fresh(); - C_KILL(who, max_m_idx, u16b); + C_KILL(who, max_m_idx, MONSTER_IDX); #ifdef JP - msg_format("%d ÂΤΥڥåȤòÊü¤·¤Þ¤·¤¿¡£", Dismissed); + msg_format("%d ä½ã®ããããæ¾ãã¾ããã", Dismissed); #else msg_format("You have dismissed %d pet%s.", Dismissed, (Dismissed == 1 ? "" : "s")); #endif if (Dismissed == 0 && all_pets) -#ifdef JP - msg_print("'U'nnamed ¤Ï¡¢¾èÇϰʳ°¤Î̾Á°¤Î¤Ê¤¤¥Ú¥Ã¥È¤À¤±¤òÁ´¤Æ²òÊü¤·¤Þ¤¹¡£"); -#else - msg_print("'U'nnamed means all your pets except named pets and your mount."); -#endif + msg_print(_("'U'nnamed ã¯ãä¹é¦¬ä»¥å¤ã®ååã®ãªããããã ããå ¨ã¦è§£æ¾ãã¾ãã", "'U'nnamed means all your pets except named pets and your mount.")); } /*! - * @brief ¥×¥ì¥¤¥ä¡¼¤Îµ³¾è/²¼ÇϽèÍýȽÄê - * @param c_ptr ¥×¥ì¥¤¥ä¡¼¤Î°ÜÆ°Àè¥Þ¥¹¤Î¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿ - * @param now_riding TRUE¤Ê¤é²¼ÇϽèÍý¡¢FALSE¤Ê¤é¤Ðµ³¾è½èÍý - * @return ²Äǽ¤Ê¤é¤ÐTRUE¤òÊÖ¤¹ + * @brief ãã¬ã¤ã¤ã¼ã®é¨ä¹/ä¸é¦¬å¦çå¤å® + * @param c_ptr ãã¬ã¤ã¤ã¼ã®ç§»åå ãã¹ã®æ§é ä½åç §ãã¤ã³ã¿ + * @param now_riding TRUEãªãä¸é¦¬å¦çãFALSEãªãã°é¨ä¹å¦ç + * @return å¯è½ãªãã°TRUEãè¿ã */ static bool player_can_ride_aux(cave_type *c_ptr, bool now_riding) { bool p_can_enter; bool old_character_xtra = character_xtra; - int old_riding = p_ptr->riding; + MONSTER_IDX old_riding = p_ptr->riding; bool old_riding_ryoute = p_ptr->riding_ryoute; bool old_old_riding_ryoute = p_ptr->old_riding_ryoute; bool old_pf_ryoute = (p_ptr->pet_extra_flags & PF_RYOUTE) ? TRUE : FALSE; @@ -1987,12 +1843,12 @@ static bool player_can_ride_aux(cave_type *c_ptr, bool now_riding) } /*! - * @brief ¥×¥ì¥¤¥ä¡¼¤ÎÍîÇÏȽÄê½èÍý - * @param dam ÍîÇÏȽÄê¤òȯ¤·¤¿ºÝ¤Ë¼õ¤±¤¿¥À¥á¡¼¥¸ÎÌ - * @param force TRUE¤Ê¤é¤Ð¶¯À©Åª¤ËÍîÇϤ¹¤ë - * @return ¼ÂºÝ¤ËÍîÇϤ·¤¿¤éTRUE¤òÊÖ¤¹ + * @brief ãã¬ã¤ã¤ã¼ã®è½é¦¬å¤å®å¦ç + * @param dam è½é¦¬å¤å®ãçºããéã«åãããã¡ã¼ã¸é + * @param force TRUEãªãã°å¼·å¶çã«è½é¦¬ãã + * @return å®éã«è½é¦¬ãããTRUEãè¿ã */ -bool rakuba(int dam, bool force) +bool rakuba(HIT_POINT dam, bool force) { int i, y, x, oy, ox; int sn = 0, sy = 0, sx = 0; @@ -2012,7 +1868,7 @@ bool rakuba(int dam, bool force) int max = s_info[p_ptr->pclass].s_max[GINOU_RIDING]; int ridinglevel = r_ptr->level; - /* ÍîÇϤΤ·¤ä¤¹¤µ */ + /* è½é¦¬ã®ãããã */ int rakubalevel = r_ptr->level; if (p_ptr->riding_ryoute) rakubalevel += 20; @@ -2029,7 +1885,7 @@ bool rakuba(int dam, bool force) p_ptr->skill_exp[GINOU_RIDING] = MIN(max, cur + inc); } - /* ¥ì¥Ù¥ë¤ÎÄ㤤¾èÇϤ«¤é¤ÏÍîÇϤ·¤Ë¤¯¤¤ */ + /* ã¬ãã«ã®ä½ãä¹é¦¬ããã¯è½é¦¬ãã«ãã */ if (randint0(dam / 2 + rakubalevel * 2) < cur / 30 + 10) { if ((((p_ptr->pclass == CLASS_BEASTMASTER) || (p_ptr->pclass == CLASS_CAVALRY)) && !p_ptr->riding_ryoute) || !one_in_(p_ptr->lev*(p_ptr->riding_ryoute ? 2 : 3) + 30)) @@ -2045,8 +1901,8 @@ bool rakuba(int dam, bool force) cave_type *c_ptr; /* Access the location */ - y = py + ddy_ddd[i]; - x = px + ddx_ddd[i]; + y = p_ptr->y + ddy_ddd[i]; + x = p_ptr->x + ddx_ddd[i]; c_ptr = &cave[y][x]; @@ -2073,8 +1929,8 @@ bool rakuba(int dam, bool force) { monster_desc(m_name, m_ptr, 0); #ifdef JP -msg_format("%s¤«¤é¿¶¤êÍî¤È¤µ¤ì¤½¤¦¤Ë¤Ê¤Ã¤Æ¡¢Êɤˤ֤Ĥ«¤Ã¤¿¡£",m_name); - take_hit(DAMAGE_NOESCAPE, r_ptr->level+3, "Êɤؤξ×ÆÍ", -1); +msg_format("%sããæ¯ãè½ã¨ããããã«ãªã£ã¦ãå£ã«ã¶ã¤ãã£ãã",m_name); + take_hit(DAMAGE_NOESCAPE, r_ptr->level+3, "å£ã¸ã®è¡çª", -1); #else msg_format("You have nearly fallen from %s, but bumped into wall.",m_name); take_hit(DAMAGE_NOESCAPE, r_ptr->level+3, "bumping into wall", -1); @@ -2082,17 +1938,17 @@ msg_format("%s return FALSE; } - oy = py; - ox = px; + oy = p_ptr->y; + ox = p_ptr->x; - py = sy; - px = sx; + p_ptr->y = sy; + p_ptr->x = sx; /* Redraw the old spot */ lite_spot(oy, ox); /* Redraw the new spot */ - lite_spot(py, px); + lite_spot(p_ptr->y, p_ptr->x); /* Check for new panel */ verify_panel(); @@ -2120,33 +1976,25 @@ msg_format("%s if (p_ptr->levitation && !force) { monster_desc(m_name, m_ptr, 0); -#ifdef JP - msg_format("%s¤«¤éÍî¤Á¤¿¤¬¡¢¶õÃæ¤Ç¤¦¤Þ¤¯ÂÎÀª¤òΩ¤Æľ¤·¤ÆÃåÃϤ·¤¿¡£",m_name); -#else - msg_format("You are thrown from %s, but make a good landing.",m_name); -#endif + msg_format(_("%sããè½ã¡ããã空ä¸ã§ãã¾ãä½å¢ãç«ã¦ç´ãã¦çå°ããã", "You are thrown from %s, but make a good landing."),m_name); } else { -#ifdef JP - take_hit(DAMAGE_NOESCAPE, r_ptr->level+3, "ÍîÇÏ", -1); -#else - take_hit(DAMAGE_NOESCAPE, r_ptr->level+3, "Falling from riding", -1); -#endif + take_hit(DAMAGE_NOESCAPE, r_ptr->level+3, _("è½é¦¬", "Falling from riding"), -1); fall_dam = TRUE; } /* Move the player */ if (sy && !p_ptr->is_dead) - (void)move_player_effect(py, px, MPE_DONT_PICKUP | MPE_DONT_SWAP_MON); + (void)move_player_effect(p_ptr->y, p_ptr->x, MPE_DONT_PICKUP | MPE_DONT_SWAP_MON); return fall_dam; } /*! - * @brief ¥Ú¥Ã¥È¤«¤éµ³¾è/²¼ÇϤ¹¤ë¥³¥Þ¥ó¥É¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó / - * @param force ¶¯À©Åª¤Ëµ³¾è/²¼ÇϤ¹¤ë¤Ê¤é¤ÐTRUE - * @return µ³¾è/²¼ÇϤǤ¤¿¤éTRUE + * @brief ãããããé¨ä¹/ä¸é¦¬ããã³ãã³ãã®ã¡ã¤ã³ã«ã¼ãã³ / + * @param force å¼·å¶çã«é¨ä¹/ä¸é¦¬ãããªãã°TRUE + * @return é¨ä¹/ä¸é¦¬ã§ãããTRUE */ bool do_riding(bool force) { @@ -2155,8 +2003,8 @@ bool do_riding(bool force) monster_type *m_ptr; if (!get_rep_dir2(&dir)) return FALSE; - y = py + ddy[dir]; - x = px + ddx[dir]; + y = p_ptr->y + ddy[dir]; + x = p_ptr->x + ddx[dir]; c_ptr = &cave[y][x]; if (p_ptr->special_defense & KATA_MUSOU) set_action(ACTION_NONE); @@ -2166,27 +2014,19 @@ bool do_riding(bool force) /* Skip non-empty grids */ if (!player_can_ride_aux(c_ptr, FALSE)) { -#ifdef JP - msg_print("¤½¤Á¤é¤Ë¤Ï¹ß¤ê¤é¤ì¤Þ¤»¤ó¡£"); -#else - msg_print("You cannot go to that direction."); -#endif + msg_print(_("ãã¡ãã«ã¯éãããã¾ããã", "You cannot go to that direction.")); return FALSE; } - if (!pattern_seq(py, px, y, x)) return FALSE; + if (!pattern_seq(p_ptr->y, p_ptr->x, y, x)) return FALSE; if (c_ptr->m_idx) { /* Take a turn */ - energy_use = 100; + p_ptr->energy_use = 100; /* Message */ -#ifdef JP - msg_print("¥â¥ó¥¹¥¿¡¼¤¬Î©¤Á¤Õ¤µ¤¬¤Ã¤Æ¤¤¤ë¡ª"); -#else - msg_print("There is a monster in the way!"); -#endif + msg_print(_("ã¢ã³ã¹ã¿ã¼ãç«ã¡ãµããã£ã¦ããï¼", "There is a monster in the way!")); py_attack(y, x, 0); return FALSE; @@ -2200,11 +2040,7 @@ bool do_riding(bool force) { if (p_ptr->confused) { -#ifdef JP - msg_print("º®Í𤷤Ƥ¤¤Æ¾è¤ì¤Ê¤¤¡ª"); -#else - msg_print("You are too confused!"); -#endif + msg_print(_("æ··ä¹±ãã¦ãã¦ä¹ããªãï¼", "You are too confused!")); return FALSE; } @@ -2212,46 +2048,31 @@ bool do_riding(bool force) if (!c_ptr->m_idx || !m_ptr->ml) { -#ifdef JP - msg_print("¤½¤Î¾ì½ê¤Ë¤Ï¥â¥ó¥¹¥¿¡¼¤Ï¤¤¤Þ¤»¤ó¡£"); -#else - msg_print("Here is no monster."); -#endif - + msg_print(_("ãã®å ´æã«ã¯ã¢ã³ã¹ã¿ã¼ã¯ãã¾ããã", "Here is no monster.")); return FALSE; } if (!is_pet(m_ptr) && !force) { -#ifdef JP - msg_print("¤½¤Î¥â¥ó¥¹¥¿¡¼¤Ï¥Ú¥Ã¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"); -#else - msg_print("That monster is not a pet."); -#endif - + msg_print(_("ãã®ã¢ã³ã¹ã¿ã¼ã¯ãããã§ã¯ããã¾ããã", "That monster is not a pet.")); return FALSE; } if (!(r_info[m_ptr->r_idx].flags7 & RF7_RIDING)) { -#ifdef JP - msg_print("¤½¤Î¥â¥ó¥¹¥¿¡¼¤Ë¤Ï¾è¤ì¤Ê¤µ¤½¤¦¤À¡£"); -#else - msg_print("This monster doesn't seem suitable for riding."); -#endif - + msg_print(_("ãã®ã¢ã³ã¹ã¿ã¼ã«ã¯ä¹ããªãããã ã", "This monster doesn't seem suitable for riding.")); return FALSE; } - if (!pattern_seq(py, px, y, x)) return FALSE; + if (!pattern_seq(p_ptr->y, p_ptr->x, y, x)) return FALSE; if (!player_can_ride_aux(c_ptr, TRUE)) { /* Feature code (applying "mimic" field) */ feature_type *f_ptr = &f_info[get_feat_mimic(c_ptr)]; #ifdef JP - msg_format("¤½¤Î¥â¥ó¥¹¥¿¡¼¤Ï%s¤Î%s¤Ë¤¤¤ë¡£", f_name + f_ptr->name, + msg_format("ãã®ã¢ã³ã¹ã¿ã¼ã¯%sã®%sã«ããã", f_name + f_ptr->name, ((!have_flag(f_ptr->flags, FF_MOVE) && !have_flag(f_ptr->flags, FF_CAN_FLY)) || (!have_flag(f_ptr->flags, FF_LOS) && !have_flag(f_ptr->flags, FF_TREE))) ? - "Ãæ" : "¾å"); + "ä¸" : "ä¸"); #else msg_format("This monster is %s the %s.", ((!have_flag(f_ptr->flags, FF_MOVE) && !have_flag(f_ptr->flags, FF_CAN_FLY)) || @@ -2263,14 +2084,8 @@ bool do_riding(bool force) } if (r_info[m_ptr->r_idx].level > randint1((p_ptr->skill_exp[GINOU_RIDING] / 50 + p_ptr->lev / 2 + 20))) { -#ifdef JP - msg_print("¤¦¤Þ¤¯¾è¤ì¤Ê¤«¤Ã¤¿¡£"); -#else - msg_print("You failed to ride."); -#endif - - energy_use = 100; - + msg_print(_("ãã¾ãä¹ããªãã£ãã", "You failed to ride.")); + p_ptr->energy_use = 100; return FALSE; } @@ -2279,11 +2094,7 @@ bool do_riding(bool force) char m_name[80]; monster_desc(m_name, m_ptr, 0); (void)set_monster_csleep(c_ptr->m_idx, 0); -#ifdef JP - msg_format("%s¤òµ¯¤³¤·¤¿¡£", m_name); -#else - msg_format("You have waked %s up.", m_name); -#endif + msg_format(_("%sãèµ·ãããã", "You have waked %s up."), m_name); } if (p_ptr->action == ACTION_KAMAE) set_action(ACTION_NONE); @@ -2294,7 +2105,7 @@ bool do_riding(bool force) if (p_ptr->riding == p_ptr->health_who) health_track(0); } - energy_use = 100; + p_ptr->energy_use = 100; /* Mega-Hack -- Forget the view and lite */ p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE); @@ -2314,8 +2125,8 @@ bool do_riding(bool force) } /*! - * @brief ¥Ú¥Ã¥È¤Ë̾Á°¤ò¤Ä¤±¤ë¥³¥Þ¥ó¥É¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó - * @return ¤Ê¤· + * @brief ãããã«ååãã¤ããã³ãã³ãã®ã¡ã¤ã³ã«ã¼ãã³ + * @return ãªã */ static void do_name_pet(void) { @@ -2340,31 +2151,18 @@ static void do_name_pet(void) if (!is_pet(m_ptr)) { /* Message */ -#ifdef JP - msg_print("¤½¤Î¥â¥ó¥¹¥¿¡¼¤Ï¥Ú¥Ã¥È¤Ç¤Ï¤Ê¤¤¡£"); -#else - msg_format("This monster is not a pet."); -#endif + msg_print(_("ãã®ã¢ã³ã¹ã¿ã¼ã¯ãããã§ã¯ãªãã", "This monster is not a pet.")); return; } if (r_info[m_ptr->r_idx].flags1 & RF1_UNIQUE) { -#ifdef JP - msg_print("¤½¤Î¥â¥ó¥¹¥¿¡¼¤Î̾Á°¤ÏÊѤ¨¤é¤ì¤Ê¤¤¡ª"); -#else - msg_format("You cannot change name of this monster!"); -#endif + msg_print(_("ãã®ã¢ã³ã¹ã¿ã¼ã®ååã¯å¤ããããªãï¼", "You cannot change name of this monster!")); return; } monster_desc(m_name, m_ptr, 0); /* Message */ -#ifdef JP - msg_format("%s¤Ë̾Á°¤ò¤Ä¤±¤ë¡£", m_name); -#else - msg_format("Name %s.", m_name); -#endif - + msg_format(_("%sã«ååãã¤ããã", "Name %s."), m_name); msg_print(NULL); /* Start with nothing */ @@ -2379,12 +2177,7 @@ static void do_name_pet(void) } /* Get a new inscription (possibly empty) */ -#ifdef JP - if (get_string("̾Á°: ", out_val, 15)) -#else - if (get_string("Name: ", out_val, 15)) -#endif - + if (get_string(_("åå: ", "Name: "), out_val, 15)) { if (out_val[0]) { @@ -2392,8 +2185,6 @@ static void do_name_pet(void) m_ptr->nickname = quark_add(out_val); if (record_named_pet) { - char m_name[80]; - monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_NAME, m_name); } @@ -2402,8 +2193,6 @@ static void do_name_pet(void) { if (record_named_pet && old_name) { - char m_name[80]; - monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_UNNAME, m_name); } @@ -2415,13 +2204,13 @@ static void do_name_pet(void) /*! - * @brief ¥Ú¥Ã¥È¤Ë´Ø¤¹¤ë¥³¥Þ¥ó¥É¥ê¥¹¥È¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó / + * @brief ãããã«é¢ããã³ãã³ããªã¹ãã®ã¡ã¤ã³ã«ã¼ãã³ / * Issue a pet command - * @return ¤Ê¤· + * @return ãªã */ void do_cmd_pet(void) { - int i = 0; + SPELL_IDX i = 0; int num; int powers[36]; cptr power_desc[36]; @@ -2440,202 +2229,109 @@ void do_cmd_pet(void) num = 0; -#ifdef JP - power_desc[num] = "¥Ú¥Ã¥È¤òÊü¤¹"; -#else - power_desc[num] = "dismiss pets"; -#endif - + power_desc[num] = _("ããããæ¾ã", "dismiss pets"); powers[num++] = PET_DISMISS; #ifdef JP - sprintf(target_buf, "¥Ú¥Ã¥È¤Î¥¿¡¼¥²¥Ã¥È¤ò»ØÄê (¸½ºß¡§%s)", - (pet_t_m_idx ? (p_ptr->image ? "²¿¤«´ñ̯¤Êʪ" : (r_name + r_info[m_list[pet_t_m_idx].ap_r_idx].name)) : "»ØÄê¤Ê¤·")); + sprintf(target_buf, "ãããã®ã¿ã¼ã²ãããæå® (ç¾å¨ï¼%s)", + (pet_t_m_idx ? (p_ptr->image ? "ä½ãå¥å¦ãªç©" : (r_name + r_info[m_list[pet_t_m_idx].ap_r_idx].name)) : "æå®ãªã")); #else sprintf(target_buf, "specify a target of pet (now:%s)", (pet_t_m_idx ? (p_ptr->image ? "something strange" : (r_name + r_info[m_list[pet_t_m_idx].ap_r_idx].name)) : "nothing")); #endif power_desc[num] = target_buf; - powers[num++] = PET_TARGET; - -#ifdef JP - power_desc[num] = "¶á¤¯¤Ë¤¤¤í"; -#else - power_desc[num] = "stay close"; -#endif + power_desc[num] = _("è¿ãã«ãã", "stay close"); if (p_ptr->pet_follow_distance == PET_CLOSE_DIST) mode = num; powers[num++] = PET_STAY_CLOSE; - -#ifdef JP - power_desc[num] = "¤Ä¤¤¤ÆÍ褤"; -#else - power_desc[num] = "follow me"; -#endif + power_desc[num] = _("ã¤ãã¦æ¥ã", "follow me"); if (p_ptr->pet_follow_distance == PET_FOLLOW_DIST) mode = num; powers[num++] = PET_FOLLOW_ME; - -#ifdef JP - power_desc[num] = "Ũ¤ò¸«¤Ä¤±¤ÆÅݤ»"; -#else - power_desc[num] = "seek and destroy"; -#endif + power_desc[num] = _("æµãè¦ã¤ãã¦åã", "seek and destroy"); if (p_ptr->pet_follow_distance == PET_DESTROY_DIST) mode = num; powers[num++] = PET_SEEK_AND_DESTROY; - -#ifdef JP - power_desc[num] = "¾¯¤·Î¥¤ì¤Æ¤¤¤í"; -#else - power_desc[num] = "give me space"; -#endif + power_desc[num] = _("å°ãé¢ãã¦ãã", "give me space"); if (p_ptr->pet_follow_distance == PET_SPACE_DIST) mode = num; powers[num++] = PET_ALLOW_SPACE; - -#ifdef JP - power_desc[num] = "Î¥¤ì¤Æ¤¤¤í"; -#else - power_desc[num] = "stay away"; -#endif + power_desc[num] = _("é¢ãã¦ãã", "stay away"); if (p_ptr->pet_follow_distance == PET_AWAY_DIST) mode = num; powers[num++] = PET_STAY_AWAY; if (p_ptr->pet_extra_flags & PF_OPEN_DOORS) { -#ifdef JP - power_desc[num] = "¥É¥¢¤ò³«¤±¤ë (¸½ºß:ON)"; -#else - power_desc[num] = "pets open doors (now On)"; -#endif + power_desc[num] = _("ãã¢ãéãã (ç¾å¨:ON)", "pets open doors (now On)"); } else { -#ifdef JP - power_desc[num] = "¥É¥¢¤ò³«¤±¤ë (¸½ºß:OFF)"; -#else - power_desc[num] = "pets open doors (now Off)"; -#endif + power_desc[num] = _("ãã¢ãéãã (ç¾å¨:OFF)", "pets open doors (now Off)"); } powers[num++] = PET_OPEN_DOORS; if (p_ptr->pet_extra_flags & PF_PICKUP_ITEMS) { -#ifdef JP - power_desc[num] = "¥¢¥¤¥Æ¥à¤ò½¦¤¦ (¸½ºß:ON)"; -#else - power_desc[num] = "pets pick up items (now On)"; -#endif + power_desc[num] = _("ã¢ã¤ãã ãæ¾ã (ç¾å¨:ON)", "pets pick up items (now On)"); } else { -#ifdef JP - power_desc[num] = "¥¢¥¤¥Æ¥à¤ò½¦¤¦ (¸½ºß:OFF)"; -#else - power_desc[num] = "pets pick up items (now Off)"; -#endif + power_desc[num] = _("ã¢ã¤ãã ãæ¾ã (ç¾å¨:OFF)", "pets pick up items (now Off)"); } powers[num++] = PET_TAKE_ITEMS; if (p_ptr->pet_extra_flags & PF_TELEPORT) { -#ifdef JP - power_desc[num] = "¥Æ¥ì¥Ý¡¼¥È·ÏËâË¡¤ò»È¤¦ (¸½ºß:ON)"; -#else - power_desc[num] = "allow teleport (now On)"; -#endif + power_desc[num] = _("ãã¬ãã¼ãç³»éæ³ã使ã (ç¾å¨:ON)", "allow teleport (now On)"); } else { -#ifdef JP - power_desc[num] = "¥Æ¥ì¥Ý¡¼¥È·ÏËâË¡¤ò»È¤¦ (¸½ºß:OFF)"; -#else - power_desc[num] = "allow teleport (now Off)"; -#endif + power_desc[num] = _("ãã¬ãã¼ãç³»éæ³ã使ã (ç¾å¨:OFF)", "allow teleport (now Off)"); } powers[num++] = PET_TELEPORT; if (p_ptr->pet_extra_flags & PF_ATTACK_SPELL) { -#ifdef JP - power_desc[num] = "¹¶·âËâË¡¤ò»È¤¦ (¸½ºß:ON)"; -#else - power_desc[num] = "allow cast attack spell (now On)"; -#endif + power_desc[num] = _("æ»æéæ³ã使ã (ç¾å¨:ON)", "allow cast attack spell (now On)"); } else { -#ifdef JP - power_desc[num] = "¹¶·âËâË¡¤ò»È¤¦ (¸½ºß:OFF)"; -#else - power_desc[num] = "allow cast attack spell (now Off)"; -#endif + power_desc[num] = _("æ»æéæ³ã使ã (ç¾å¨:OFF)", "allow cast attack spell (now Off)"); } powers[num++] = PET_ATTACK_SPELL; if (p_ptr->pet_extra_flags & PF_SUMMON_SPELL) { -#ifdef JP - power_desc[num] = "¾¤´ËâË¡¤ò»È¤¦ (¸½ºß:ON)"; -#else - power_desc[num] = "allow cast summon spell (now On)"; -#endif + power_desc[num] = _("å¬åéæ³ã使ã (ç¾å¨:ON)", "allow cast summon spell (now On)"); } else { -#ifdef JP - power_desc[num] = "¾¤´ËâË¡¤ò»È¤¦ (¸½ºß:OFF)"; -#else - power_desc[num] = "allow cast summon spell (now Off)"; -#endif + power_desc[num] = _("å¬åéæ³ã使ã (ç¾å¨:OFF)", "allow cast summon spell (now Off)"); } powers[num++] = PET_SUMMON_SPELL; if (p_ptr->pet_extra_flags & PF_BALL_SPELL) { -#ifdef JP - power_desc[num] = "¥×¥ì¥¤¥ä¡¼¤ò´¬¤¹þ¤àÈÏ°ÏËâË¡¤ò»È¤¦ (¸½ºß:ON)"; -#else - power_desc[num] = "allow involve player in area spell (now On)"; -#endif + power_desc[num] = _("ãã¬ã¤ã¤ã¼ãå·»ãè¾¼ãç¯å²éæ³ã使ã (ç¾å¨:ON)", "allow involve player in area spell (now On)"); } else { -#ifdef JP - power_desc[num] = "¥×¥ì¥¤¥ä¡¼¤ò´¬¤¹þ¤àÈÏ°ÏËâË¡¤ò»È¤¦ (¸½ºß:OFF)"; -#else - power_desc[num] = "allow involve player in area spell (now Off)"; -#endif + power_desc[num] = _("ãã¬ã¤ã¤ã¼ãå·»ãè¾¼ãç¯å²éæ³ã使ã (ç¾å¨:OFF)", "allow involve player in area spell (now Off)"); } powers[num++] = PET_BALL_SPELL; if (p_ptr->riding) { -#ifdef JP - power_desc[num] = "¥Ú¥Ã¥È¤«¤é¹ß¤ê¤ë"; -#else - power_desc[num] = "get off a pet"; -#endif + power_desc[num] = _("ãããããéãã", "get off a pet"); } else { -#ifdef JP - power_desc[num] = "¥Ú¥Ã¥È¤Ë¾è¤ë"; -#else - power_desc[num] = "ride a pet"; -#endif + power_desc[num] = _("ãããã«ä¹ã", "ride a pet"); } powers[num++] = PET_RIDING; - -#ifdef JP - power_desc[num] = "¥Ú¥Ã¥È¤Ë̾Á°¤ò¤Ä¤±¤ë"; -#else - power_desc[num] = "name pets"; -#endif - + power_desc[num] = _("ãããã«ååãã¤ãã", "name pets"); powers[num++] = PET_NAME; if (p_ptr->riding) @@ -2647,19 +2343,11 @@ void do_cmd_pet(void) { if (p_ptr->pet_extra_flags & PF_RYOUTE) { -#ifdef JP - power_desc[num] = "Éð´ï¤òÊÒ¼ê¤Ç»ý¤Ä"; -#else - power_desc[num] = "use one hand to control a riding pet"; -#endif + power_desc[num] = _("æ¦å¨ãçæã§æã¤", "use one hand to control a riding pet"); } else { -#ifdef JP - power_desc[num] = "Éð´ï¤òξ¼ê¤Ç»ý¤Ä"; -#else - power_desc[num] = "use both hands for a weapon"; -#endif + power_desc[num] = _("æ¦å¨ã両æã§æã¤", "use both hands for a weapon"); } powers[num++] = PET_RYOUTE; @@ -2675,19 +2363,11 @@ void do_cmd_pet(void) { if (p_ptr->pet_extra_flags & PF_RYOUTE) { -#ifdef JP - power_desc[num] = "ÊÒ¼ê¤Ç³ÊÆ®¤¹¤ë"; -#else - power_desc[num] = "use one hand to control a riding pet"; -#endif + power_desc[num] = _("çæã§æ ¼éãã", "use one hand to control a riding pet"); } else { -#ifdef JP - power_desc[num] = "ξ¼ê¤Ç³ÊÆ®¤¹¤ë"; -#else - power_desc[num] = "use both hands for melee"; -#endif + power_desc[num] = _("両æã§æ ¼éãã", "use both hands for melee"); } powers[num++] = PET_RYOUTE; @@ -2696,19 +2376,11 @@ void do_cmd_pet(void) { if (p_ptr->pet_extra_flags & PF_RYOUTE) { -#ifdef JP - power_desc[num] = "³ÊÆ®¤ò¹Ô¤ï¤Ê¤¤"; -#else - power_desc[num] = "use one hand to control a riding pet"; -#endif + power_desc[num] = _("æ ¼éãè¡ããªã", "use one hand to control a riding pet"); } else { -#ifdef JP - power_desc[num] = "³ÊÆ®¤ò¹Ô¤¦"; -#else - power_desc[num] = "use one hand for melee"; -#endif + power_desc[num] = _("æ ¼éãè¡ã", "use one hand for melee"); } powers[num++] = PET_RYOUTE; @@ -2735,21 +2407,13 @@ void do_cmd_pet(void) screen_save(); /* Build a prompt */ -#ifdef JP - strnfmt(out_val, 78, "(¥³¥Þ¥ó¥É¡¢ESC=½ªÎ») ¥³¥Þ¥ó¥É¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤:"); -#else - strnfmt(out_val, 78, "(Command, ESC=exit) Choose command from menu."); -#endif + strnfmt(out_val, 78, _("(ã³ãã³ããESC=çµäº) ã³ãã³ããé¸ãã§ãã ãã:", "(Command, ESC=exit) Choose command from menu.")); } else { /* Build a prompt */ strnfmt(out_val, 78, -#ifdef JP - "(¥³¥Þ¥ó¥É %c-%c¡¢'*'=°ìÍ÷¡¢ESC=½ªÎ») ¥³¥Þ¥ó¥É¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤:", -#else - "(Command %c-%c, *=List, ESC=exit) Select a command: ", -#endif + _("(ã³ãã³ã %c-%cã'*'=ä¸è¦§ãESC=çµäº) ã³ãã³ããé¸ãã§ãã ãã:", "(Command %c-%c, *=List, ESC=exit) Select a command: "), I2A(0), I2A(num - 1)); } @@ -2827,12 +2491,10 @@ void do_cmd_pet(void) for (ctr = 0; ctr < num; ctr++) { /* Letter/number for power selection */ -#ifdef JP - if (use_menu) sprintf(buf, "%c%s ", (ctr == mode) ? '*' : ' ', (ctr == (menu_line - 1)) ? "¡Õ" : " "); -#else - if (use_menu) sprintf(buf, "%c%s ", (ctr == mode) ? '*' : ' ', (ctr == (menu_line - 1)) ? "> " : " "); -#endif - else sprintf(buf, "%c%c) ", (ctr == mode) ? '*' : ' ', I2A(ctr)); + if (use_menu) + sprintf(buf, "%c%s ", (ctr == mode) ? '*' : ' ', (ctr == (menu_line - 1)) ? _("ã", "> ") : " "); + else + sprintf(buf, "%c%c) ", (ctr == mode) ? '*' : ' ', I2A(ctr)); strcat(buf, power_desc[ctr]); @@ -2862,7 +2524,7 @@ void do_cmd_pet(void) ask = (isupper(choice)); /* Lowercase */ - if (ask) choice = tolower(choice); + if (ask) choice = (char)tolower(choice); /* Extract request */ i = (islower(choice) ? A2I(choice) : -1); @@ -2879,11 +2541,7 @@ void do_cmd_pet(void) if (ask) { /* Prompt */ -#ifdef JP - strnfmt(buf, 78, "%s¤ò»È¤¤¤Þ¤¹¤«¡© ", power_desc[i]); -#else - strnfmt(buf, 78, "Use %s? ", power_desc[i]); -#endif + strnfmt(buf, 78, _("%sã使ãã¾ããï¼ ", "Use %s? "), power_desc[i]); /* Belay that order */ if (!get_check(buf)) continue; @@ -2899,7 +2557,7 @@ void do_cmd_pet(void) /* Abort if needed */ if (!flag) { - energy_use = 0; + p_ptr->energy_use = 0; return; } @@ -2921,11 +2579,7 @@ void do_cmd_pet(void) if (!pet_ctr) { -#ifdef JP - msg_print("¥Ú¥Ã¥È¤¬¤¤¤Ê¤¤¡ª"); -#else - msg_print("You have no pets!"); -#endif + msg_print(_("ããããããªãï¼", "You have no pets!")); break; } do_cmd_pet_dismiss();