From: Hourier Date: Sun, 28 Jun 2020 12:37:45 +0000 (+0900) Subject: [Refactor] #40466 Moved bad-status-setter.c/h and buff-setter.c/h from player/ to... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a56ed7354ea33114388d5e25a7041c776d0a3334;p=hengband%2Fhengband.git [Refactor] #40466 Moved bad-status-setter.c/h and buff-setter.c/h from player/ to status/ --- diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 996872741..d7fc3420a 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -226,8 +226,8 @@ - - + + @@ -653,8 +653,8 @@ - - + + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 4a6f8190c..cff5311ce 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -1430,9 +1430,6 @@ mind - - player - core @@ -1505,12 +1502,15 @@ player - - player - status + + status + + + status + @@ -3232,9 +3232,6 @@ player - - player - core @@ -3307,12 +3304,15 @@ player - - player - status + + status + + + status + diff --git a/src/Makefile.am b/src/Makefile.am index fa53fbd5c..1a1cd92ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -451,8 +451,6 @@ hengband_SOURCES = \ pet/pet-util.c pet/pet-util.h \ \ player/avatar.h player/avatar.c \ - player/bad-status-setter.c player/bad-status-setter.h \ - player/buff-setter.c player/buff-setter.h \ player/eldritch-horror.c player/eldritch-horror.h \ player/mimic-info-table.c player/mimic-info-table.h \ player/patron.c player/patron.h \ @@ -555,6 +553,8 @@ hengband_SOURCES = \ spell-realm/spells-song.c spell-realm/spells-song.h \ spell-realm/spells-trump.c spell-realm/spells-trump.h \ \ + status/bad-status-setter.c status/bad-status-setter.h \ + status/buff-setter.c status/buff-setter.h \ status/sight-setter.c status/sight-setter.h \ \ store/store.c store/store.h \ diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c index f3599a0ae..6786a31ce 100644 --- a/src/cmd-action/cmd-mane.c +++ b/src/cmd-action/cmd-mane.c @@ -32,8 +32,8 @@ #include "monster/monster-status.h" #include "mspell/monster-power-table.h" #include "mspell/mspell-type.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-effects.h" #include "player/player-status.h" #include "spell-kind/spells-launcher.h" diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c index 7efeead46..8d0b6926d 100644 --- a/src/cmd-action/cmd-spell.c +++ b/src/cmd-action/cmd-spell.c @@ -29,7 +29,7 @@ #include "object/item-use-flags.h" #include "object/item-tester-hooker.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/eldritch-horror.h" #include "player/player-class.h" #include "player/player-damage.h" diff --git a/src/cmd-building/cmd-inn.c b/src/cmd-building/cmd-inn.c index 789e8991a..7da20a8e3 100644 --- a/src/cmd-building/cmd-inn.c +++ b/src/cmd-building/cmd-inn.c @@ -4,7 +4,7 @@ #include "game-option/birth-options.h" #include "io/write-diary.h" #include "market/building-actions-table.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/eldritch-horror.h" #include "player/player-effects.h" #include "player/player-race-types.h" diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c index dd1eea658..efd0d2314 100644 --- a/src/cmd-item/cmd-activate.c +++ b/src/cmd-item/cmd-activate.c @@ -46,8 +46,8 @@ #include "monster-floor/place-monster-types.h" #include "monster/smart-learn-types.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-race-types.h" diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c index 89962ca29..1210198b1 100644 --- a/src/cmd-item/cmd-eat.c +++ b/src/cmd-item/cmd-eat.c @@ -23,7 +23,7 @@ #include "object/object-info.h" #include "perception/object-perception.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/mimic-info-table.h" #include "player/player-class.h" #include "player/player-damage.h" diff --git a/src/cmd-item/cmd-quaff.c b/src/cmd-item/cmd-quaff.c index 2a75ddb54..8a38e4a31 100644 --- a/src/cmd-item/cmd-quaff.c +++ b/src/cmd-item/cmd-quaff.c @@ -24,10 +24,10 @@ #include "object/object-kind.h" #include "perception/object-perception.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/eldritch-horror.h" #include "player/mimic-info-table.h" -#include "player/buff-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c index d4eb51c0f..0643ad8b2 100644 --- a/src/cmd-item/cmd-read.c +++ b/src/cmd-item/cmd-read.c @@ -25,8 +25,8 @@ #include "object/object-kind.h" #include "perception/object-perception.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c index a735b0cf4..8082b83f5 100644 --- a/src/cmd-item/cmd-usestaff.c +++ b/src/cmd-item/cmd-usestaff.c @@ -16,8 +16,8 @@ #include "object/object-kind.h" #include "perception/object-perception.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-effects.h" #include "player/player-race-types.h" diff --git a/src/cmd-item/cmd-zaprod.c b/src/cmd-item/cmd-zaprod.c index efc05b538..6e2af162e 100644 --- a/src/cmd-item/cmd-zaprod.c +++ b/src/cmd-item/cmd-zaprod.c @@ -12,7 +12,7 @@ #include "object/object-info.h" #include "perception/object-perception.h" #include "player/avatar.h" -#include "player/buff-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-effects.h" #include "player/player-status.h" diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index 677f61296..721f595c5 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -70,7 +70,7 @@ #include "object/object-info.h" #include "perception/object-perception.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-effects.h" #include "player/player-move.h" #include "player/player-personalities-types.h" diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c index 9d76434aa..9e782dfb6 100644 --- a/src/core/hp-mp-processor.c +++ b/src/core/hp-mp-processor.c @@ -11,7 +11,7 @@ #include "object-enchant/object-ego.h" #include "object-enchant/trc-types.h" #include "object/object-flavor.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-race-types.h" #include "player/player-race.h" diff --git a/src/core/magic-effects-timeout-reducer.c b/src/core/magic-effects-timeout-reducer.c index 07696d246..e7e117ea8 100644 --- a/src/core/magic-effects-timeout-reducer.c +++ b/src/core/magic-effects-timeout-reducer.c @@ -1,8 +1,8 @@ #include "core/magic-effects-timeout-reducer.h" #include "game-option/birth-options.h" #include "mind/racial-kutar.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-effects.h" #include "status/sight-setter.h" diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c index f6eabd744..6d5d681a9 100644 --- a/src/effect/effect-monster-charm.c +++ b/src/effect/effect-monster-charm.c @@ -16,7 +16,7 @@ #include "object-enchant/trc-types.h" #include "pet/pet-fall-off.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "spell/spells-diceroll.h" #include "view/display-messages.h" diff --git a/src/effect/effect-monster-psi.c b/src/effect/effect-monster-psi.c index a3a2aa193..7dc231d75 100644 --- a/src/effect/effect-monster-psi.c +++ b/src/effect/effect-monster-psi.c @@ -8,7 +8,7 @@ #include "monster/monster-describer.h" #include "monster/monster-description-types.h" #include "monster/monster-info.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "view/display-messages.h" #include "world/world.h" diff --git a/src/effect/effect-player-curse.c b/src/effect/effect-player-curse.c index 827791c4a..447ce21c8 100644 --- a/src/effect/effect-player-curse.c +++ b/src/effect/effect-player-curse.c @@ -3,7 +3,7 @@ #include "monster-race/race-indice-types.h" #include "mspell/mspells3.h" #include "object-enchant/object-curse.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "view/display-messages.h" #include "world/world.h" diff --git a/src/effect/effect-player-oldies.c b/src/effect/effect-player-oldies.c index 7a5c0070b..417860e46 100644 --- a/src/effect/effect-player-oldies.c +++ b/src/effect/effect-player-oldies.c @@ -1,8 +1,8 @@ #include "effect/effect-player-oldies.h" #include "game-option/birth-options.h" #include "monster-race/race-indice-types.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/eldritch-horror.h" #include "player/player-effects.h" #include "view/display-messages.h" diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c index 173651819..faead78f3 100644 --- a/src/effect/effect-player-resist-hurt.c +++ b/src/effect/effect-player-resist-hurt.c @@ -6,7 +6,7 @@ #include "mspell/mspells3.h" #include "mutation/mutation.h" #include "object/object-broken.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-race-types.h" diff --git a/src/effect/effect-player-spirit.c b/src/effect/effect-player-spirit.c index 8f25083bd..a5992f592 100644 --- a/src/effect/effect-player-spirit.c +++ b/src/effect/effect-player-spirit.c @@ -1,7 +1,7 @@ #include "effect/effect-player-spirit.h" #include "mind/mind-mirror-master.h" #include "mspell/mspells3.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "view/display-messages.h" diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c index 009f5750e..a1b7d172b 100644 --- a/src/effect/effect-player-switcher.c +++ b/src/effect/effect-player-switcher.c @@ -9,7 +9,7 @@ #include "mspell/mspells3.h" #include "object-enchant/object-curse.h" #include "object/object-broken.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/mimic-info-table.h" #include "player/player-damage.h" #include "player/player-race-types.h" diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c index 04389e41a..66c396c35 100644 --- a/src/floor/pattern-walk.c +++ b/src/floor/pattern-walk.c @@ -9,7 +9,7 @@ #include "grid/grid.h" #include "io/input-key-requester.h" #include "io/write-diary.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-move.h" diff --git a/src/grid/trap.c b/src/grid/trap.c index 210ac6321..df4b113c2 100644 --- a/src/grid/trap.c +++ b/src/grid/trap.c @@ -19,7 +19,7 @@ #include "monster-floor/place-monster-types.h" #include "monster/monster-util.h" #include "player/eldritch-horror.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c index b41a94c51..8e83d48e0 100644 --- a/src/inventory/inventory-curse.c +++ b/src/inventory/inventory-curse.c @@ -12,7 +12,7 @@ #include "object/object-flags.h" #include "object/object-flavor.h" #include "perception/object-perception.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-move.h" #include "player/player-race-types.h" diff --git a/src/mind/mind.c b/src/mind/mind.c index b3bf1fe82..3dc3b0d67 100644 --- a/src/mind/mind.c +++ b/src/mind/mind.c @@ -42,8 +42,8 @@ #include "monster/monster-status.h" #include "monster-floor/place-monster-types.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/mind/racial.c b/src/mind/racial.c index 72452ac3f..87645272c 100644 --- a/src/mind/racial.c +++ b/src/mind/racial.c @@ -43,8 +43,8 @@ #include "mind/stances-table.h" #include "mutation/mutation.h" #include "object/item-tester-hooker.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/monster-attack/monster-attack-player.c b/src/monster-attack/monster-attack-player.c index 0818eff12..c7271b72c 100644 --- a/src/monster-attack/monster-attack-player.c +++ b/src/monster-attack/monster-attack-player.c @@ -33,7 +33,7 @@ #include "object-hook/hook-armor.h" #include "object/item-tester-hooker.h" #include "pet/pet-fall-off.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-move.h" diff --git a/src/monster-attack/monster-attack-status.c b/src/monster-attack/monster-attack-status.c index a82230355..bac440cac 100644 --- a/src/monster-attack/monster-attack-status.c +++ b/src/monster-attack/monster-attack-status.c @@ -8,7 +8,7 @@ #include "mind/mind-mirror-master.h" #include "monster-race/monster-race.h" #include "monster-race/race-indice-types.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-effects.h" #include "view/display-messages.h" diff --git a/src/monster-attack/monster-attack-switcher.c b/src/monster-attack/monster-attack-switcher.c index 7a2f2b0d6..1b15929ed 100644 --- a/src/monster-attack/monster-attack-switcher.c +++ b/src/monster-attack/monster-attack-switcher.c @@ -12,7 +12,7 @@ #include "mind/mind-mirror-master.h" #include "monster/monster-status.h" #include "monster/monster-update.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "spell-kind/earthquake.h" diff --git a/src/mspell/mspell-status.c b/src/mspell/mspell-status.c index 47988f132..33db1acbe 100644 --- a/src/mspell/mspell-status.c +++ b/src/mspell/mspell-status.c @@ -19,7 +19,7 @@ #include "mspell/mspell-util.h" #include "mspell/mspells1.h" #include "mspell/mspells3.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-effects.h" #include "player/player-move.h" #include "player/player-personalities-types.h" diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c index 02e1b9f5f..e39fb6f5c 100644 --- a/src/mspell/mspells3.c +++ b/src/mspell/mspells3.c @@ -43,8 +43,8 @@ #include "mspell/mspell-mask-definitions.h" #include "mspell/mspell-type.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-effects.h" #include "player/player-status.h" #include "realm/realm-types.h" diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c index 91ea43879..6aa33c0ed 100644 --- a/src/mutation/mutation-processor.c +++ b/src/mutation/mutation-processor.c @@ -8,8 +8,8 @@ #include "mutation/mutation.h" #include "object-hook/hook-enchant.h" #include "object/lite-processor.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-move.h" diff --git a/src/player/digestion-processor.c b/src/player/digestion-processor.c index d5d6cca06..49439c9c2 100644 --- a/src/player/digestion-processor.c +++ b/src/player/digestion-processor.c @@ -2,7 +2,7 @@ #include "core/speed-table.h" #include "object-enchant/trc-types.h" #include "player/player-damage.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-effects.h" #include "player/player-move.h" #include "player/special-defense-types.h" diff --git a/src/player/eldritch-horror.c b/src/player/eldritch-horror.c index 9491f2da1..65bc88618 100644 --- a/src/player/eldritch-horror.c +++ b/src/player/eldritch-horror.c @@ -19,7 +19,7 @@ #include "monster/monster-list.h" #include "monster/monster-util.h" #include "monster/smart-learn-types.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-effects.h" #include "player/player-status.h" #include "player/mimic-info-table.h" diff --git a/src/player/player-effects.c b/src/player/player-effects.c index cef195b8b..6bbae6147 100644 --- a/src/player/player-effects.c +++ b/src/player/player-effects.c @@ -50,8 +50,8 @@ #include "object/object-value.h" #include "perception/object-perception.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-move.h" diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c index 3c91b715c..4a98953d5 100644 --- a/src/realm/realm-arcane.c +++ b/src/realm/realm-arcane.c @@ -5,7 +5,7 @@ #include "monster-floor/monster-summon.h" #include "monster-floor/place-monster-types.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-effects.h" #include "player/player-status.h" #include "spell-kind/spells-beam.h" diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c index 032202c6b..2d835fd12 100644 --- a/src/realm/realm-craft.c +++ b/src/realm/realm-craft.c @@ -3,7 +3,7 @@ #include "monster-floor/monster-summon.h" #include "monster-floor/place-monster-types.h" #include "mutation/mutation.h" -#include "player/buff-setter.h" +#include "status/buff-setter.h" #include "player/player-effects.h" #include "player/player-status.h" #include "player/selfinfo.h" diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c index 7320bd379..70f0db2d8 100644 --- a/src/realm/realm-crusade.c +++ b/src/realm/realm-crusade.c @@ -5,8 +5,8 @@ #include "io/targeting.h" #include "monster-floor/monster-summon.h" #include "monster-floor/place-monster-types.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-effects.h" #include "spell-kind/spells-beam.h" diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c index c745b79c4..6b44bab16 100644 --- a/src/realm/realm-death.c +++ b/src/realm/realm-death.c @@ -3,7 +3,7 @@ #include "effect/effect-characteristics.h" #include "io/targeting.h" #include "player/avatar.h" -#include "player/buff-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/realm/realm-demon.c b/src/realm/realm-demon.c index 07e23c502..c156ca744 100644 --- a/src/realm/realm-demon.c +++ b/src/realm/realm-demon.c @@ -3,8 +3,8 @@ #include "io/targeting.h" #include "monster-floor/monster-summon.h" #include "monster-floor/place-monster-types.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c index d2c459a4c..6a81ef07d 100644 --- a/src/realm/realm-hissatsu.c +++ b/src/realm/realm-hissatsu.c @@ -23,7 +23,7 @@ #include "monster/monster-update.h" #include "object-enchant/tr-types.h" #include "object/object-flags.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-move.h" #include "player/player-status.h" diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c index 7a13b03ad..24779e992 100644 --- a/src/realm/realm-life.c +++ b/src/realm/realm-life.c @@ -2,8 +2,8 @@ #include "cmd-action/cmd-spell.h" #include "floor/floor.h" #include "io/targeting.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-effects.h" #include "player/player-status.h" #include "spell-kind/spells-curse-removal.h" diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c index 678a9aef0..1e8ef1ffe 100644 --- a/src/realm/realm-nature.c +++ b/src/realm/realm-nature.c @@ -9,8 +9,8 @@ #include "object/object-generator.h" #include "object/object-kind-hook.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-race-types.h" diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c index c0892a0a5..07f9b0a67 100644 --- a/src/realm/realm-song.c +++ b/src/realm/realm-song.c @@ -1,7 +1,7 @@ #include "cmd-action/cmd-spell.h" #include "effect/effect-characteristics.h" #include "io/targeting.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-class.h" #include "player/player-effects.h" #include "realm/realm-song-numbers.h" diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c index 9ff626721..5f9290845 100644 --- a/src/realm/realm-sorcery.c +++ b/src/realm/realm-sorcery.c @@ -3,7 +3,7 @@ #include "core/asking-player.h" #include "io/targeting.h" #include "player/avatar.h" -#include "player/buff-setter.h" +#include "status/buff-setter.h" #include "player/player-effects.h" #include "player/selfinfo.h" #include "spell-kind/spells-charm.h" diff --git a/src/specific-object/chest.c b/src/specific-object/chest.c index a83348b4d..e53161cf0 100644 --- a/src/specific-object/chest.c +++ b/src/specific-object/chest.c @@ -10,7 +10,7 @@ #include "object-enchant/item-apply-magic.h" #include "object/object-generator.h" #include "perception/object-perception.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/spell-kind/earthquake.c b/src/spell-kind/earthquake.c index eddea8f9e..ab364f3cf 100644 --- a/src/spell-kind/earthquake.c +++ b/src/spell-kind/earthquake.c @@ -17,7 +17,7 @@ #include "monster/monster-status.h" #include "monster/monster-update.h" #include "monster/smart-learn-types.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-move.h" diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c index e9e70bcee..46d10fd25 100644 --- a/src/spell-kind/spells-floor.c +++ b/src/spell-kind/spells-floor.c @@ -35,7 +35,7 @@ #include "object/object-flavor.h" #include "object/object-mark-types.h" #include "perception/object-perception.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-effects.h" #include "player/special-defense-types.h" #include "spell-kind/spells-teleport.h" diff --git a/src/spell-kind/spells-random.c b/src/spell-kind/spells-random.c index 0de2bbca0..b837c0029 100644 --- a/src/spell-kind/spells-random.c +++ b/src/spell-kind/spells-random.c @@ -14,7 +14,7 @@ #include "monster-floor/place-monster-types.h" #include "mutation/mutation.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "spell-kind/earthquake.h" diff --git a/src/spell-realm/spells-trump.c b/src/spell-realm/spells-trump.c index c569d5f63..d86fb078f 100644 --- a/src/spell-realm/spells-trump.c +++ b/src/spell-realm/spells-trump.c @@ -5,7 +5,7 @@ #include "monster-floor/place-monster-types.h" #include "mutation/mutation.h" #include "player/avatar.h" -#include "player/buff-setter.h" +#include "status/buff-setter.h" #include "player/player-effects.h" #include "spell-kind/earthquake.h" #include "spell-kind/spells-charm.h" diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c index c8159fd31..a9a11f3da 100644 --- a/src/spell/spells-object.c +++ b/src/spell/spells-object.c @@ -44,7 +44,7 @@ #include "object/object-kind.h" #include "perception/object-perception.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/spell/spells-staff-only.c b/src/spell/spells-staff-only.c index 198562346..2ba7babeb 100644 --- a/src/spell/spells-staff-only.c +++ b/src/spell/spells-staff-only.c @@ -1,6 +1,6 @@ #include "spell/spells-staff-only.h" #include "effect/effect-characteristics.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "spell/process-effect.h" diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c index 15ce608c4..39cb1589c 100644 --- a/src/spell/spells-status.c +++ b/src/spell/spells-status.c @@ -21,8 +21,8 @@ #include "object/object-kind-hook.h" #include "object/object-kind.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" -#include "player/buff-setter.h" +#include "status/bad-status-setter.h" +#include "status/buff-setter.h" #include "player/player-class.h" #include "player/player-effects.h" #include "player/player-status.h" diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c index a7625ca06..99cdc1994 100644 --- a/src/spell/spells-summon.c +++ b/src/spell/spells-summon.c @@ -14,7 +14,7 @@ #include "object/item-use-flags.h" #include "object/item-tester-hooker.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-effects.h" #include "spell/spells-diceroll.h" #include "spell-kind/earthquake.h" diff --git a/src/spell/spells3.c b/src/spell/spells3.c index 23cafeae4..55da28567 100644 --- a/src/spell/spells3.c +++ b/src/spell/spells3.c @@ -82,7 +82,7 @@ #include "perception/identification.h" #include "perception/object-perception.h" #include "player/avatar.h" -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/player/bad-status-setter.c b/src/status/bad-status-setter.c similarity index 99% rename from src/player/bad-status-setter.c rename to src/status/bad-status-setter.c index 784e6ae0e..06d38b44a 100644 --- a/src/player/bad-status-setter.c +++ b/src/status/bad-status-setter.c @@ -1,4 +1,4 @@ -#include "player/bad-status-setter.h" +#include "status/bad-status-setter.h" #include "core/stuff-handler.h" #include "game-option/disturbance-options.h" #include "mind/mind-sniper.h" diff --git a/src/player/bad-status-setter.h b/src/status/bad-status-setter.h similarity index 100% rename from src/player/bad-status-setter.h rename to src/status/bad-status-setter.h diff --git a/src/player/buff-setter.c b/src/status/buff-setter.c similarity index 99% rename from src/player/buff-setter.c rename to src/status/buff-setter.c index 50cf679b9..f439e0dbf 100644 --- a/src/player/buff-setter.c +++ b/src/status/buff-setter.c @@ -1,4 +1,4 @@ -#include "player/buff-setter.h" +#include "status/buff-setter.h" #include "core/stuff-handler.h" #include "game-option/disturbance-options.h" #include "player/avatar.h" diff --git a/src/player/buff-setter.h b/src/status/buff-setter.h similarity index 100% rename from src/player/buff-setter.h rename to src/status/buff-setter.h