#37287 #37353 (2.2.0.89) BACT_IDX, BACT_RESTRICT_IDX 型を定義し、型の置換を継続中。LNK4075を修正。 ...

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

diff --git a/src/cmd5.c b/src/cmd5.c
index 456d73f..ec5604c 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -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(COMMAND_CODE *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX use_realm)
+static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX use_realm)
 {
        int         i;
        SPELL_IDX   spell = -1;
@@ -471,10 +471,10 @@ void do_cmd_browse(void)
        REALM_IDX use_realm = 0;
        int j, line;
        SPELL_IDX spell = -1;
-       int             num = 0;
+       int num = 0;
 
-       int             spells[64];
-       char    temp[62*4];
+       SPELL_IDX spells[64];
+       char temp[62*4];
 
        object_type     *o_ptr;
 
@@ -1062,15 +1062,12 @@ void do_cmd_cast(void)
        REALM_IDX realm;
        int     chance;
        int     increment = 0;
-       int     use_realm;
-       int     need_mana;
+       REALM_IDX use_realm;
+       MANA_POINT need_mana;
 
        cptr prayer;
-
        object_type     *o_ptr;
-
        const magic_type *s_ptr;
-
        cptr q, s;
 
        bool over_exerted = FALSE;
@@ -2220,7 +2217,7 @@ void do_cmd_pet(void)
        int                     pet_ctr;
        monster_type    *m_ptr;
 
-       int mode = 0;
+       PET_COMMAND_IDX mode = 0;
 
        char buf[160];
        char target_buf[160];
@@ -2477,7 +2474,7 @@ void do_cmd_pet(void)
                        if (!redraw || use_menu)
                        {
                                byte y = 1, x = 0;
-                               int ctr = 0;
+                               PET_COMMAND_IDX ctr = 0;
 
                                /* Show list */
                                redraw = TRUE;