[Refactor] #37353 targeting.h を作成して 宣言を移動．

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

diff --git a/src/spells3.c b/src/spells3.c
index 7616133..f516d77 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -15,13 +15,16 @@
 #include "bldg.h"
 #include "util.h"
 
+#include "dungeon.h"
 #include "floor.h"
+#include "floor-town.h"
 #include "object-boost.h"
 #include "object-flavor.h"
 #include "object-hook.h"
 #include "melee.h"
 #include "player-move.h"
 #include "player-status.h"
+#include "player-class.h"
 #include "spells-summon.h"
 #include "quest.h"
 #include "artifact.h"
@@ -33,13 +36,19 @@
 #include "monster-status.h"
 #include "monster-spell.h"
 #include "cmd-spell.h"
+#include "cmd-dump.h"
 #include "snipe.h"
 #include "floor-save.h"
 #include "files.h"
 #include "player-effects.h"
+#include "player-skill.h"
 #include "view-mainwindow.h"
 #include "mind.h"
 #include "wild.h"
+#include "world.h"
+#include "objectkind.h"
+#include "autopick.h"
+#include "targeting.h"
 
 
 /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */
@@ -369,7 +378,7 @@ bool teleport_player_aux(POSITION dis, BIT_FLAGS mode)
        sound(SOUND_TELEPORT);
 
 #ifdef JP
-       if ((p_ptr->pseikaku == SEIKAKU_COMBAT) || (inventory[INVEN_BOW].name1 == ART_CRIMSON))
+       if ((p_ptr->pseikaku == SEIKAKU_COMBAT) || (p_ptr->inventory_list[INVEN_BOW].name1 == ART_CRIMSON))
                msg_format("『こっちだぁ、%s』", p_ptr->name);
 #endif
 
@@ -538,7 +547,7 @@ void teleport_away_followable(MONSTER_IDX m_idx)
 
                        for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
                        {
-                               o_ptr = &inventory[i];
+                               o_ptr = &p_ptr->inventory_list[i];
                                if (o_ptr->k_idx && !object_is_cursed(o_ptr))
                                {
                                        object_flags(o_ptr, flgs);
@@ -1016,7 +1025,7 @@ bool apply_disenchant(BIT_FLAGS mode)
                case 8: t = INVEN_FEET; break;
        }
 
-       o_ptr = &inventory[t];
+       o_ptr = &p_ptr->inventory_list[t];
 
        /* No item, nothing happens */
        if (!o_ptr->k_idx) return (FALSE);
@@ -1591,9 +1600,7 @@ void identify_pack(void)
        /* Simply identify and know every item */
        for (i = 0; i < INVEN_TOTAL; i++)
        {
-               object_type *o_ptr = &inventory[i];
-
-               /* Skip non-objects */
+               object_type *o_ptr = &p_ptr->inventory_list[i];
                if (!o_ptr->k_idx) continue;
 
                identify_item(o_ptr);
@@ -1621,7 +1628,7 @@ static int enchant_table[16] =
 
 /*!
  * @brief 装備の解呪処理 /
- * Removes curses from items in inventory
+ * Removes curses from items in p_ptr->inventory_list
  * @param all 軽い呪いまでの解除ならば0
  * @return 解呪されたアイテムの数
  * @details
@@ -1641,9 +1648,7 @@ static int remove_curse_aux(int all)
        /* Attempt to uncurse items being worn */
        for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
        {
-               object_type *o_ptr = &inventory[i];
-
-               /* Skip non-objects */
+               object_type *o_ptr = &p_ptr->inventory_list[i];
                if (!o_ptr->k_idx) continue;
 
                /* Uncursed already */
@@ -1934,7 +1939,7 @@ bool enchant(object_type *o_ptr, int n, int eflag)
 
 /*!
  * @brief 装備修正強化処理のメインルーチン /
- * Enchant an item (in the inventory or on the floor)
+ * Enchant an item (in the p_ptr->inventory_list or on the floor)
  * @param num_hit 命中修正量
  * @param num_dam ダメージ修正量
  * @param num_ac AC修正量
@@ -2145,7 +2150,7 @@ bool identify_item(object_type *o_ptr)
 
 /*!
  * @brief アイテム鑑定のメインルーチン処理 /
- * Identify an object in the inventory (or on the floor)
+ * Identify an object in the p_ptr->inventory_list (or on the floor)
  * @param only_equip 装備品のみを対象とするならばTRUEを返す
  * @return 実際に鑑定を行ったならばTRUEを返す
  * @details
@@ -2210,12 +2215,12 @@ bool ident_spell(bool only_equip)
 
 /*!
  * @brief アイテム凡庸化のメインルーチン処理 /
- * Identify an object in the inventory (or on the floor)
+ * Identify an object in the p_ptr->inventory_list (or on the floor)
  * @param only_equip 装備品のみを対象とするならばTRUEを返す
  * @return 実際に凡庸化をを行ったならばTRUEを返す
  * @details
  * <pre>
- * Mundanify an object in the inventory (or on the floor)
+ * Mundanify an object in the p_ptr->inventory_list (or on the floor)
  * This routine does *not* automatically combine objects.
  * Returns TRUE if something was mundanified, else FALSE.
  * </pre>
@@ -2261,11 +2266,11 @@ bool mundane_spell(bool only_equip)
 
 /*!
  * @brief アイテム*鑑定*のメインルーチン処理 /
- * Identify an object in the inventory (or on the floor)
+ * Identify an object in the p_ptr->inventory_list (or on the floor)
  * @param only_equip 装備品のみを対象とするならばTRUEを返す
  * @return 実際に鑑定を行ったならばTRUEを返す
  * @details
- * Fully "identify" an object in the inventory  -BEN-
+ * Fully "identify" an object in the p_ptr->inventory_list  -BEN-
  * This routine returns TRUE if an item was identified.
  */
 bool identify_fully(bool only_equip)
@@ -2571,7 +2576,7 @@ bool recharge(int power)
                                if (o_ptr->tval == TV_ROD) o_ptr->timeout = (o_ptr->number - 1) * k_ptr->pval;
                                if (o_ptr->tval == TV_WAND) o_ptr->pval = 0;
 
-                               /* Reduce and describe inventory */
+                               /* Reduce and describe p_ptr->inventory_list */
                                if (item >= 0)
                                {
                                        inven_item_increase(item, -1);
@@ -2596,7 +2601,7 @@ bool recharge(int power)
                                else
                                        msg_format(_("乱暴な魔法のために%sが壊れた！", "Wild magic consumes your %s!"), o_name);
 
-                               /* Reduce and describe inventory */
+                               /* Reduce and describe p_ptr->inventory_list */
                                if (item >= 0)
                                {
                                        inven_item_increase(item, -999);
@@ -3643,7 +3648,7 @@ bool eat_magic(int power)
                                        msg_format(_("乱暴な魔法のために%sが何本か壊れた！", "Wild magic consumes your %s!"), o_name);
                                }
                                
-                               /* Reduce and describe inventory */
+                               /* Reduce and describe p_ptr->inventory_list */
                                if (item >= 0)
                                {
                                        inven_item_increase(item, -1);
@@ -3668,7 +3673,7 @@ bool eat_magic(int power)
                                else
                                        msg_format(_("乱暴な魔法のために%sが壊れた！", "Wild magic consumes your %s!"), o_name);
 
-                               /* Reduce and describe inventory */
+                               /* Reduce and describe p_ptr->inventory_list */
                                if (item >= 0)
                                {
                                        inven_item_increase(item, -999);
@@ -3950,7 +3955,7 @@ void blood_curse_to_enemy(MONSTER_IDX m_idx)
                        if (pet) mode |= PM_FORCE_PET;
                        else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
 
-                       count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev * 2 / 3 + randint1(p_ptr->lev / 2) : current_floor_ptr->dun_level), 0, mode, '\0');
+                       count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev * 2 / 3 + randint1(p_ptr->lev / 2) : current_floor_ptr->dun_level), 0, mode);
                        if (!one_in_(6)) break;
                }
                case 23: case 24: case 25:
@@ -4098,7 +4103,7 @@ bool tele_town(void)
        }
 
        p_ptr->leaving = TRUE;
-       leave_bldg = TRUE;
+       p_ptr->leave_bldg = TRUE;
        p_ptr->teleport_town = TRUE;
        screen_load();
        return TRUE;