[Refactor] #37353 mon_take_hit() のコメントアウト済落馬処理を削除。 / Delete comment outed process...

[hengband/hengband.git] / src / cmd-magiceat.c

diff --git a/src/cmd-magiceat.c b/src/cmd-magiceat.c
index c96d35f..c7b2746 100644 (file)
--- a/src/cmd-magiceat.c
+++ b/src/cmd-magiceat.c
@@ -75,7 +75,6 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse)
 
        int menu_line = (use_menu ? 1 : 0);
 
-#ifdef ALLOW_REPEAT
        COMMAND_CODE sn;
        if (repeat_pull(&sn))
        {
@@ -86,8 +85,6 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse)
                        return sn;
        }
        
-#endif /* ALLOW_REPEAT */
-
        for (i = 0; i < 108; i++)
        {
                if (p_ptr->magic_num2[i]) break;
@@ -213,10 +210,10 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse)
                        byte y, x = 0;
                        OBJECT_SUBTYPE_VALUE ctr;
                        PERCENTAGE chance;
-                       IDX k_idx;
+                       KIND_OBJECT_IDX k_idx;
                        char dummy[80];
                        POSITION x1, y1;
-                       int level;
+                       DEPTH level;
                        byte col;
 
                        strcpy(dummy, "");
@@ -498,9 +495,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse)
 
        if (!flag) return -1;
 
-#ifdef ALLOW_REPEAT
        repeat_push(ext+i);
-#endif /* ALLOW_REPEAT */
        return ext+i;
 }
 
@@ -517,7 +512,7 @@ bool do_cmd_magic_eater(bool only_browse, bool powerful)
        OBJECT_SUBTYPE_VALUE item;
        PERCENTAGE chance;
        DEPTH level;
-       IDX k_idx;
+       KIND_OBJECT_IDX k_idx;
        OBJECT_TYPE_VALUE tval;
        OBJECT_SUBTYPE_VALUE sval;
        bool use_charge = TRUE;