From 8483c555fc0d2920ec4ca57d0d8b0aef7e0da45c Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 23 Oct 2005 09:10:41 +0000
Subject: [PATCH] moving combatspells.c to the spells/ directory

---
 src/common/kernel/Jamfile                    |  1 -
 src/common/kernel/kernel.vcproj              |  3 --
 src/common/spells/Jamfile                    |  1 +
 src/common/{kernel => spells}/combatspells.c | 30 ++++++++++----------
 src/common/{kernel => spells}/combatspells.h |  0
 src/common/spells/spells.c                   |  2 +-
 src/common/spells/spells.vcproj              |  6 ++++
 7 files changed, 23 insertions(+), 20 deletions(-)
 rename src/common/{kernel => spells}/combatspells.c (99%)
 rename src/common/{kernel => spells}/combatspells.h (100%)

diff --git a/src/common/kernel/Jamfile b/src/common/kernel/Jamfile
index efc1adebe..18112e215 100644
--- a/src/common/kernel/Jamfile
+++ b/src/common/kernel/Jamfile
@@ -14,7 +14,6 @@ SOURCES =
  build.c
  building.c
  calendar.c
- combatspells.c
  curse.c
  eressea.c
  equipment.c
diff --git a/src/common/kernel/kernel.vcproj b/src/common/kernel/kernel.vcproj
index 0f8fe45ab..8f21ec865 100644
--- a/src/common/kernel/kernel.vcproj
+++ b/src/common/kernel/kernel.vcproj
@@ -320,9 +320,6 @@
 		<File
 			RelativePath=".\calendar.c">
 		</File>
-		<File
-			RelativePath=".\combatspells.c">
-		</File>
 		<File
 			RelativePath=".\curse.c">
 		</File>
diff --git a/src/common/spells/Jamfile b/src/common/spells/Jamfile
index e6a099dd7..de52e8744 100644
--- a/src/common/spells/Jamfile
+++ b/src/common/spells/Jamfile
@@ -10,6 +10,7 @@ SubDirHdrs $(SUBDIR)/../.. ;
 SOURCES =
  alp.c
  buildingcurse.c
+ combatspells.c
  regioncurse.c
  shipcurse.c
  spells.c
diff --git a/src/common/kernel/combatspells.c b/src/common/spells/combatspells.c
similarity index 99%
rename from src/common/kernel/combatspells.c
rename to src/common/spells/combatspells.c
index cce9e7ccf..1b9821c0a 100644
--- a/src/common/kernel/combatspells.c
+++ b/src/common/spells/combatspells.c
@@ -14,21 +14,21 @@
 #include "combatspells.h"
 
 /* kernel includes */
-#include "battle.h"
-#include "build.h"
-#include "building.h"
-#include "faction.h"
-#include "item.h"
-#include "magic.h"
-#include "message.h"
-#include "order.h"
-#include "region.h"
-#include "unit.h"
-#include "movement.h"
-#include "spell.h"
-#include "spellid.h"
-#include "race.h"
-#include "skill.h"
+#include <kernel/battle.h>
+#include <kernel/build.h>
+#include <kernel/building.h>
+#include <kernel/faction.h>
+#include <kernel/item.h>
+#include <kernel/magic.h>
+#include <kernel/message.h>
+#include <kernel/order.h>
+#include <kernel/region.h>
+#include <kernel/unit.h>
+#include <kernel/movement.h>
+#include <kernel/spell.h>
+#include <kernel/spellid.h>
+#include <kernel/race.h>
+#include <kernel/skill.h>
 
 /* util includes */
 #include <rand.h>
diff --git a/src/common/kernel/combatspells.h b/src/common/spells/combatspells.h
similarity index 100%
rename from src/common/kernel/combatspells.h
rename to src/common/spells/combatspells.h
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 8068664ac..47983b750 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -17,6 +17,7 @@
 #include "spells.h"
 
 #include "alp.h"
+#include "combatspells.h"
 
 #include <curse.h>
 
@@ -28,7 +29,6 @@ extern void ct_register(const struct curse_type * ct);
 #include <kernel/battle.h> /* für lovar */
 #include <kernel/border.h>
 #include <kernel/building.h>
-#include <kernel/combatspells.h>
 #include <kernel/curse.h>
 #include <kernel/spellid.h>
 #include <kernel/faction.h>
diff --git a/src/common/spells/spells.vcproj b/src/common/spells/spells.vcproj
index 9c4d248b6..bf0a4fda1 100644
--- a/src/common/spells/spells.vcproj
+++ b/src/common/spells/spells.vcproj
@@ -179,6 +179,9 @@
 			<File
 				RelativePath=".\buildingcurse.h">
 			</File>
+			<File
+				RelativePath=".\combatspells.h">
+			</File>
 			<File
 				RelativePath=".\regioncurse.h">
 			</File>
@@ -198,6 +201,9 @@
 		<File
 			RelativePath=".\buildingcurse.c">
 		</File>
+		<File
+			RelativePath=".\combatspells.c">
+		</File>
 		<File
 			RelativePath=".\regioncurse.c">
 		</File>