OSDN Git Service

[Refactor] #37353 monster1~monster-hook間整理。 / Refactor between monster1 and monster...
[hengband/hengband.git] / src / mutation.c
index f47cae7..73d46dd 100644 (file)
  */
 bool gain_random_mutation(int choose_mut)
 {
-       int     attempts_left = 20;
-       cptr    muta_desc = "";
-       bool    muta_chosen = FALSE;
-       u32b    muta_which = 0;
-       u32b    *muta_class = NULL;
+       int attempts_left = 20;
+       cptr muta_desc = "";
+       bool muta_chosen = FALSE;
+       BIT_FLAGS muta_which = 0;
+       BIT_FLAGS *muta_class = NULL;
 
        if (choose_mut) attempts_left = 1;
 
@@ -862,8 +862,8 @@ bool lose_mutation(int choose_mut)
        int attempts_left = 20;
        cptr muta_desc = "";
        bool muta_chosen = FALSE;
-       u32b muta_which = 0;
-       u32b *muta_class = NULL;
+       BIT_FLAGS muta_which = 0;
+       BIT_FLAGS *muta_class = NULL;
 
        if (choose_mut) attempts_left = 1;
 
@@ -2019,23 +2019,6 @@ void do_cmd_knowledge_mutations(void)
        fd_kill(file_name);
 }
 
-/*!
- * @brief 符号なし32ビット整数のビット数を返す。
- * @param x ビット数を調べたい変数
- * @return ビット数
- */
-int count_bits(BIT_FLAGS x)
-{
-       int n = 0;
-
-       if (x) do
-       {
-               n++;
-       }
-       while (0 != (x = x&(x-1)));
-
-       return (n);
-}
 
 /*!
  * @brief 現在プレイヤー得ている突然変異の数を返す。
@@ -2157,68 +2140,7 @@ bool mutation_power_aux(int power)
                        break;
 
                case MUT1_EAT_ROCK:
-                       {
-                               POSITION x, y;
-                               cave_type *c_ptr;
-                               feature_type *f_ptr, *mimic_f_ptr;
-
-                               if (!get_rep_dir2(&dir)) return FALSE;
-                               y = p_ptr->y + ddy[dir];
-                               x = p_ptr->x + ddx[dir];
-                               c_ptr = &cave[y][x];
-                               f_ptr = &f_info[c_ptr->feat];
-                               mimic_f_ptr = &f_info[get_feat_mimic(c_ptr)];
-
-                               stop_mouth();
-
-                               if (!have_flag(mimic_f_ptr->flags, FF_HURT_ROCK))
-                               {
-                                       msg_print(_("この地形は食べられない。", "You cannot eat this feature."));
-                                       break;
-                               }
-                               else if (have_flag(f_ptr->flags, FF_PERMANENT))
-                               {
-                                       msg_format(_("いてっ!この%sはあなたの歯より硬い!", "Ouch!  This %s is harder than your teeth!"), f_name + mimic_f_ptr->name);
-                                       break;
-                               }
-                               else if (c_ptr->m_idx)
-                               {
-                                       monster_type *m_ptr = &m_list[c_ptr->m_idx];
-                                       msg_print(_("何かが邪魔しています!", "There's something in the way!"));
-
-                                       if (!m_ptr->ml || !is_pet(m_ptr)) py_attack(y, x, 0);
-                                       break;
-                               }
-                               else if (have_flag(f_ptr->flags, FF_TREE))
-                               {
-                                       msg_print(_("木の味は好きじゃない!", "You don't like the woody taste!"));
-                                       break;
-                               }
-                               else if (have_flag(f_ptr->flags, FF_GLASS))
-                               {
-                                       msg_print(_("ガラスの味は好きじゃない!", "You don't like the glassy taste!"));
-                                       break;
-                               }
-                               else if (have_flag(f_ptr->flags, FF_DOOR) || have_flag(f_ptr->flags, FF_CAN_DIG))
-                               {
-                                       (void)set_food(p_ptr->food + 3000);
-                               }
-                               else if (have_flag(f_ptr->flags, FF_MAY_HAVE_GOLD) || have_flag(f_ptr->flags, FF_HAS_GOLD))
-                               {
-                                       (void)set_food(p_ptr->food + 5000);
-                               }
-                               else
-                               {
-                                       msg_format(_("この%sはとてもおいしい!", "This %s is very filling!"), f_name + mimic_f_ptr->name);
-                                       (void)set_food(p_ptr->food + 10000);
-                               }
-
-                               /* Destroy the wall */
-                               cave_alter_feat(y, x, FF_HURT_ROCK);
-
-                               /* Move the player */
-                               (void)move_player_effect(y, x, MPE_DONT_PICKUP);
-                       }
+                       return eat_lock();
                        break;
 
                case MUT1_SWAP_POS:
@@ -2274,7 +2196,7 @@ bool mutation_power_aux(int power)
                /* Summon pet molds around the player */
                case MUT1_GROW_MOLD:
                        {
-                               int i;
+                               DIRECTION i;
                                for (i = 0; i < 8; i++)
                                {
                                        summon_specific(-1, p_ptr->y, p_ptr->x, lvl, SUMMON_MOLD, PM_FORCE_PET);
@@ -2358,8 +2280,7 @@ bool mutation_power_aux(int power)
                                cave_type *c_ptr;
                                monster_type *m_ptr;
                                monster_race *r_ptr;
-
-                               if (!get_rep_dir2(&dir)) return FALSE;
+                               if (!get_direction(&dir, FALSE, FALSE)) return FALSE;
                                y = p_ptr->y + ddy[dir];
                                x = p_ptr->x + ddx[dir];
                                c_ptr = &cave[y][x];
@@ -2384,11 +2305,9 @@ bool mutation_power_aux(int power)
                                        if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                                        {
                                                char m_name[80];
-
                                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                                do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
                                        }
-
                                        /* Delete the monster, rather than killing it. */
                                        delete_monster_idx(c_ptr->m_idx);
                                        msg_print(_("その邪悪なモンスターは硫黄臭い煙とともに消え去った!", "The evil creature vanishes in a puff of sulfurous smoke!"));
@@ -2406,12 +2325,10 @@ bool mutation_power_aux(int power)
                        {
                                POSITION x, y;
                                cave_type *c_ptr;
-
-                               if (!get_rep_dir2(&dir)) return FALSE;
+                               if (!get_direction(&dir, FALSE, FALSE)) return FALSE;
                                y = p_ptr->y + ddy[dir];
                                x = p_ptr->x + ddx[dir];
                                c_ptr = &cave[y][x];
-
                                if (!c_ptr->m_idx)
                                {
                                        msg_print(_("あなたは何もない場所で手を振った。", "You wave your hands in the air."));
@@ -2422,7 +2339,7 @@ bool mutation_power_aux(int power)
                        }
                        break;
 
-               /* XXX_XXX_XXX Hack!  MUT1_LAUNCHER is negative, see above */
+               /* XXX_XXX_XXX Hack! MUT1_LAUNCHER is negative, see above */
                case 3: /* MUT1_LAUNCHER */
                        /* Gives a multiplier of 2 at first, up to 3 at 40th */
                        if (!do_cmd_throw(2 + lvl / 40, FALSE, -1)) return FALSE;