#37287 #37353 (2.2.0.89) ROOM_IDX 型を定義し、型の置換を継続中。 / Define ROOM_IDX, ongoing type...

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

diff --git a/src/cmd5.c b/src/cmd5.c
index bece6a1..456d73f 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -64,14 +64,14 @@ bool select_the_force = FALSE;
  * The "known" should be TRUE for cast/pray, FALSE for study
  * </pre>
  */
-static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX 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;
-       int         spells[64];
+       MANA_POINT  need_mana;
+       SPELL_IDX   spells[64];
        bool        flag, redraw, okay;
        char        choice;
        const magic_type  *s_ptr;
@@ -466,7 +466,8 @@ static void confirm_use_force(bool browse_only)
  */
 void do_cmd_browse(void)
 {
-       int             item, sval;
+       OBJECT_IDX item;
+       OBJECT_SUBTYPE_VALUE sval;
        REALM_IDX use_realm = 0;
        int j, line;
        SPELL_IDX spell = -1;
@@ -656,7 +657,8 @@ static void change_realm2(CHARACTER_IDX next_realm)
  */
 void do_cmd_study(void)
 {
-       int     i, item;
+       int     i;
+       OBJECT_IDX item;
        OBJECT_SUBTYPE_VALUE sval;
        int     increment = 0;
        bool    learned = FALSE;
@@ -1054,7 +1056,7 @@ static void wild_magic(int spell)
  */
 void do_cmd_cast(void)
 {
-       int     item;
+       OBJECT_IDX item;
        OBJECT_SUBTYPE_VALUE sval;
        SPELL_IDX spell;
        REALM_IDX realm;
@@ -1668,7 +1670,7 @@ void do_cmd_pet_dismiss(void)
        MONSTER_IDX *who;
        u16b dummy_why;
        int max_pet = 0;
-       int cu, cv;
+       bool_hack cu, cv;
 
        cu = Term->scr->cu;
        cv = Term->scr->cv;
@@ -1846,7 +1848,7 @@ static bool player_can_ride_aux(cave_type *c_ptr, bool now_riding)
  * @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;
@@ -2208,7 +2210,7 @@ static void do_name_pet(void)
  */
 void do_cmd_pet(void)
 {
-       SPELL_IDX i = 0;
+       COMMAND_CODE i = 0;
        int                     num;
        int                     powers[36];
        cptr                    power_desc[36];