#37784 summon_specific()で特定種族を指定しない(type=0)時はPM_ALLOW_UNIQUEを指定しなくても、ユニークを候補に入れてしまう不具...

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

diff --git a/src/cmd2.c b/src/cmd2.c
index bbd673c..1bb5471 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -471,7 +471,7 @@ static void chest_death(bool scatter, int y, int x, s16b o_idx)
        int number;
 
        bool small;
-       u32b mode = AM_GOOD;
+       BIT_FLAGS mode = AM_GOOD;
 
        object_type forge;
        object_type *q_ptr;
@@ -578,7 +578,7 @@ static void chest_death(bool scatter, int y, int x, s16b o_idx)
  * Note that the chest itself is never destroyed.
  * </pre>
  */
-static void chest_trap(int y, int x, s16b o_idx)
+static void chest_trap(POSITION y, POSITION x, KIND_OBJECT_IDX o_idx)
 {
        int  i, trap;
 
@@ -2512,7 +2512,7 @@ void do_cmd_walk(bool pickup)
        }
 
        /* Get a "repeated" direction */
-       if (get_rep_dir(&dir,FALSE))
+       if (get_rep_dir(&dir, FALSE))
        {
                /* Take a turn */
                p_ptr->energy_use = 100;
@@ -2637,7 +2637,7 @@ void do_cmd_rest(void)
 
        set_action(ACTION_NONE);
 
-       if ((p_ptr->pclass == CLASS_BARD) && (p_ptr->magic_num1[0] || p_ptr->magic_num1[1]))
+       if ((p_ptr->pclass == CLASS_BARD) && (SINGING_SONG_EFFECT(p_ptr) || INTERUPTING_SONG_EFFECT(p_ptr)))
        {
                stop_singing();
        }
@@ -2663,13 +2663,13 @@ void do_cmd_rest(void)
                /* Rest until done */
                if (out_val[0] == '&')
                {
-                       command_arg = (-2);
+                       command_arg = COMMAND_ARG_REST_UNTIL_DONE;
                }
 
                /* Rest a lot */
                else if (out_val[0] == '*')
                {
-                       command_arg = (-1);
+                       command_arg = COMMAND_ARG_REST_FULL_HEALING;
                }
 
                /* Rest some */