moving combatspells.c to the spells/ directory

src/common/kernel/Jamfile

@@ -14,7 +14,6 @@ SOURCES =
  build.c
  building.c
  calendar.c
- combatspells.c
  curse.c
  eressea.c
  equipment.c

src/common/kernel/kernel.vcproj

@@ -320,9 +320,6 @@
 		<File
 			RelativePath=".\calendar.c">
 		</File>
-		<File
-			RelativePath=".\combatspells.c">
-		</File>
 		<File
 			RelativePath=".\curse.c">
 		</File>

src/common/spells/Jamfile

@@ -10,6 +10,7 @@ SubDirHdrs $(SUBDIR)/../.. ;
 SOURCES =
  alp.c
  buildingcurse.c
+ combatspells.c
  regioncurse.c
  shipcurse.c
  spells.c

src/common/spells/combatspells.c

@@ -14,21 +14,21 @@
 #include "combatspells.h"
 
 /* kernel includes */
-#include "battle.h"
+#include <kernel/battle.h>
-#include "build.h"
+#include <kernel/build.h>
-#include "building.h"
+#include <kernel/building.h>
-#include "faction.h"
+#include <kernel/faction.h>
-#include "item.h"
+#include <kernel/item.h>
-#include "magic.h"
+#include <kernel/magic.h>
-#include "message.h"
+#include <kernel/message.h>
-#include "order.h"
+#include <kernel/order.h>
-#include "region.h"
+#include <kernel/region.h>
-#include "unit.h"
+#include <kernel/unit.h>
-#include "movement.h"
+#include <kernel/movement.h>
-#include "spell.h"
+#include <kernel/spell.h>
-#include "spellid.h"
+#include <kernel/spellid.h>
-#include "race.h"
+#include <kernel/race.h>
-#include "skill.h"
+#include <kernel/skill.h>
 
 /* util includes */
 #include <rand.h>

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>

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>