From fa880e305e21ab0d3fdbbc9c0f7f25d140195322 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Fri, 5 Jun 2020 22:21:03 +0900
Subject: [PATCH] [Refactor] #40414 Renamed spells2.c/h to spells-crusade.c/h

---
 src/realm/realm-chaos.c             |  1 -
 src/realm/realm-crusade.c           |  2 +-
 src/spell-kind/spells-shuffle.c     |  1 -
 src/spell-realm/spells-crusade.c    | 73 +++----------------------------------
 src/wizard/wizard-special-process.c |  1 -
 5 files changed, 7 insertions(+), 71 deletions(-)

diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c
index 9eb5e9cbf..188e8bd52 100644
--- a/src/realm/realm-chaos.c
+++ b/src/realm/realm-chaos.c
@@ -16,7 +16,6 @@
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-type.h"
-#include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "util/util.h"
 #include "view/display-main-window.h"
diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index afe4a71f9..1ab8dcb6e 100644
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -18,7 +18,7 @@
 #include "spell/spells-summon.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
-#include "spell/spells2.h"
+#include "spell-realm/spells-crusade.h"
 #include "spell/spells3.h"
 #include "util/util.h"
 #include "world/world.h"
diff --git a/src/spell-kind/spells-shuffle.c b/src/spell-kind/spells-shuffle.c
index 0bda4d3eb..e17b14293 100644
--- a/src/spell-kind/spells-shuffle.c
+++ b/src/spell-kind/spells-shuffle.c
@@ -13,7 +13,6 @@
 #include "spell-kind/spells-teleport.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell/spells2.h"
 
 /*!
  * @brief トランプ領域の「シャッフル」の効果をランダムに決めて処理する。
diff --git a/src/spell-realm/spells-crusade.c b/src/spell-realm/spells-crusade.c
index e83c1a8e2..27a77fdd8 100644
--- a/src/spell-realm/spells-crusade.c
+++ b/src/spell-realm/spells-crusade.c
@@ -1,77 +1,16 @@
 /*!
- * @brief 魔法効果の実装/ Spell code
- * @date 2014/07/15
- * @author
- * <pre>
- * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
- * This software may be copied and distributed for educational, research,
- * and not for profit purposes provided that this copyright and statement
- * are included in all such copies.  Other copyrights may also apply.
- * </pre>
+ * @brief 破邪魔法処理
+ * @date 2020/06/05
+ * @author Hourier
  */
 
-#include "spell/spells2.h"
-#include "cmd-action/cmd-attack.h"
-#include "cmd-action/cmd-pet.h"
-#include "cmd-io/cmd-dump.h"
-#include "combat/combat-options-type.h"
-#include "core/stuff-handler.h"
-#include "dungeon/dungeon.h"
-#include "dungeon/quest.h"
+#include "spell-realm/spells-crusade.h"
 #include "effect/effect-characteristics.h"
-#include "effect/spells-effect-util.h"
-#include "floor/floor-events.h"
-#include "floor/floor-object.h"
-#include "grid/feature.h"
-#include "grid/grid.h"
-#include "inventory/player-inventory.h"
+#include "floor/floor.h"
 #include "io/targeting.h"
-#include "io/write-diary.h"
-#include "locale/english.h"
-#include "main/sound-definitions-table.h"
-#include "monster/creature.h"
-#include "monster/monster-race.h"
-#include "monster/monster-status.h"
-#include "mutation/mutation.h"
-#include "object-enchant/item-feeling.h"
-#include "object/item-use-flags.h"
-#include "perception/object-perception.h"
-#include "object/object-flavor.h"
-#include "object/object-generator.h"
-#include "object/object-kind-hook.h"
-#include "object/object-mark-types.h"
-#include "object-enchant/special-object-flags.h"
-#include "pet/pet-fall-off.h"
-#include "pet/pet-util.h"
-#include "perception/simple-perception.h"
-#include "player/avatar.h"
-#include "player/player-class.h"
-#include "player/player-damage.h"
-#include "player/player-effects.h"
-#include "player/player-skill.h"
-#include "player/player-status.h"
-#include "spell-kind/spells-charm.h"
+#include "spell/range-calc.h"
 #include "spell/process-effect.h"
-#include "spell/spells-diceroll.h"
-#include "spell-kind/spells-chaos.h"
-#include "spell-kind/spells-floor.h"
-#include "spell-kind/spells-genocide.h"
-#include "spell-kind/spells-launcher.h"
-#include "spell-kind/spells-lite.h"
-#include "spell-kind/spells-neighbor.h"
-#include "spell-kind/spells-sight.h"
-#include "spell-kind/spells-specific-bolt.h"
-#include "spell-kind/spells-teleport.h"
-#include "spell/spells-status.h"
-#include "spell/spells-summon.h"
 #include "spell/spells-type.h"
-#include "spell/range-calc.h"
-#include "spell/spells3.h"
-#include "sv-definition/sv-food-types.h"
-#include "system/system-variables.h"
-#include "util/util.h"
-#include "view/display-main-window.h"
-#include "world/world.h"
 
 /*!
 * @brief 破邪魔法「神の怒り」の処理としてターゲットを指定した後分解のボールを最大20回発生させる。
diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index f3b1236e2..bbbe3c28c 100644
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -60,7 +60,6 @@
 #include "spell-kind/spells-teleport.h"
 #include "spell/spells-util.h"
 #include "spell-kind/spells-world.h"
-#include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "system/angband-version.h"
 #include "term/gameterm.h"
-- 
2.11.0