#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

[hengband/hengband.git] / src / cmd5.c

diff --git a/src/cmd5.c b/src/cmd5.c
index 872fcaf..0c31983 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -18,7 +18,7 @@
  * @param tval 魔法書のtval
  * @return 領域魔法の技能名称を保管した文字列ポインタ
  */
-cptr spell_category_name(int tval)
+cptr spell_category_name(OBJECT_TYPE_VALUE tval)
 {
        switch (tval)
        {
@@ -64,7 +64,7 @@ bool select_the_force = FALSE;
  * The "known" should be TRUE for cast/pray, FALSE for study
  * </pre>
  */
-static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm)
+static int get_spell(int *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, int use_realm)
 {
        int         i;
        int         spell = -1;
@@ -612,7 +612,7 @@ void do_cmd_browse(void)
  * @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];
@@ -1655,7 +1655,8 @@ void do_cmd_pet_dismiss(void)
 {
        monster_type    *m_ptr;
        bool            all_pets = FALSE;
-       int pet_ctr, i;
+       IDX pet_ctr;
+       int i;
        int Dismissed = 0;
 
        u16b *who;
@@ -2176,8 +2177,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);
                                }
@@ -2186,8 +2185,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);
                                }