From c09a0f78a087d6de01a89a80cb8e9d4fbd6adffc Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 16 May 2020 22:47:32 +0900 Subject: [PATCH] [Refactor] #40415 Moved *.c and *.h regarding monster spell from spell/ to mspell/ --- Hengband/Hengband/Hengband.vcxproj | 44 ++++----- Hengband/Hengband/Hengband.vcxproj.filters | 109 ++++++++++++----------- src/Makefile.am | 29 +++--- src/cmd/cmd-mane.c | 4 +- src/combat/melee.c | 2 +- src/combat/shoot.c | 2 +- src/effect/effect-monster-spirit.c | 2 +- src/effect/effect-player-curse.c | 2 +- src/effect/effect-player-resist-hurt.c | 2 +- src/effect/effect-player-spirit.c | 2 +- src/effect/effect-player-switcher.c | 2 +- src/io/input-key-processor.c | 2 +- src/io/special-class-dump.c | 2 +- src/monster/monster-process.c | 2 +- src/monster/monster-safety-hiding.c | 2 +- src/monster/monster-status.c | 2 +- src/monster/monster-sweep-grid.c | 2 +- src/monster/monster1.c | 6 +- src/monster/monster2.c | 2 +- src/monster/monsterrace-hook.c | 2 +- src/monster/quantum-effect.c | 2 +- src/{spell => mspell}/monster-spell.h | 2 +- src/{spell => mspell}/mspell-ball.c | 10 +-- src/{spell => mspell}/mspell-ball.h | 0 src/{spell => mspell}/mspell-bolt.c | 10 +-- src/{spell => mspell}/mspell-bolt.h | 0 src/{spell => mspell}/mspell-breath.c | 8 +- src/{spell => mspell}/mspell-breath.h | 0 src/{spell => mspell}/mspell-curse.c | 10 +-- src/{spell => mspell}/mspell-curse.h | 0 src/{spell => mspell}/mspell-damage-calculator.c | 6 +- src/{spell => mspell}/mspell-damage-calculator.h | 0 src/{spell => mspell}/mspell-learn-checker.c | 0 src/{spell => mspell}/mspell-learn-checker.h | 0 src/{spell => mspell}/mspell-summon.c | 6 +- src/{spell => mspell}/mspell-summon.h | 0 src/{spell => mspell}/mspell-type.h | 0 src/{spell => mspell}/mspell-util.c | 4 +- src/{spell => mspell}/mspell-util.h | 0 src/{spell => mspell}/mspells1.c | 4 +- src/{spell => mspell}/mspells2.c | 2 +- src/{spell => mspell}/mspells3.c | 10 +-- src/{spell => mspell}/mspells4.c | 18 ++-- src/object/warning.c | 6 +- src/player/player-damage.c | 2 +- src/player/player-effects.c | 2 +- src/player/player-move.c | 2 +- src/spell/spells3.c | 2 +- src/wizard/wizard-special-process.c | 2 +- 49 files changed, 167 insertions(+), 163 deletions(-) rename src/{spell => mspell}/monster-spell.h (99%) rename src/{spell => mspell}/mspell-ball.c (98%) rename src/{spell => mspell}/mspell-ball.h (100%) rename src/{spell => mspell}/mspell-bolt.c (98%) rename src/{spell => mspell}/mspell-bolt.h (100%) rename src/{spell => mspell}/mspell-breath.c (98%) rename src/{spell => mspell}/mspell-breath.h (100%) rename src/{spell => mspell}/mspell-curse.c (97%) rename src/{spell => mspell}/mspell-curse.h (100%) rename src/{spell => mspell}/mspell-damage-calculator.c (99%) rename src/{spell => mspell}/mspell-damage-calculator.h (100%) rename src/{spell => mspell}/mspell-learn-checker.c (100%) rename src/{spell => mspell}/mspell-learn-checker.h (100%) rename src/{spell => mspell}/mspell-summon.c (99%) rename src/{spell => mspell}/mspell-summon.h (100%) rename src/{spell => mspell}/mspell-type.h (100%) rename src/{spell => mspell}/mspell-util.c (98%) rename src/{spell => mspell}/mspell-util.h (100%) rename src/{spell => mspell}/mspells1.c (99%) rename src/{spell => mspell}/mspells2.c (99%) rename src/{spell => mspell}/mspells3.c (99%) rename src/{spell => mspell}/mspells4.c (99%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 86b4a05f4..4682893bc 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -266,14 +266,14 @@ - - - - - - - - + + + + + + + + @@ -410,15 +410,15 @@ - - - - - - - - - + + + + + + + + + @@ -476,10 +476,10 @@ - - - - + + + + @@ -673,7 +673,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index e161cf8be..b8664b510 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -701,18 +701,6 @@ spell - - spell - - - spell - - - spell - - - spell - locale @@ -845,32 +833,44 @@ mind - - spell - - - spell - cmd - - spell + + mspell - - spell + + mspell - - spell + + mspell - - spell + + mspell - - spell + + mspell - - spell + + mspell + + + mspell + + + mspell + + + mspell + + + mspell + + + mspell + + + mspell @@ -1621,9 +1621,6 @@ spell - - spell - locale @@ -1762,35 +1759,38 @@ mind - - spell - - - spell - cmd - - spell + + mspell - - spell + + mspell - - spell + + mspell - - spell + + mspell - - spell + + mspell - - spell + + mspell - - spell + + mspell + + + mspell + + + mspell + + + mspell @@ -1882,6 +1882,9 @@ {235e3199-b059-4a3c-a053-dd8604c8e9fd} + + {738b47ea-2ba6-49a3-9bf8-a833ef46e218} + diff --git a/src/Makefile.am b/src/Makefile.am index 3e99022c8..10fd80e36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -145,7 +145,6 @@ hengband_SOURCES = \ monster/monster-process.c monster/monster-process.h \ monster/monster-status.c monster/monster-status.h \ monster/monster1.c monster/monster2.c \ - monster/monster-spell.h \ monster/horror-descriptions.c monster/horror-descriptions.h \ \ mutation/mutation.c mutation/mutation.h \ @@ -246,16 +245,18 @@ hengband_SOURCES = \ spell/spells-summon.c spell/spells-summon.h \ spell/spells-world.c spell/spells-world.h \ spell/spells-detection.c spell/spells-detection.h \ - spell/mspells1.c spell/mspells2.c spell/mspells3.c spell/mspells4.c \ - spell/mspell-summon.c spell/mspell-summon.h \ - spell/mspell-util.c spell/mspell-util.h \ - spell/mspell-curse.c spell/mspell-curse.h \ - spell/mspell-type.h \ - spell/mspell-damage-calculator.c spell/mspell-damage-calculator.h \ - spell/mspell-learn-checker.c spell/mspell-learn-checker.h \ - spell/mspell-breath.c spell/mspell-breath.h \ - spell/mspell-ball.c spell/mspell-ball.h \ - spell/mspell-bolt.c spell/mspell-bolt.h \ + \ + mspell/monster-spell.h \ + mspell/mspells1.c mspell/mspells2.c mspell/mspells3.c mspell/mspells4.c \ + mspell/mspell-summon.c mspell/mspell-summon.h \ + mspell/mspell-util.c mspell/mspell-util.h \ + mspell/mspell-curse.c mspell/mspell-curse.h \ + mspell/mspell-type.h \ + mspell/mspell-damage-calculator.c mspell/mspell-damage-calculator.h \ + mspell/mspell-learn-checker.c mspell/mspell-learn-checker.h \ + mspell/mspell-breath.c mspell/mspell-breath.h \ + mspell/mspell-ball.c mspell/mspell-ball.h \ + mspell/mspell-bolt.c mspell/mspell-bolt.h \ \ view-mainwindow.c view-mainwindow.h targeting.c targeting.h \ \ @@ -322,9 +323,9 @@ LIBS += $(XFT_LIBS) COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \ -Iautopick -Ibirth -Icmd -Icombat -Icore -Idungeon -Ieffect -Ifloor \ - -Igrid -Iinventory -Iio -Iknowledge -Imarket -Imind -Imonster -Imutation \ - -Iobject -Iplayer -Irealm -Iroom -Ispell -Isystem -Iterm -Iutil -Iview \ - -Iwizard -Iworld + -Igrid -Iinventory -Iio -Iknowledge -Imarket -Imind -Imonster -Imspell \ + -Imutation -Iobject -Iplayer -Irealm -Iroom -Ispell -Isystem -Iterm -Iutil \ + -Iview -Iwizard -Iworld install-exec-hook: if SET_GID diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c index 69f07fa13..e8b004027 100644 --- a/src/cmd/cmd-mane.c +++ b/src/cmd/cmd-mane.c @@ -20,7 +20,7 @@ #include "spell/spells-summon.h" #include "spell/spells-status.h" #include "monster/monster-status.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "monster/monster-process.h" #include "cmd-spell.h" #include "player/player-status.h" @@ -31,7 +31,7 @@ #include "spell/spells-type.h" #include "spell/spells2.h" #include "spell/spells3.h" -#include "spell/mspell-type.h" +#include "mspell/mspell-type.h" static int damage; diff --git a/src/combat/melee.c b/src/combat/melee.c index b1e957bf4..b5a24a99c 100644 --- a/src/combat/melee.c +++ b/src/combat/melee.c @@ -22,7 +22,7 @@ #include "melee.h" #include "monster/monster.h" #include "monster/monster-status.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "player/avatar.h" #include "realm/realm-hex.h" #include "realm/realm-song.h" diff --git a/src/combat/shoot.c b/src/combat/shoot.c index 889b39d53..26c6d2d8e 100644 --- a/src/combat/shoot.c +++ b/src/combat/shoot.c @@ -6,7 +6,7 @@ #include "monster/monster.h" #include "monster/monster-status.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "object/artifact.h" #include "player/avatar.h" #include "player/player-status.h" diff --git a/src/effect/effect-monster-spirit.c b/src/effect/effect-monster-spirit.c index af9896cc9..357ec312d 100644 --- a/src/effect/effect-monster-spirit.c +++ b/src/effect/effect-monster-spirit.c @@ -1,7 +1,7 @@ #include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-spirit.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "monster/monster-status.h" #include "player/player-effects.h" diff --git a/src/effect/effect-player-curse.c b/src/effect/effect-player-curse.c index 79c635424..b8c9d3ebc 100644 --- a/src/effect/effect-player-curse.c +++ b/src/effect/effect-player-curse.c @@ -3,7 +3,7 @@ #include "effect/effect-player-curse.h" #include "player/player-damage.h" #include "world/world.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "object/object-curse.h" #include "player/player-effects.h" diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c index 8c6410e68..8bdf2624d 100644 --- a/src/effect/effect-player-resist-hurt.c +++ b/src/effect/effect-player-resist-hurt.c @@ -7,7 +7,7 @@ #include "object/artifact.h" #include "player/player-effects.h" #include "mutation/mutation.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "spell/spells-status.h" #include "spell/spells3.h" diff --git a/src/effect/effect-player-spirit.c b/src/effect/effect-player-spirit.c index 839e6b600..74e4b2e15 100644 --- a/src/effect/effect-player-spirit.c +++ b/src/effect/effect-player-spirit.c @@ -1,7 +1,7 @@ #include "system/angband.h" #include "effect/effect-player-util.h" #include "effect/effect-player-spirit.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "player/player-damage.h" #include "player/player-effects.h" #include "world/world.h" diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c index 7c1db5869..261b17048 100644 --- a/src/effect/effect-player-switcher.c +++ b/src/effect/effect-player-switcher.c @@ -5,7 +5,7 @@ #include "effect/effect-player-oldies.h" #include "effect/effect-player-resist-hurt.h" #include "effect/effect-player-spirit.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "object/object-broken.h" #include "object/object-curse.h" #include "player/player-damage.h" diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c index cd327fbe7..866100f15 100644 --- a/src/io/input-key-processor.c +++ b/src/io/input-key-processor.c @@ -22,7 +22,7 @@ #include "floor/wild.h" #include "spell/spells-object.h" #include "mind/mind.h" // do_cmd_mind_browse() がある。後で移設する. -#include "spell/monster-spell.h" // do_cmd_cast_learned() がある。後で移設する. +#include "mspell/monster-spell.h" // do_cmd_cast_learned() がある。後で移設する. #include "mind/racial.h" // do_cmd_racial_power() がある。ファイル名変更？. #include "view/display-main-window.h" #include "knowledge/knowledge-autopick.h" diff --git a/src/io/special-class-dump.c b/src/io/special-class-dump.c index 6c451a977..0967ec4cf 100644 --- a/src/io/special-class-dump.c +++ b/src/io/special-class-dump.c @@ -8,7 +8,7 @@ #include "special-class-dump.h" #include "cmd/cmd-magiceat.h" #include "object/object-kind.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" typedef struct { BIT_FLAGS f4; diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c index a01f56b0a..45935fbc3 100644 --- a/src/monster/monster-process.c +++ b/src/monster/monster-process.c @@ -34,7 +34,7 @@ #include "grid/grid.h" #include "player/player-move.h" #include "monster/monster-status.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "monster/monster-process.h" void decide_drop_from_monster(player_type *target_ptr, MONSTER_IDX m_idx, bool is_riding_mon); diff --git a/src/monster/monster-safety-hiding.c b/src/monster/monster-safety-hiding.c index 0445137f4..0853c4e11 100644 --- a/src/monster/monster-safety-hiding.c +++ b/src/monster/monster-safety-hiding.c @@ -6,7 +6,7 @@ #include "monster/monster-safety-hiding.h" #include "monster/monster-dist-offsets.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" /*! * @brief モンスターが逃げ込める地点を走査する diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c index fce59e410..0a0c44a8a 100644 --- a/src/monster/monster-status.c +++ b/src/monster/monster-status.c @@ -13,7 +13,7 @@ #include "grid/grid.h" #include "monster/monster.h" #include "monster/monster-status.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "monster/monster-process.h" #include "spell/spells2.h" #include "spell/spells-summon.h" diff --git a/src/monster/monster-sweep-grid.c b/src/monster/monster-sweep-grid.c index 980cbbb73..20b776032 100644 --- a/src/monster/monster-sweep-grid.c +++ b/src/monster/monster-sweep-grid.c @@ -6,7 +6,7 @@ #include "monster/monster-sweep-grid.h" #include "monster/monster-safety-hiding.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" /*! * @brief モンスターがプレイヤーから逃走するかどうかを返す / diff --git a/src/monster/monster1.c b/src/monster/monster1.c index 97bf51ff0..35b2791d8 100644 --- a/src/monster/monster1.c +++ b/src/monster/monster1.c @@ -23,7 +23,7 @@ #include "object/object-kind-hook.h" #include "player/player-personality.h" #include "monster/monster.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "monster/monsterrace-hook.h" #include "spell/spells-summon.h" #include "player/patron.h" @@ -40,8 +40,8 @@ #include "locale/english.h" #include "market/arena-info-table.h" #include "spell/process-effect.h" -#include "spell/mspell-type.h" -#include "spell/mspell-damage-calculator.h" +#include "mspell/mspell-type.h" +#include "mspell/mspell-damage-calculator.h" /* * Pronoun arrays, by gender. diff --git a/src/monster/monster2.c b/src/monster/monster2.c index f6d049988..42ce493d3 100644 --- a/src/monster/monster2.c +++ b/src/monster/monster2.c @@ -35,7 +35,7 @@ #include "player/player-personality.h" #include "floor/wild.h" #include "object/warning.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "io/files.h" #include "view/display-main-window.h" #include "world/world.h" diff --git a/src/monster/monsterrace-hook.c b/src/monster/monsterrace-hook.c index 2e53670c5..613b97d65 100644 --- a/src/monster/monsterrace-hook.c +++ b/src/monster/monsterrace-hook.c @@ -3,7 +3,7 @@ #include "monster/monsterrace-hook.h" #include "monster/monster.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "floor/floor.h" #include "dungeon/dungeon.h" #include "monster/monster-race.h" diff --git a/src/monster/quantum-effect.c b/src/monster/quantum-effect.c index 278f2da7b..6a9196539 100644 --- a/src/monster/quantum-effect.c +++ b/src/monster/quantum-effect.c @@ -1,6 +1,6 @@ #include "system/angband.h" #include "quantum-effect.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "spell/spells3.h" /*! diff --git a/src/spell/monster-spell.h b/src/mspell/monster-spell.h similarity index 99% rename from src/spell/monster-spell.h rename to src/mspell/monster-spell.h index 56ea1e8d1..8cdd7560d 100644 --- a/src/spell/monster-spell.h +++ b/src/mspell/monster-spell.h @@ -1,6 +1,6 @@ #pragma once -#include "spell/mspell-type.h" +#include "mspell/mspell-type.h" /* Imitator */ typedef struct monster_power monster_power; diff --git a/src/spell/mspell-ball.c b/src/mspell/mspell-ball.c similarity index 98% rename from src/spell/mspell-ball.c rename to src/mspell/mspell-ball.c index 0b69c4dd9..865d5ffe9 100644 --- a/src/spell/mspell-ball.c +++ b/src/mspell/mspell-ball.c @@ -1,10 +1,10 @@ #include "system/angband.h" -#include "spell/mspell-ball.h" -#include "spell/mspell-type.h" -#include "spell/monster-spell.h" +#include "mspell/mspell-ball.h" +#include "mspell/mspell-type.h" +#include "mspell/monster-spell.h" #include "spell/spells-type.h" -#include "spell/mspell-util.h" -#include "spell/mspell-damage-calculator.h" +#include "mspell/mspell-util.h" +#include "mspell/mspell-damage-calculator.h" #include "monster/monster-status.h" /*! diff --git a/src/spell/mspell-ball.h b/src/mspell/mspell-ball.h similarity index 100% rename from src/spell/mspell-ball.h rename to src/mspell/mspell-ball.h diff --git a/src/spell/mspell-bolt.c b/src/mspell/mspell-bolt.c similarity index 98% rename from src/spell/mspell-bolt.c rename to src/mspell/mspell-bolt.c index f44e25a08..ead3a3e1f 100644 --- a/src/spell/mspell-bolt.c +++ b/src/mspell/mspell-bolt.c @@ -1,11 +1,11 @@ #include "system/angband.h" -#include "spell/mspell-bolt.h" +#include "mspell/mspell-bolt.h" #include "main/sound-definitions-table.h" -#include "spell/mspell-type.h" +#include "mspell/mspell-type.h" #include "spell/spells-type.h" -#include "spell/monster-spell.h" -#include "spell/mspell-damage-calculator.h" -#include "spell/mspell-util.h" +#include "mspell/monster-spell.h" +#include "mspell/mspell-damage-calculator.h" +#include "mspell/mspell-util.h" /*! * @brief RF4_SHOOTの処理。射撃。 / diff --git a/src/spell/mspell-bolt.h b/src/mspell/mspell-bolt.h similarity index 100% rename from src/spell/mspell-bolt.h rename to src/mspell/mspell-bolt.h diff --git a/src/spell/mspell-breath.c b/src/mspell/mspell-breath.c similarity index 98% rename from src/spell/mspell-breath.c rename to src/mspell/mspell-breath.c index ab3dc02e5..90d97737e 100644 --- a/src/spell/mspell-breath.c +++ b/src/mspell/mspell-breath.c @@ -1,10 +1,10 @@ #include "system/angband.h" -#include "spell/mspell-breath.h" -#include "spell/monster-spell.h" +#include "mspell/mspell-breath.h" +#include "mspell/monster-spell.h" #include "spell/spells-type.h" #include "main/sound-definitions-table.h" -#include "spell/mspell-util.h" -#include "spell/mspell-damage-calculator.h" +#include "mspell/mspell-util.h" +#include "mspell/mspell-damage-calculator.h" #include "player/player-move.h" /*! diff --git a/src/spell/mspell-breath.h b/src/mspell/mspell-breath.h similarity index 100% rename from src/spell/mspell-breath.h rename to src/mspell/mspell-breath.h diff --git a/src/spell/mspell-curse.c b/src/mspell/mspell-curse.c similarity index 97% rename from src/spell/mspell-curse.c rename to src/mspell/mspell-curse.c index 4a069166b..255abc6b0 100644 --- a/src/spell/mspell-curse.c +++ b/src/mspell/mspell-curse.c @@ -1,11 +1,11 @@ #include "system/angband.h" -#include "spell/mspell-curse.h" -#include "spell/monster-spell.h" +#include "mspell/mspell-curse.h" +#include "mspell/monster-spell.h" #include "spell/spells-type.h" -#include "spell/mspell-util.h" +#include "mspell/mspell-util.h" #include "player/player-move.h" -#include "spell/mspell-type.h" -#include "spell/mspell-damage-calculator.h" +#include "mspell/mspell-type.h" +#include "mspell/mspell-damage-calculator.h" /*! * @brief RF5_CAUSE_*のメッセージ処理関数 / diff --git a/src/spell/mspell-curse.h b/src/mspell/mspell-curse.h similarity index 100% rename from src/spell/mspell-curse.h rename to src/mspell/mspell-curse.h diff --git a/src/spell/mspell-damage-calculator.c b/src/mspell/mspell-damage-calculator.c similarity index 99% rename from src/spell/mspell-damage-calculator.c rename to src/mspell/mspell-damage-calculator.c index 345d3e473..f9590edce 100644 --- a/src/spell/mspell-damage-calculator.c +++ b/src/mspell/mspell-damage-calculator.c @@ -1,7 +1,7 @@ #include "system/angband.h" -#include "spell/mspell-type.h" -#include "spell/mspell-damage-calculator.h" -#include "spell/monster-spell.h" +#include "mspell/mspell-type.h" +#include "mspell/mspell-damage-calculator.h" +#include "mspell/monster-spell.h" #include "monster/monster-status.h" /*! diff --git a/src/spell/mspell-damage-calculator.h b/src/mspell/mspell-damage-calculator.h similarity index 100% rename from src/spell/mspell-damage-calculator.h rename to src/mspell/mspell-damage-calculator.h diff --git a/src/spell/mspell-learn-checker.c b/src/mspell/mspell-learn-checker.c similarity index 100% rename from src/spell/mspell-learn-checker.c rename to src/mspell/mspell-learn-checker.c diff --git a/src/spell/mspell-learn-checker.h b/src/mspell/mspell-learn-checker.h similarity index 100% rename from src/spell/mspell-learn-checker.h rename to src/mspell/mspell-learn-checker.h diff --git a/src/spell/mspell-summon.c b/src/mspell/mspell-summon.c similarity index 99% rename from src/spell/mspell-summon.c rename to src/mspell/mspell-summon.c index f047e2e4a..7d26b5cf0 100644 --- a/src/spell/mspell-summon.c +++ b/src/mspell/mspell-summon.c @@ -1,10 +1,10 @@ #include "system/angband.h" -#include "spell/mspell-summon.h" +#include "mspell/mspell-summon.h" #include "spell/spells-summon.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "spell/spells-type.h" #include "effect/effect-characteristics.h" -#include "spell/mspell-util.h" +#include "mspell/mspell-util.h" #include "spell/spells2.h" #include "spell/process-effect.h" #include "player/player-move.h" diff --git a/src/spell/mspell-summon.h b/src/mspell/mspell-summon.h similarity index 100% rename from src/spell/mspell-summon.h rename to src/mspell/mspell-summon.h diff --git a/src/spell/mspell-type.h b/src/mspell/mspell-type.h similarity index 100% rename from src/spell/mspell-type.h rename to src/mspell/mspell-type.h diff --git a/src/spell/mspell-util.c b/src/mspell/mspell-util.c similarity index 98% rename from src/spell/mspell-util.c rename to src/mspell/mspell-util.c index a825776c2..f0eb6a626 100644 --- a/src/spell/mspell-util.c +++ b/src/mspell/mspell-util.c @@ -1,6 +1,6 @@ #include "system/angband.h" -#include "spell/mspell-util.h" -#include "spell/monster-spell.h" +#include "mspell/mspell-util.h" +#include "mspell/monster-spell.h" #include "player/player-move.h" /*! diff --git a/src/spell/mspell-util.h b/src/mspell/mspell-util.h similarity index 100% rename from src/spell/mspell-util.h rename to src/mspell/mspell-util.h diff --git a/src/spell/mspells1.c b/src/mspell/mspells1.c similarity index 99% rename from src/spell/mspells1.c rename to src/mspell/mspells1.c index 2f887455e..aa0e5695c 100644 --- a/src/spell/mspells1.c +++ b/src/mspell/mspells1.c @@ -50,7 +50,7 @@ #include "player/player-move.h" #include "player/player-status.h" #include "monster/monster.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "spell/spells-type.h" #include "world/world.h" #include "realm/realm-song.h" @@ -59,7 +59,7 @@ #include "player/player-class.h" #include "spell/process-effect.h" #include "spell/spells3.h" -#include "spell/mspell-learn-checker.h" +#include "mspell/mspell-learn-checker.h" #define DO_SPELL_NONE 0 #define DO_SPELL_BR_LITE 1 diff --git a/src/spell/mspells2.c b/src/mspell/mspells2.c similarity index 99% rename from src/spell/mspells2.c rename to src/mspell/mspells2.c index 593cb4ae2..2dc5b3bac 100644 --- a/src/spell/mspells2.c +++ b/src/mspell/mspells2.c @@ -24,7 +24,7 @@ #include "player/player-class.h" #include "monster/monster.h" #include "monster/monster-status.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "spell/spells-type.h" #include "dungeon/dungeon.h" #include "world/world.h" diff --git a/src/spell/mspells3.c b/src/mspell/mspells3.c similarity index 99% rename from src/spell/mspells3.c rename to src/mspell/mspells3.c index 295ad03a7..1636b44d5 100644 --- a/src/spell/mspells3.c +++ b/src/mspell/mspells3.c @@ -17,12 +17,12 @@ #include "floor/floor.h" #include "grid/grid.h" -#include "spells-summon.h" +#include "spell/spells-summon.h" #include "player/avatar.h" -#include "spells-status.h" +#include "spell/spells-status.h" #include "cmd-spell.h" #include "player/player-status.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "monster/monster-status.h" #include "spell/spells-type.h" #include "cmd-basic.h" @@ -31,8 +31,8 @@ #include "view/display-main-window.h" #include "spell/spells2.h" #include "spell/spells3.h" -#include "spell/mspell-type.h" -#include "spell/mspell-damage-calculator.h" +#include "mspell/mspell-type.h" +#include "mspell/mspell-damage-calculator.h" /*! * @brief モンスター魔法をプレイヤーが使用する場合の換算レベル diff --git a/src/spell/mspells4.c b/src/mspell/mspells4.c similarity index 99% rename from src/spell/mspells4.c rename to src/mspell/mspells4.c index 9e8df1964..9ff9fa264 100644 --- a/src/spell/mspells4.c +++ b/src/mspell/mspells4.c @@ -18,7 +18,7 @@ #include "player/player-damage.h" #include "realm/realm-hex.h" #include "player/player-move.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "monster/monster-status.h" #include "spell/spells-type.h" #include "combat/melee.h" @@ -26,14 +26,14 @@ #include "spell/process-effect.h" #include "spell/spells2.h" #include "spell/spells3.h" -#include "spell/mspell-summon.h" -#include "spell/mspell-util.h" -#include "spell/mspell-curse.h" -#include "spell/mspell-type.h" -#include "spell/mspell-damage-calculator.h" -#include "spell/mspell-breath.h" -#include "spell/mspell-ball.h" -#include "spell/mspell-bolt.h" +#include "mspell/mspell-summon.h" +#include "mspell/mspell-util.h" +#include "mspell/mspell-curse.h" +#include "mspell/mspell-type.h" +#include "mspell/mspell-damage-calculator.h" +#include "mspell/mspell-breath.h" +#include "mspell/mspell-ball.h" +#include "mspell/mspell-bolt.h" /*! * @brief RF4_SHRIEKの処理。叫び。 / diff --git a/src/object/warning.c b/src/object/warning.c index 337ded35e..6cc5758d9 100644 --- a/src/object/warning.c +++ b/src/object/warning.c @@ -9,15 +9,15 @@ #include "object/warning.h" #include "player/player-status.h" #include "monster/monster.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "spell/spells-type.h" #include "object/object-flavor.h" #include "dungeon/dungeon.h" #include "player/mimic-info-table.h" #include "player/player-class.h" #include "melee.h" -#include "spell/mspell-type.h" -#include "spell/mspell-damage-calculator.h" +#include "mspell/mspell-type.h" +#include "mspell/mspell-damage-calculator.h" /*! * @brief 警告を放つアイテムを選択する / diff --git a/src/player/player-damage.c b/src/player/player-damage.c index 8770c13fd..c8dcdab13 100644 --- a/src/player/player-damage.c +++ b/src/player/player-damage.c @@ -24,7 +24,7 @@ #include "player/player-effects.h" #include "player/player-class.h" #include "player/player-race.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "world/world.h" #include "view/display-main-window.h" #include "dungeon/quest.h" diff --git a/src/player/player-effects.c b/src/player/player-effects.c index fba32e55e..40414844f 100644 --- a/src/player/player-effects.c +++ b/src/player/player-effects.c @@ -47,7 +47,7 @@ #include "monster/monster-status.h" #include "combat/snipe.h" #include "io/files.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "world/world.h" #include "object/object-kind.h" #include "autopick/autopick-reader-writer.h" diff --git a/src/player/player-move.c b/src/player/player-move.c index af7d6fcae..016b5633b 100644 --- a/src/player/player-move.c +++ b/src/player/player-move.c @@ -165,7 +165,7 @@ #include "grid/feature.h" #include "object/warning.h" #include "monster/monster.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "monster/monster-status.h" #include "object/object-hook.h" #include "object/object-flavor.h" diff --git a/src/spell/spells3.c b/src/spell/spells3.c index 7931ca928..d22cc33a3 100644 --- a/src/spell/spells3.c +++ b/src/spell/spells3.c @@ -45,7 +45,7 @@ #include "market/building-util.h" #include "monster/monster-process.h" #include "monster/monster-status.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "io/write-diary.h" #include "cmd/cmd-save.h" #include "cmd/cmd-spell.h" diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c index b1972b99b..f7a78336d 100644 --- a/src/wizard/wizard-special-process.c +++ b/src/wizard/wizard-special-process.c @@ -52,7 +52,7 @@ #include "grid/grid.h" #include "dungeon/dungeon-file.h" #include "io/files.h" -#include "spell/monster-spell.h" +#include "mspell/monster-spell.h" #include "market/building.h" #include "object/object-kind.h" #include "io/targeting.h" -- 2.11.0