[Refactor] #38862 Moved object*.c/h to object/

[hengband/hengband.git] / src / spells-object.c

diff --git a/src/spells-object.c b/src/spells-object.c
index 76529fa..68dbaf3 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -4,14 +4,14 @@
 
 #include "cmd-basic.h"
 #include "artifact.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "grid.h"
-#include "spells.h"
+#include "spell/spells3.h"
 #include "spells-object.h"
-#include "object-boost.h"
-#include "object-hook.h"
-#include "object-flavor.h"
-#include "object-ego.h"
+#include "object/object-boost.h"
+#include "object/object-hook.h"
+#include "object/object-flavor.h"
+#include "object/object-ego.h"
 #include "player-damage.h"
 #include "player-status.h"
 #include "avatar.h"
@@ -21,7 +21,7 @@
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 
 typedef struct
@@ -764,7 +764,7 @@ void brand_bolts(player_type *caster_ptr)
 
 bool perilous_secrets(player_type *user_ptr)
 {
-       if (!ident_spell(user_ptr, FALSE)) return FALSE;
+       if (!ident_spell(user_ptr, FALSE, 0)) return FALSE;
 
        if (mp_ptr->spell_book)
        {
@@ -1038,15 +1038,12 @@ bool bless_weapon(player_type *caster_ptr)
  */
 bool pulish_shield(player_type *caster_ptr)
 {
-       /* Assume enchant weapon */
-       item_tester_tval = TV_SHIELD;
-
        concptr q = _("どの盾を磨きますか？", "Pulish which weapon? ");
        concptr s = _("磨く盾がありません。", "You have weapon to pulish.");
 
        OBJECT_IDX item;
        object_type *o_ptr;
-       o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0);
+       o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), TV_SHIELD);
        if (!o_ptr) return FALSE;
 
        GAME_TEXT o_name[MAX_NLEN];