From 8e897d29be6555ce508f885d2d4e2911c130ce30 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 5 Aug 2007 12:26:46 +0000
Subject: [PATCH] movement.h -> move.h

---
 src/common/gamecode/creport.c    |  2 +-
 src/common/gamecode/economy.c    |  2 +-
 src/common/gamecode/items.c      |  2 +-
 src/common/gamecode/laws.c       |  2 +-
 src/common/gamecode/monster.c    |  2 +-
 src/common/gamecode/randenc.c    |  2 +-
 src/common/gamecode/report.c     |  2 +-
 src/common/gamecode/spy.c        |  2 +-
 src/common/gamecode/study.c      |  2 +-
 src/common/gamecode/xmlreport.c  |  2 +-
 src/common/items/speedsail.c     |  2 +-
 src/common/kernel/alchemy.c      |  2 +-
 src/common/kernel/battle.c       |  2 +-
 src/common/kernel/build.c        |  2 +-
 src/common/kernel/eressea.c      |  2 +-
 src/common/kernel/item.c         |  2 +-
 src/common/kernel/move.c         |  2 +-
 src/common/kernel/region.c       |  2 +-
 src/common/kernel/save.c         |  2 +-
 src/common/modules/arena.c       |  2 +-
 src/common/modules/museum.c      |  2 +-
 src/common/modules/xmas.c        | 20 ++++++++++----------
 src/common/spells/combatspells.c |  2 +-
 src/eressea/korrektur.c          |  2 +-
 src/eressea/lua/unit.cpp         |  2 +-
 25 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index e5b84dd6c..b93429ec3 100644
--- a/src/common/gamecode/creport.c
+++ b/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>
diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c
index fca2b189e..477bf1e9d 100644
--- a/src/common/gamecode/economy.c
+++ b/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>
diff --git a/src/common/gamecode/items.c b/src/common/gamecode/items.c
index 5a8bc53c8..dbaf30daf 100644
--- a/src/common/gamecode/items.c
+++ b/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>
diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index 11ef3baca..e4c7582b3 100644
--- a/src/common/gamecode/laws.c
+++ b/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>
diff --git a/src/common/gamecode/monster.c b/src/common/gamecode/monster.c
index b2b538a1d..1d559bd02 100644
--- a/src/common/gamecode/monster.c
+++ b/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>
diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c
index ccfb2e55e..c2d75634c 100644
--- a/src/common/gamecode/randenc.c
+++ b/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>
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index b4c130649..78b153c45 100644
--- a/src/common/gamecode/report.c
+++ b/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>
diff --git a/src/common/gamecode/spy.c b/src/common/gamecode/spy.c
index 73b9e725c..f304c824a 100644
--- a/src/common/gamecode/spy.c
+++ b/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>
diff --git a/src/common/gamecode/study.c b/src/common/gamecode/study.c
index 8443f8dcd..c00e36189 100644
--- a/src/common/gamecode/study.c
+++ b/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>
diff --git a/src/common/gamecode/xmlreport.c b/src/common/gamecode/xmlreport.c
index 112116dc0..082aa746a 100644
--- a/src/common/gamecode/xmlreport.c
+++ b/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>
diff --git a/src/common/items/speedsail.c b/src/common/items/speedsail.c
index 8406b40bd..a9233c243 100644
--- a/src/common/items/speedsail.c
+++ b/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>
diff --git a/src/common/kernel/alchemy.c b/src/common/kernel/alchemy.c
index 23b5c832e..099bb33e1 100644
--- a/src/common/kernel/alchemy.c
+++ b/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>
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index def4932a5..7d1db2f16 100644
--- a/src/common/kernel/battle.c
+++ b/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"
diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c
index 6f009a91f..2aea3d867 100644
--- a/src/common/kernel/build.c
+++ b/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"
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index 24aadc651..9f89616f2 100644
--- a/src/common/kernel/eressea.c
+++ b/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"
diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c
index 392726980..30cd9b06c 100644
--- a/src/common/kernel/item.c
+++ b/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)
diff --git a/src/common/kernel/move.c b/src/common/kernel/move.c
index 5bf346117..1a4b055d5 100644
--- a/src/common/kernel/move.c
+++ b/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"
diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c
index 78723837e..e053b1309 100644
--- a/src/common/kernel/region.c
+++ b/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);
   }
 }
 
diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c
index 23d1aa014..d35221653 100644
--- a/src/common/kernel/save.c
+++ b/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"
diff --git a/src/common/modules/arena.c b/src/common/modules/arena.c
index 2c223d6b4..ccbd7d233 100644
--- a/src/common/modules/arena.c
+++ b/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>
diff --git a/src/common/modules/museum.c b/src/common/modules/museum.c
index cdbfed719..93eaa35b1 100644
--- a/src/common/modules/museum.c
+++ b/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>
diff --git a/src/common/modules/xmas.c b/src/common/modules/xmas.c
index 656aa36e1..0099cf732 100644
--- a/src/common/modules/xmas.c
+++ b/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>
diff --git a/src/common/spells/combatspells.c b/src/common/spells/combatspells.c
index fa7265c01..3af9a0b29 100644
--- a/src/common/spells/combatspells.c
+++ b/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>
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index 43145f7ed..ad6839e87 100644
--- a/src/eressea/korrektur.c
+++ b/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>
diff --git a/src/eressea/lua/unit.cpp b/src/eressea/lua/unit.cpp
index dbfe0cd9f..12a7f939c 100644
--- a/src/eressea/lua/unit.cpp
+++ b/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>