movement.h -> move.h

src/common/gamecode/creport.c

@@ -45,7 +45,7 @@
 #include <kernel/karma.h>
 #include <kernel/magic.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>
 #include <kernel/race.h>

src/common/gamecode/economy.c

@@ -40,7 +40,7 @@
 #include <kernel/karma.h>
 #include <kernel/magic.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>
 #include <kernel/pool.h>

src/common/gamecode/items.c

@@ -10,7 +10,7 @@
 #include <kernel/item.h>
 #include <kernel/magic.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>
 #include <kernel/pool.h>

src/common/gamecode/laws.c

@@ -49,7 +49,7 @@
 #include <kernel/karma.h>
 #include <kernel/magic.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>
 #include <kernel/pool.h>

src/common/gamecode/monster.c

@@ -43,7 +43,7 @@
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/names.h>
 #include <kernel/order.h>
 #include <kernel/pathfinder.h>

src/common/gamecode/randenc.c

@@ -38,7 +38,7 @@
 #include <kernel/karma.h>
 #include <kernel/magic.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/names.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>

src/common/gamecode/report.c

@@ -48,7 +48,7 @@
 #include <kernel/item.h>
 #include <kernel/karma.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/objtypes.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>

src/common/gamecode/spy.c

@@ -31,7 +31,7 @@
 #include <kernel/faction.h>
 #include <kernel/magic.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/race.h>
 #include <kernel/region.h>
 #include <kernel/ship.h>

src/common/gamecode/study.c

@@ -33,7 +33,7 @@
 #include <kernel/karma.h>
 #include <kernel/magic.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>
 #include <kernel/pool.h>

src/common/gamecode/xmlreport.c

@@ -45,7 +45,7 @@
 #include <kernel/karma.h>
 #include <kernel/magic.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>
 #include <kernel/race.h>

src/common/items/speedsail.c

@@ -20,7 +20,7 @@
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/plane.h>
 #include <kernel/region.h>
 #include <kernel/ship.h>

src/common/kernel/alchemy.c

@@ -33,7 +33,7 @@
 #include "race.h"
 #include "unit.h"
 #include "skill.h"
-#include "movement.h"
+#include "move.h"
 
 /* util includes */
 #include <util/attrib.h>

src/common/kernel/battle.c

@@ -29,7 +29,7 @@
 #include "karma.h"
 #include "magic.h"
 #include "message.h"
-#include "movement.h"
+#include "move.h"
 #include "names.h"
 #include "order.h"
 #include "plane.h"

src/common/kernel/build.c

@@ -33,7 +33,7 @@
 #include "item.h"
 #include "magic.h"
 #include "message.h"
-#include "movement.h"
+#include "move.h"
 #include "order.h"
 #include "pool.h"
 #include "race.h"

src/common/kernel/eressea.c

@@ -42,7 +42,7 @@
 #include "karma.h"
 #include "magic.h"
 #include "message.h"
-#include "movement.h"
+#include "move.h"
 #include "names.h"
 #include "objtypes.h"
 #include "order.h"

src/common/kernel/item.c

@@ -674,7 +674,7 @@ const char * itemnames[MAXITEMS] = {
   "magicherbbag", "dreameye"
 };
 
-#include "movement.h"
+#include "move.h"
 
 static int
 mod_elves_only(const unit * u, const region * r, skill_t sk, int value)

src/common/kernel/move.c

@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include "eressea.h"
-#include "movement.h"
+#include "move.h"
 
 #include "alchemy.h"
 #include "border.h"

src/common/kernel/region.c

@@ -778,7 +778,7 @@ rsetname(struct region * r, const xmlChar * name)
 {
   if (r->land) {
     free(r->land->name);
-    r->land->name = strdup(name);
+    r->land->name = xstrdup(name);
   }
 }
 

src/common/kernel/save.c

@@ -33,7 +33,7 @@
 #include "karma.h"
 #include "magic.h"
 #include "message.h"
-#include "movement.h"
+#include "move.h"
 #include "objtypes.h"
 #include "order.h"
 #include "pathfinder.h"

src/common/modules/arena.c

@@ -33,7 +33,7 @@
 #include <kernel/item.h>
 #include <kernel/magic.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>
 #include <kernel/pool.h>

src/common/modules/museum.c

@@ -28,7 +28,7 @@
 #include <kernel/building.h>
 #include <kernel/faction.h>
 #include <kernel/item.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/message.h>
 #include <kernel/order.h>
 #include <kernel/plane.h>

src/common/modules/xmas.c

@@ -15,18 +15,18 @@
 #include "xmas.h"
 
 /* kernel includes */
-#include <unit.h>
-#include <building.h>
-#include <region.h>
-#include <event.h>
-#include <movement.h>
-#include <faction.h>
-#include <item.h>
-#include <race.h>
+#include <kernel/building.h>
+#include <kernel/faction.h>
+#include <kernel/item.h>
+#include <kernel/move.h>
+#include <kernel/race.h>
+#include <kernel/region.h>
+#include <kernel/unit.h>
 
 /* util includes */
-#include <base36.h>
-#include <goodies.h>
+#include <util/base36.h>
+#include <util/event.h>
+#include <util/goodies.h>
 
 /* libc includes */
 #include <stdlib.h>

src/common/spells/combatspells.c

@@ -24,7 +24,7 @@
 #include <kernel/order.h>
 #include <kernel/region.h>
 #include <kernel/unit.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/spell.h>
 #include <kernel/spellid.h>
 #include <kernel/race.h>

src/eressea/korrektur.c

@@ -46,7 +46,7 @@
 #include <kernel/item.h>
 #include <kernel/magic.h>
 #include <kernel/message.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/names.h>
 #include <kernel/pathfinder.h>
 #include <kernel/plane.h>

src/eressea/lua/unit.cpp

@@ -14,7 +14,7 @@
 #include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/magic.h>
-#include <kernel/movement.h>
+#include <kernel/move.h>
 #include <kernel/order.h>
 #include <kernel/pool.h>
 #include <kernel/race.h>