spell_categoly_name()を何度も呼ぶ必要のない部分の整理. また, 関数名自

体のtypo fix. ("categoly" -> "category")

diff --git a/src/cmd5.c b/src/cmd5.c
index ee6540e..559ae20 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -14,7 +14,7 @@
 
 #include "spellstips.h"
 
-cptr spell_categoly_name(int tval)
+cptr spell_category_name(int tval)
 {
        switch (tval)
        {
@@ -86,7 +86,7 @@ static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm
 
 #endif /* ALLOW_REPEAT -- TNB */
 
-       p = spell_categoly_name(mp_ptr->spell_book);
+       p = spell_category_name(mp_ptr->spell_book);
 
        /* Extract spells */
        for (spell = 0; spell < 32; spell++)
@@ -583,7 +583,7 @@ void do_cmd_study(void)
        /* Spells of realm2 will have an increment of +32 */
        int     spell = -1;
 
-       cptr p = spell_categoly_name(mp_ptr->spell_book);
+       cptr p = spell_category_name(mp_ptr->spell_book);
 
        object_type *o_ptr;
 
@@ -638,8 +638,6 @@ msg_format("
                set_action(ACTION_NONE);
        }
 
-       p = spell_categoly_name(mp_ptr->spell_book);
-
 #ifdef JP
        if( p_ptr->new_spells < 10 ){
                msg_format("¤¢¤È %d ¤Ä¤Î%s¤ò³Ø¤Ù¤ë¡£", p_ptr->new_spells, p);
@@ -789,16 +787,16 @@ msg_format("
                if (old_exp >= max_exp)
                {
 #ifdef JP
-                       msg_format("¤½¤Î%s¤Ï´°Á´¤Ë»È¤¤¤³¤Ê¤»¤ë¤Î¤Ç³Ø¤ÖɬÍפϤʤ¤¡£", spell_categoly_name(mp_ptr->spell_book));
+                       msg_format("¤½¤Î%s¤Ï´°Á´¤Ë»È¤¤¤³¤Ê¤»¤ë¤Î¤Ç³Ø¤ÖɬÍפϤʤ¤¡£", p);
 #else
-                       msg_format("You don't need to study this %s anymore.", spell_categoly_name(mp_ptr->spell_book));
+                       msg_format("You don't need to study this %s anymore.", p);
 #endif
                        return;
                }
 #ifdef JP
-               if (!get_check(format("%s¤Î%s¤ò¤µ¤é¤Ë³Ø¤Ó¤Þ¤¹¡£¤è¤í¤·¤¤¤Ç¤¹¤«¡©", name, spell_categoly_name(mp_ptr->spell_book))))
+               if (!get_check(format("%s¤Î%s¤ò¤µ¤é¤Ë³Ø¤Ó¤Þ¤¹¡£¤è¤í¤·¤¤¤Ç¤¹¤«¡©", name, p)))
 #else
-               if (!get_check(format("You will study a %s of %s again. Are you sure? ", spell_categoly_name(mp_ptr->spell_book), name)))
+               if (!get_check(format("You will study a %s of %s again. Are you sure? ", p, name)))
 #endif
                {
                        return;
@@ -4713,7 +4711,7 @@ msg_print("
                return;
        }
 
-       prayer = spell_categoly_name(mp_ptr->spell_book);
+       prayer = spell_category_name(mp_ptr->spell_book);
 
        /* Restrict choices to spell books */
        item_tester_tval = mp_ptr->spell_book;

diff --git a/src/externs.h b/src/externs.h
index 7c0fb88..8413393 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -684,7 +684,7 @@ extern void do_cmd_checkquest(void);
 extern void do_cmd_time(void);
 
 /* cmd5.c */
-extern cptr spell_categoly_name(int tval);
+extern cptr spell_category_name(int tval);
 extern void do_cmd_browse(void);
 extern void do_cmd_study(void);
 extern void stop_singing(void);

diff --git a/src/xtra1.c b/src/xtra1.c
index d1dc81e..d58bfda 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -2082,7 +2082,7 @@ static void calc_spells(void)
                return;
        }
 
-       p = spell_categoly_name(mp_ptr->spell_book);
+       p = spell_category_name(mp_ptr->spell_book);
 
        /* Determine the number of spells allowed */
        levels = p_ptr->lev - mp_ptr->spell_first + 1;