From: Hourier Date: Tue, 15 Dec 2020 13:07:11 +0000 (+0900) Subject: [Refactor] #41053 Moved art-definition/*.h to artifact/ X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=935b8a301d8cdbff184ffcb910e9f5a5dcc97bc4 [Refactor] #41053 Moved art-definition/*.h to artifact/ --- diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index e93d26c33..c51d87c5d 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -798,8 +798,8 @@ - - + + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index a491b869b..c5298cd15 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -3424,9 +3424,6 @@ object-enchant - - art-definition - monster-race @@ -4708,8 +4705,11 @@ io - - art-definition + + artifact + + + artifact @@ -4849,9 +4849,6 @@ {642ec95b-f054-4958-a614-49ccf88cfc25} - - {fffcb35e-069c-4a97-ab60-0010a4d5d488} - {8de4a55f-fa83-496b-a42f-81078346c918} diff --git a/src/Makefile.am b/src/Makefile.am index aeebdefdc..ee792d05e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,18 +20,17 @@ hengband_SOURCES = \ \ artifact/artifact-info.c artifact/artifact-info.h \ artifact/fixed-art-generator.c artifact/fixed-art-generator.h \ + artifact/fixed-art-types.h \ artifact/random-art-activation.c artifact/random-art-activation.h \ artifact/random-art-bias-types.h \ artifact/random-art-characteristics.c artifact/random-art-characteristics.h \ + artifact/random-art-effects.h \ artifact/random-art-generator.c artifact/random-art-generator.h \ artifact/random-art-misc.c artifact/random-art-misc.h \ artifact/random-art-pval-investor.c artifact/random-art-pval-investor.h \ artifact/random-art-resistance.c artifact/random-art-resistance.h \ artifact/random-art-slay.c artifact/random-art-slay.h \ \ - art-definition/fixed-art-types.h \ - art-definition/random-art-effects.h \ - \ autopick/autopick.c autopick/autopick.h \ autopick/autopick-commands-table.h autopick/autopick-dirty-flags.h \ autopick/autopick-editor-table.h autopick/autopick-flags-table.h \ diff --git a/src/action/activation-execution.c b/src/action/activation-execution.c index c361f5f43..570163244 100644 --- a/src/action/activation-execution.c +++ b/src/action/activation-execution.c @@ -1,6 +1,6 @@ #include "action/activation-execution.h" #include "action/action-limited.h" -#include "art-definition/random-art-effects.h" +#include "artifact/random-art-effects.h" #include "artifact/artifact-info.h" #include "core/window-redrawer.h" #include "effect/spells-effect-util.h" diff --git a/src/action/movement-execution.c b/src/action/movement-execution.c index ee280857c..a71647bc4 100644 --- a/src/action/movement-execution.c +++ b/src/action/movement-execution.c @@ -1,6 +1,6 @@ #include "action/movement-execution.h" #include "action/open-close-execution.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "cmd-action/cmd-attack.h" #include "core/disturbance.h" #include "core/player-update-types.h" diff --git a/src/artifact/artifact-info.c b/src/artifact/artifact-info.c index 2f8ac7134..2d9478913 100644 --- a/src/artifact/artifact-info.c +++ b/src/artifact/artifact-info.c @@ -1,5 +1,5 @@ #include "artifact/artifact-info.h" -#include "art-definition/random-art-effects.h" +#include "artifact/random-art-effects.h" #include "cmd-item/cmd-smith.h" #include "mind/mind-weaponsmith.h" #include "object-enchant/object-ego.h" diff --git a/src/artifact/fixed-art-generator.c b/src/artifact/fixed-art-generator.c index 7bfbccf82..927faddb7 100644 --- a/src/artifact/fixed-art-generator.c +++ b/src/artifact/fixed-art-generator.c @@ -11,7 +11,7 @@ */ #include "artifact/fixed-art-generator.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "floor/floor-object.h" #include "object-enchant/object-boost.h" #include "object-enchant/object-curse.h" diff --git a/src/art-definition/fixed-art-types.h b/src/artifact/fixed-art-types.h similarity index 100% rename from src/art-definition/fixed-art-types.h rename to src/artifact/fixed-art-types.h diff --git a/src/artifact/random-art-activation.c b/src/artifact/random-art-activation.c index 0403ced59..23865d31b 100644 --- a/src/artifact/random-art-activation.c +++ b/src/artifact/random-art-activation.c @@ -1,5 +1,5 @@ #include "artifact/random-art-activation.h" -#include "art-definition/random-art-effects.h" +#include "artifact/random-art-effects.h" #include "artifact/random-art-bias-types.h" #include "object-enchant/object-boost.h" #include "object-enchant/tr-types.h" diff --git a/src/art-definition/random-art-effects.h b/src/artifact/random-art-effects.h similarity index 100% rename from src/art-definition/random-art-effects.h rename to src/artifact/random-art-effects.h diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c index 4b7dfa2f7..021ba235c 100644 --- a/src/cmd-action/cmd-attack.c +++ b/src/cmd-action/cmd-attack.c @@ -5,7 +5,7 @@ */ #include "cmd-action/cmd-attack.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "combat/attack-accuracy.h" #include "combat/attack-criticality.h" #include "core/asking-player.h" diff --git a/src/cmd-item/cmd-equipment.c b/src/cmd-item/cmd-equipment.c index 0cdcc5b4a..b384f1870 100644 --- a/src/cmd-item/cmd-equipment.c +++ b/src/cmd-item/cmd-equipment.c @@ -1,6 +1,6 @@ #include "cmd-item/cmd-equipment.h" #include "action/weapon-shield.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "autopick/autopick.h" #include "core/asking-player.h" #include "core/player-redraw-types.h" diff --git a/src/cmd-item/cmd-throw.c b/src/cmd-item/cmd-throw.c index d2d6b9afc..ba3b064be 100644 --- a/src/cmd-item/cmd-throw.c +++ b/src/cmd-item/cmd-throw.c @@ -1,7 +1,7 @@ #include "cmd-item/cmd-throw.h" #include "action/throw-util.h" #include "action/weapon-shield.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "combat/attack-power-table.h" #include "combat/shoot.h" #include "combat/slaying.h" diff --git a/src/combat/shoot.c b/src/combat/shoot.c index 58c118aa4..e41feafe8 100644 --- a/src/combat/shoot.c +++ b/src/combat/shoot.c @@ -1,5 +1,5 @@ #include "combat/shoot.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "core/player-redraw-types.h" #include "core/player-update-types.h" #include "core/stuff-handler.h" diff --git a/src/combat/slaying.c b/src/combat/slaying.c index 2bd104405..a9bcc7aed 100644 --- a/src/combat/slaying.c +++ b/src/combat/slaying.c @@ -1,5 +1,5 @@ #include "combat/slaying.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "core/player-redraw-types.h" #include "mind/mind-samurai.h" #include "monster-race/monster-race.h" diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c index 8d92e105c..334b9512e 100644 --- a/src/effect/effect-player-resist-hurt.c +++ b/src/effect/effect-player-resist-hurt.c @@ -1,5 +1,5 @@ #include "effect/effect-player-resist-hurt.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "blue-magic/blue-magic-checker.h" #include "core/hp-mp-processor.h" #include "core/player-redraw-types.h" diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c index 2d727d4c2..d26793616 100644 --- a/src/inventory/inventory-curse.c +++ b/src/inventory/inventory-curse.c @@ -1,5 +1,5 @@ #include "inventory/inventory-curse.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "core/asking-player.h" #include "core/disturbance.h" #include "core/player-redraw-types.h" diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c index d30f837a2..9b753964f 100644 --- a/src/inventory/player-inventory.c +++ b/src/inventory/player-inventory.c @@ -32,7 +32,7 @@ #include "view/display-messages.h" #include "world/world.h" #ifdef JP -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "flavor/flavor-util.h" #endif diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c index 0e178fa93..cd4d5a475 100644 --- a/src/io-dump/character-dump.c +++ b/src/io-dump/character-dump.c @@ -1,5 +1,5 @@ #include "io-dump/character-dump.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "cmd-building/cmd-building.h" #include "dungeon/dungeon.h" #include "dungeon/quest.h" diff --git a/src/load/item-loader.c b/src/load/item-loader.c index 6475049f1..8a84fc427 100644 --- a/src/load/item-loader.c +++ b/src/load/item-loader.c @@ -1,5 +1,5 @@ #include "load/item-loader.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "game-option/runtime-arguments.h" #include "load/angband-version-comparer.h" #include "load/load-util.h" diff --git a/src/market/building-craft-fix.c b/src/market/building-craft-fix.c index 9c0f6f71a..f3d27cbb0 100644 --- a/src/market/building-craft-fix.c +++ b/src/market/building-craft-fix.c @@ -1,5 +1,5 @@ #include "market/building-craft-fix.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "artifact/artifact-info.h" #include "core/asking-player.h" #include "core/player-update-types.h" diff --git a/src/market/building-craft-weapon.c b/src/market/building-craft-weapon.c index 3569f37a7..25b452522 100644 --- a/src/market/building-craft-weapon.c +++ b/src/market/building-craft-weapon.c @@ -1,5 +1,5 @@ #include "market/building-craft-weapon.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "combat/attack-accuracy.h" #include "combat/shoot.h" #include "core/player-update-types.h" diff --git a/src/monster-floor/special-death-switcher.c b/src/monster-floor/special-death-switcher.c index c45eac1fb..b73c3d5d3 100644 --- a/src/monster-floor/special-death-switcher.c +++ b/src/monster-floor/special-death-switcher.c @@ -5,7 +5,7 @@ */ #include "monster-floor/special-death-switcher.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "artifact/fixed-art-generator.h" #include "effect/effect-characteristics.h" #include "effect/effect-processor.h" diff --git a/src/object-activation/activation-others.c b/src/object-activation/activation-others.c index 89fb6eb69..13ac3bc2b 100644 --- a/src/object-activation/activation-others.c +++ b/src/object-activation/activation-others.c @@ -5,7 +5,7 @@ */ #include "object-activation/activation-others.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "cmd-io/cmd-save.h" #include "core/asking-player.h" #include "core/hp-mp-processor.h" diff --git a/src/object-activation/activation-switcher.c b/src/object-activation/activation-switcher.c index 2a251ebc4..e38b63390 100644 --- a/src/object-activation/activation-switcher.c +++ b/src/object-activation/activation-switcher.c @@ -5,7 +5,7 @@ */ #include "object-activation/activation-switcher.h" -#include "art-definition/random-art-effects.h" +#include "artifact/random-art-effects.h" #include "monster-floor/monster-summon.h" #include "monster-floor/place-monster-types.h" #include "object-activation/activation-bolt-ball.h" diff --git a/src/object-enchant/activation-info-table.c b/src/object-enchant/activation-info-table.c index 447adedaa..deb151fb8 100644 --- a/src/object-enchant/activation-info-table.c +++ b/src/object-enchant/activation-info-table.c @@ -1,5 +1,5 @@ #include "object-enchant/activation-info-table.h" -#include "art-definition/random-art-effects.h" +#include "artifact/random-art-effects.h" /*! * @brief アイテムの発動効果テーブル / diff --git a/src/object-enchant/apply-magic.c b/src/object-enchant/apply-magic.c index 25b24d973..1217034a3 100644 --- a/src/object-enchant/apply-magic.c +++ b/src/object-enchant/apply-magic.c @@ -6,7 +6,7 @@ */ #include "object-enchant/apply-magic.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "artifact/fixed-art-generator.h" #include "dungeon/dungeon.h" #include "mutation/mutation-flag-types.h" diff --git a/src/object-enchant/object-boost.c b/src/object-enchant/object-boost.c index 95a8f20ed..28136ba7a 100644 --- a/src/object-enchant/object-boost.c +++ b/src/object-enchant/object-boost.c @@ -1,5 +1,5 @@ #include "object-enchant/object-boost.h" -#include "art-definition/random-art-effects.h" +#include "artifact/random-art-effects.h" #include "object-enchant/tr-types.h" #include "system/floor-type-definition.h" #include "system/object-type-definition.h" diff --git a/src/object-enchant/vorpal-weapon.c b/src/object-enchant/vorpal-weapon.c index 3ecd0c2b6..5c7fe14fd 100644 --- a/src/object-enchant/vorpal-weapon.c +++ b/src/object-enchant/vorpal-weapon.c @@ -1,5 +1,5 @@ #include "object-enchant/vorpal-weapon.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "inventory/inventory-slot-types.h" #include "io/files-util.h" #include "monster-race/monster-race.h" diff --git a/src/object-hook/hook-expendable.c b/src/object-hook/hook-expendable.c index 321be2767..2a17ee11b 100644 --- a/src/object-hook/hook-expendable.c +++ b/src/object-hook/hook-expendable.c @@ -1,5 +1,5 @@ #include "object-hook/hook-expendable.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "core/player-update-types.h" #include "core/window-redrawer.h" #include "monster-race/monster-race.h" diff --git a/src/object-use/read-execution.c b/src/object-use/read-execution.c index 9fdba6dc9..ef93be3c4 100644 --- a/src/object-use/read-execution.c +++ b/src/object-use/read-execution.c @@ -7,7 +7,7 @@ #include "object-use/read-execution.h" #include "action/action-limited.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "core/player-redraw-types.h" #include "core/player-update-types.h" #include "core/show-file.h" diff --git a/src/object/object-info.c b/src/object/object-info.c index 700006e28..e62725568 100644 --- a/src/object/object-info.c +++ b/src/object/object-info.c @@ -11,8 +11,8 @@ */ #include "object/object-info.h" -#include "art-definition/fixed-art-types.h" -#include "art-definition/random-art-effects.h" +#include "artifact/fixed-art-types.h" +#include "artifact/random-art-effects.h" #include "artifact/artifact-info.h" #include "inventory/inventory-slot-types.h" #include "monster-race/monster-race.h" diff --git a/src/object/warning.c b/src/object/warning.c index dba5b91f5..e68633bdd 100644 --- a/src/object/warning.c +++ b/src/object/warning.c @@ -1,5 +1,5 @@ #include "object/warning.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "core/asking-player.h" #include "core/disturbance.h" #include "dungeon/dungeon-flag-types.h" diff --git a/src/perception/identification.c b/src/perception/identification.c index 4f0bd9d03..33890238a 100644 --- a/src/perception/identification.c +++ b/src/perception/identification.c @@ -1,5 +1,5 @@ #include "perception/identification.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "flavor/flavor-describer.h" #include "flavor/object-flavor-types.h" #include "game-option/special-options.h" diff --git a/src/player-attack/attack-chaos-effect.c b/src/player-attack/attack-chaos-effect.c index d438b4990..025005688 100644 --- a/src/player-attack/attack-chaos-effect.c +++ b/src/player-attack/attack-chaos-effect.c @@ -6,7 +6,7 @@ */ #include "player-attack/attack-chaos-effect.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "core/player-redraw-types.h" #include "flavor/flavor-describer.h" #include "flavor/object-flavor-types.h" diff --git a/src/player-attack/blood-sucking-processor.c b/src/player-attack/blood-sucking-processor.c index 669c81845..0e3c11a1a 100644 --- a/src/player-attack/blood-sucking-processor.c +++ b/src/player-attack/blood-sucking-processor.c @@ -5,7 +5,7 @@ */ #include "player-attack/blood-sucking-processor.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "core/hp-mp-processor.h" #include "game-option/cheat-options.h" #include "inventory/inventory-slot-types.h" diff --git a/src/player-attack/player-attack.c b/src/player-attack/player-attack.c index f363e157d..137f83a39 100644 --- a/src/player-attack/player-attack.c +++ b/src/player-attack/player-attack.c @@ -5,7 +5,7 @@ */ #include "player-attack/player-attack.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "cmd-action/cmd-attack.h" #include "combat/attack-accuracy.h" #include "combat/attack-criticality.h" diff --git a/src/player/player-status-flags.c b/src/player/player-status-flags.c index cb052a5ba..d0ce91766 100644 --- a/src/player/player-status-flags.c +++ b/src/player/player-status-flags.c @@ -1,5 +1,5 @@ #include "player/player-status-flags.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "grid/grid.h" #include "inventory/inventory-slot-types.h" #include "monster-race/monster-race.h" diff --git a/src/player/player-status-resist.c b/src/player/player-status-resist.c index bea0f47a6..dadbf15c2 100644 --- a/src/player/player-status-resist.c +++ b/src/player/player-status-resist.c @@ -1,5 +1,5 @@ #include "player/player-status-resist.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "grid/grid.h" #include "inventory/inventory-slot-types.h" #include "monster-race/monster-race.h" diff --git a/src/player/player-status.c b/src/player/player-status.c index 8cbde00b6..0f8f178a2 100644 --- a/src/player/player-status.c +++ b/src/player/player-status.c @@ -1,5 +1,5 @@ #include "player/player-status.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "autopick/autopick-reader-writer.h" #include "autopick/autopick.h" #include "cmd-action/cmd-pet.h" diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c index 67e6d3fdc..e35cac3a1 100644 --- a/src/realm/realm-hissatsu.c +++ b/src/realm/realm-hissatsu.c @@ -1,5 +1,5 @@ #include "realm/realm-hissatsu.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "cmd-action/cmd-attack.h" #include "cmd-action/cmd-spell.h" #include "cmd-item/cmd-throw.h" diff --git a/src/specific-object/bloody-moon.c b/src/specific-object/bloody-moon.c index 7990c54fc..3177cda34 100644 --- a/src/specific-object/bloody-moon.c +++ b/src/specific-object/bloody-moon.c @@ -1,5 +1,5 @@ #include "specific-object/bloody-moon.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "core/player-update-types.h" #include "object-enchant/object-boost.h" #include "object-enchant/tr-types.h" diff --git a/src/specific-object/death-crimson.c b/src/specific-object/death-crimson.c index f02822ada..0c9b9c0ce 100644 --- a/src/specific-object/death-crimson.c +++ b/src/specific-object/death-crimson.c @@ -1,5 +1,5 @@ #include "specific-object/death-crimson.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "effect/effect-characteristics.h" #include "effect/effect-processor.h" #include "floor/geometry.h" diff --git a/src/specific-object/muramasa.c b/src/specific-object/muramasa.c index 8615b9525..138553e4c 100644 --- a/src/specific-object/muramasa.c +++ b/src/specific-object/muramasa.c @@ -1,5 +1,5 @@ #include "specific-object/muramasa.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "core/asking-player.h" #include "spell/spells-object.h" #include "status/base-status.h" diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c index 2efc0d970..49b28e995 100644 --- a/src/view/status-first-page.c +++ b/src/view/status-first-page.c @@ -6,7 +6,7 @@ */ #include "view/status-first-page.h" -#include "art-definition/fixed-art-types.h" +#include "artifact/fixed-art-types.h" #include "combat/attack-power-table.h" #include "combat/shoot.h" #include "display-util.h"