Merge branch 'master' of git.osdn.net:/gitroot/hengband/hengband

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

diff --git a/src/object/object-broken.c b/src/object/object-broken.c
index 63cb094..7878813 100644 (file)
--- a/src/object/object-broken.c
+++ b/src/object/object-broken.c
@@ -4,14 +4,15 @@
  * @author deskull
  */
 #include "object/object-broken.h"
-#include "combat/snipe.h"
 #include "effect/effect-characteristics.h"
+#include "mind/snipe-types.h"
+#include "object-enchant/tr-types.h"
+#include "object/object-flags.h"
 #include "object/object-kind.h"
-#include "object/object2.h"
-#include "object/sv-potion-types.h"
-#include "object/tr-types.h"
-#include "spell/process-effect.h"
-#include "spell/spells-type.h"
+#include "effect/effect-processor.h"
+#include "spell/spell-types.h"
+#include "sv-definition/sv-potion-types.h"
+#include "util/bit-flags-calculator.h"
 
 /*!
 * @brief アイテムが酸で破損するかどうかを判定する
@@ -131,7 +132,7 @@ bool hates_fire(object_type *o_ptr)
        case TV_TRUMP_BOOK:
        case TV_ARCANE_BOOK:
        case TV_CRAFT_BOOK:
-       case TV_DAEMON_BOOK:
+       case TV_DEMON_BOOK:
        case TV_CRUSADE_BOOK:
        case TV_MUSIC_BOOK:
        case TV_HISSATSU_BOOK:
@@ -187,11 +188,11 @@ bool hates_cold(object_type *o_ptr)
 * @return 破損するならばTRUEを返す
 * @todo 統合を検討
 */
-int set_acid_destroy(object_type *o_ptr)
+int set_acid_destroy(player_type *owner_ptr, object_type *o_ptr)
 {
        BIT_FLAGS flgs[TR_FLAG_SIZE];
        if (!hates_acid(o_ptr)) return FALSE;
-       object_flags(o_ptr, flgs);
+       object_flags(owner_ptr, o_ptr, flgs);
        if (have_flag(flgs, TR_IGNORE_ACID)) return FALSE;
        return TRUE;
 }
@@ -204,11 +205,11 @@ int set_acid_destroy(object_type *o_ptr)
 * @return 破損するならばTRUEを返す
 * @todo 統合を検討
 */
-int set_elec_destroy(object_type *o_ptr)
+int set_elec_destroy(player_type *owner_ptr, object_type *o_ptr)
 {
        BIT_FLAGS flgs[TR_FLAG_SIZE];
        if (!hates_elec(o_ptr)) return FALSE;
-       object_flags(o_ptr, flgs);
+       object_flags(owner_ptr, o_ptr, flgs);
        if (have_flag(flgs, TR_IGNORE_ELEC)) return FALSE;
        return TRUE;
 }
@@ -221,11 +222,11 @@ int set_elec_destroy(object_type *o_ptr)
 * @return 破損するならばTRUEを返す
 * @todo 統合を検討
 */
-int set_fire_destroy(object_type *o_ptr)
+int set_fire_destroy(player_type *owner_ptr, object_type *o_ptr)
 {
        BIT_FLAGS flgs[TR_FLAG_SIZE];
        if (!hates_fire(o_ptr)) return FALSE;
-       object_flags(o_ptr, flgs);
+       object_flags(owner_ptr, o_ptr, flgs);
        if (have_flag(flgs, TR_IGNORE_FIRE)) return FALSE;
        return TRUE;
 }
@@ -238,11 +239,11 @@ int set_fire_destroy(object_type *o_ptr)
 * @return 破損するならばTRUEを返す
 * @todo 統合を検討
 */
-int set_cold_destroy(object_type *o_ptr)
+int set_cold_destroy(player_type *owner_ptr, object_type *o_ptr)
 {
        BIT_FLAGS flgs[TR_FLAG_SIZE];
        if (!hates_cold(o_ptr)) return FALSE;
-       object_flags(o_ptr, flgs);
+       object_flags(owner_ptr, o_ptr, flgs);
        if (have_flag(flgs, TR_IGNORE_COLD)) return FALSE;
        return TRUE;
 }