teleport.c is the astral space implementation, and it is not one of the core concepts, so move it out of the kernel/ directory

src/CMakeLists.txt

@@ -88,6 +88,7 @@ set (ERESSEA_SRC
   names.c
   lighthouse.c
   reports.c
+  teleport.c
   guard.c
   prefix.c
   donations.c

src/bindings.c

@@ -45,7 +45,6 @@ without prior permission by the authors of Eressea.
 #include <kernel/item.h>
 #include <kernel/order.h>
 #include <kernel/ship.h>
-#include <kernel/teleport.h>
 #include <kernel/faction.h>
 #include <kernel/save.h>
 #include <kernel/spell.h>
@@ -54,6 +53,7 @@ without prior permission by the authors of Eressea.
 #include "creport.h"
 #include "economy.h"
 #include "summary.h"
+#include "teleport.h"
 #include "laws.h"
 #include "monster.h"
 #include "market.h"

src/creport.c

@@ -36,6 +36,7 @@ without prior permission by the authors of Eressea.
 #include "move.h"
 #include "reports.h"
 #include "alchemy.h"
+#include "teleport.h"
 
 /* kernel includes */
 #include <kernel/alliance.h>
@@ -55,7 +56,6 @@ without prior permission by the authors of Eressea.
 #include <kernel/ship.h>
 #include <kernel/spell.h>
 #include <kernel/spellbook.h>
-#include <kernel/teleport.h>
 #include <kernel/terrain.h>
 #include <kernel/unit.h>
 #include <kernel/save.h>

src/gmtool.c

@@ -19,6 +19,7 @@
 #include "listbox.h"
 #include "wormhole.h"
 #include "calendar.h"
+#include "teleport.h"
 
 #include <modules/xmas.h>
 #include <modules/gmcmd.h>
@@ -36,7 +37,6 @@
 #include <kernel/plane.h>
 #include <kernel/race.h>
 #include <kernel/region.h>
-#include <kernel/teleport.h>
 #include <kernel/terrainid.h>
 #include <kernel/unit.h>
 #include <kernel/resources.h>

src/kernel/CMakeLists.txt

@@ -50,7 +50,6 @@ ship.c
 skills.c
 spellbook.c
 spell.c
-teleport.c
 terrain.c
 unit.c
 xmlreader.c

src/laws.c

@@ -36,6 +36,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "study.h"
 #include "wormhole.h"
 #include "prefix.h"
+#include "teleport.h"
 #include "calendar.h"
 #include "guard.h"
 
@@ -59,7 +60,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/ship.h>
 #include <kernel/spell.h>
 #include <kernel/spellbook.h>
-#include <kernel/teleport.h>
 #include <kernel/terrain.h>
 #include <kernel/terrainid.h>   /* for volcanoes in emigration (needs a flag) */
 #include <kernel/unit.h>

src/magic.c

@@ -41,7 +41,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/ship.h>
 #include <kernel/spell.h>
 #include <kernel/spellbook.h>
-#include <kernel/teleport.h>
 #include <kernel/terrain.h>
 #include <kernel/unit.h>
 #include <kernel/version.h>
@@ -1131,7 +1130,7 @@ double magic_resistance(unit * target)
     double probability = rc->magres;
     const plane *pl = rplane(target->region);
 
-    if (rc == get_race(RC_HIRNTOETER) && pl!=get_astralplane()) {
+    if (rc == get_race(RC_HIRNTOETER) && !pl) {
         probability /= 2;
     }
     assert(target->number > 0);
@@ -1994,7 +1993,7 @@ static spellparameter *add_spellparameter(region * target_r, unit * u,
         case 'r':
             /* Parameter sind zwei Regionskoordinaten */
             /* this silly thing only works in the normal plane! */
-            j = addparam_region(param + i, &spobj, u, ord, get_normalplane());
+            j = addparam_region(param + i, &spobj, u, ord, NULL);
             ++c;
             break;
         case 'b':

src/magic.test.c

@@ -1,6 +1,7 @@
 #include <platform.h>
 
 #include "magic.h"
+#include "teleport.h"
 
 #include <kernel/race.h>
 #include <kernel/faction.h>
@@ -9,7 +10,6 @@
 #include <kernel/region.h>
 #include <kernel/spell.h>
 #include <kernel/spellbook.h>
-#include <kernel/teleport.h>
 #include <kernel/unit.h>
 #include <kernel/pool.h>
 #include <quicklist.h>

src/move.c

@@ -44,13 +44,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/render.h>
 #include <kernel/save.h>
 #include <kernel/ship.h>
-#include <kernel/teleport.h>
 #include <kernel/terrain.h>
 #include <kernel/terrainid.h>
 #include <kernel/unit.h>
 
 #include <spells/flyingship.h>
 
+#include "teleport.h"
 #include "direction.h"
 #include "calendar.h"
 #include "skill.h"

src/report.c

@@ -42,6 +42,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "upkeep.h"
 #include "vortex.h"
 #include "calendar.h"
+#include "teleport.h"
 
 /* kernel includes */
 #include <kernel/ally.h>
@@ -65,7 +66,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/ship.h>
 #include <kernel/spell.h>
 #include <kernel/spellbook.h>
-#include <kernel/teleport.h>
 #include <kernel/terrain.h>
 #include <kernel/terrainid.h>
 #include <kernel/unit.h>

src/spells.c

@@ -22,6 +22,7 @@
 #include "direction.h"
 #include "randenc.h"
 #include "monster.h"
+#include "teleport.h"
 
 #include <spells/borders.h>
 #include <spells/buildingcurse.h>
@@ -49,7 +50,6 @@
 #include <kernel/save.h>
 #include <kernel/ship.h>
 #include <kernel/spell.h>
-#include <kernel/teleport.h>
 #include <kernel/terrain.h>
 #include <kernel/terrainid.h>
 #include <kernel/unit.h>

src/teleport.c

@@ -21,19 +21,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "teleport.h"
 
 /* kernel includes */
-#include "equipment.h"
-#include "unit.h"
-#include "region.h"
-#include "race.h"
-#include "skill.h"
-#include "terrain.h"
-#include "faction.h"
-#include "plane.h"
+#include <kernel/equipment.h>
+#include <kernel/unit.h>
+#include <kernel/region.h>
+#include <kernel/race.h>
+#include <kernel/terrain.h>
+#include <kernel/faction.h>
+#include <kernel/plane.h>
 
 /* util includes */
 #include <util/log.h>
 #include <util/rng.h>
 
+#include "skill.h"
 #include "monster.h"
 
 /* libc includes */