From 8200fdb6c24d85310833b53cda500490675ba8f3 Mon Sep 17 00:00:00 2001
From: Philipp Dreher <dreher.philipp@googlemail.com>
Date: Mon, 2 Nov 2015 15:40:26 +0100
Subject: [PATCH] moved files for flyingship to subdir "spells"

---
 src/CMakeLists.txt                 | 3 +--
 src/bind_monsters.c                | 3 ++-
 src/move.c                         | 3 ++-
 src/spells.c                       | 2 +-
 src/spells/CMakeLists.txt          | 1 +
 src/{ => spells}/flyingship.c      | 0
 src/{ => spells}/flyingship.h      | 0
 src/{ => spells}/flyingship.test.c | 0
 8 files changed, 7 insertions(+), 5 deletions(-)
 rename src/{ => spells}/flyingship.c (100%)
 rename src/{ => spells}/flyingship.h (100%)
 rename src/{ => spells}/flyingship.test.c (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1817f9cb1..037898ed9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -117,7 +117,6 @@ set (ERESSEA_SRC
   travelthru.c
   monsters.c
   wormhole.c
-  flyingship.c
   ${SPELLS_SRC}
   ${RACES_SRC}
   ${ITEMS_SRC}
@@ -209,7 +208,7 @@ set(TESTS_SRC
   spy.test.c
   study.test.c
   upkeep.test.c
-  flyingship.test.c
+  spells/flyingship.test.c
   spells/magicresistance.test.c
   ${ATTRIBUTES_TESTS}
   ${UTIL_TESTS}
diff --git a/src/bind_monsters.c b/src/bind_monsters.c
index 67ca8ef64..6589e002a 100644
--- a/src/bind_monsters.c
+++ b/src/bind_monsters.c
@@ -1,7 +1,6 @@
 #include <platform.h>
 #include "spells/shipcurse.h"
 #include "monster.h"
-#include "flyingship.h"
 
 #include <kernel/equipment.h>
 #include <kernel/faction.h>
@@ -10,6 +9,8 @@
 #include <kernel/spellbook.h>
 #include <kernel/unit.h>
 
+#include <spells/flyingship.h>
+
 #include <quicklist.h>
 
 #include <tolua.h>
diff --git a/src/move.c b/src/move.c
index 87b1e44f7..8986f2bcf 100644
--- a/src/move.c
+++ b/src/move.c
@@ -28,7 +28,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "monster.h"
 #include "lighthouse.h"
 #include "piracy.h"
-#include "flyingship.h"
 
 #include <kernel/build.h>
 #include <kernel/building.h>
@@ -49,6 +48,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/terrainid.h>
 #include <kernel/unit.h>
 
+#include <spells/flyingship.h>
+
 #include "direction.h"
 #include "calendar.h"
 #include "skill.h"
diff --git a/src/spells.c b/src/spells.c
index 82548ae71..32d02570b 100644
--- a/src/spells.c
+++ b/src/spells.c
@@ -22,7 +22,6 @@
 #include "direction.h"
 #include "randenc.h"
 #include "monster.h"
-#include "flyingship.h"
 
 #include <spells/borders.h>
 #include <spells/buildingcurse.h>
@@ -31,6 +30,7 @@
 #include <spells/shipcurse.h>
 #include <spells/combatspells.h>
 #include <spells/alp.h>
+#include <spells/flyingship.h>
 
 /* kernel includes */
 #include <kernel/curse.h>
diff --git a/src/spells/CMakeLists.txt b/src/spells/CMakeLists.txt
index 335189c21..6219708d4 100644
--- a/src/spells/CMakeLists.txt
+++ b/src/spells/CMakeLists.txt
@@ -8,6 +8,7 @@ regioncurse.c
 shipcurse.c
 unitcurse.c
 magicresistance.c
+flyingship.c
 )
 FOREACH(_FILE ${_FILES})
     LIST(APPEND _SOURCES ${PROJECT_NAME}/${_FILE})
diff --git a/src/flyingship.c b/src/spells/flyingship.c
similarity index 100%
rename from src/flyingship.c
rename to src/spells/flyingship.c
diff --git a/src/flyingship.h b/src/spells/flyingship.h
similarity index 100%
rename from src/flyingship.h
rename to src/spells/flyingship.h
diff --git a/src/flyingship.test.c b/src/spells/flyingship.test.c
similarity index 100%
rename from src/flyingship.test.c
rename to src/spells/flyingship.test.c