From 59f87edbb1ca38e6b078a70d13ef2ea53cd907f2 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 20 Feb 2017 09:00:48 +0100
Subject: [PATCH] remove unused race.move_allowed method

---
 res/e3a/races.xml         | 1 -
 res/eressea/races.xml     | 5 -----
 res/races/dragon.xml      | 1 -
 res/races/wyrm.xml        | 1 -
 res/races/youngdragon.xml | 1 -
 src/kernel/race.h         | 1 -
 src/kernel/xmlreader.c    | 4 ----
 src/races/races.c         | 4 +---
 8 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/res/e3a/races.xml b/res/e3a/races.xml
index acc002b1a..1036ba223 100644
--- a/res/e3a/races.xml
+++ b/res/e3a/races.xml
@@ -875,7 +875,6 @@
   <race name="seaserpent" magres="50" maxaura="1.0" regaura="1.0" weight="20000" capacity="5000" speed="1.0" hp="600" ac="3" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants="yes" swim="yes" teach="no" getitem="yes" resistbash="yes">
     <ai splitsize="6" killpeasants="yes" moverandom="yes" learn="yes" moveattack="yes"/>
     <function name="name" value="namegeneric"/>
-    <function name="move" value="moveswimming"/>
     <skill name="tactics" modifier="4"/>
     <attack type="4" damage="1d30"/>
     <attack type="4" damage="1d30"/>
diff --git a/res/eressea/races.xml b/res/eressea/races.xml
index 9f3624d70..6899a8070 100644
--- a/res/eressea/races.xml
+++ b/res/eressea/races.xml
@@ -732,7 +732,6 @@
   <race name="wyrm" magres="90" maxaura="1.000000" regaura="3.000000" weight="18000" capacity="1000000" speed="1.000000" hp="2700" ac="8" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="10" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes" unarmedguard="yes">
     <ai splitsize="1" killpeasants="yes" learn="yes"/>
     <function name="name" value="namedragon"/>
-    <function name="move" value="movedragon"/>
     <skill name="magic" modifier="12"/>
     <skill name="tactics" modifier="12"/>
     <skill name="perception" modifier="10"/>
@@ -745,7 +744,6 @@
     <ai splitsize="2" killpeasants="yes" learn="yes"/>
     <function name="name" value="namedragon"/>
     <function name="age" value="agedragon"/>
-    <function name="move" value="movedragon"/>
     <skill name="magic" modifier="8"/>
     <skill name="tactics" modifier="8"/>
     <skill name="perception" modifier="5"/>
@@ -758,7 +756,6 @@
     <ai splitsize="6" killpeasants="yes" learn="yes"/>
     <function name="name" value="namedragon"/>
     <function name="age" value="agefiredragon"/>
-    <function name="move" value="movedragon"/>
     <skill name="magic" modifier="4"/>
     <skill name="tactics" modifier="4"/>
     <skill name="stealth" modifier="2"/>
@@ -1141,7 +1138,6 @@
   <race name="seaserpent" magres="50" maxaura="1.000000" regaura="1.000000" weight="20000" capacity="5000" speed="1.000000" hp="600" ac="3" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants="yes" swim="yes" teach="no" getitem="yes" resistbash="yes" unarmedguard="yes">
     <ai splitsize="6" killpeasants="yes" moverandom="yes" learn="yes" moveattack="yes"/>
     <function name="name" value="namegeneric"/>
-    <function name="move" value="moveswimming"/>
     <skill name="tactics" modifier="4"/>
     <attack type="4" damage="1d30"/>
     <attack type="4" damage="1d30"/>
@@ -1273,7 +1269,6 @@
   <race name="shadowdragon" magres="95" maxaura="1.000000" regaura="3.000000" weight="100" capacity="100000" speed="1.000000" hp="2700" ac="10" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="12" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
     <ai splitsize="1" killpeasants="yes" learn="yes"/>
     <function name="name" value="namedragon"/>
-    <function name="move" value="movedragon"/>
     <skill name="tactics" modifier="20"/>
     <skill name="perception" modifier="20"/>
     <attack type="4" damage="5d30"/>
diff --git a/res/races/dragon.xml b/res/races/dragon.xml
index f8022d0a4..7a36e4b84 100644
--- a/res/races/dragon.xml
+++ b/res/races/dragon.xml
@@ -6,7 +6,6 @@ dragon="yes">
   <ai splitsize="2" killpeasants="yes" learn="yes" scare="400"/>
   <function name="name" value="namedragon"/>
   <function name="age" value="agedragon"/>
-  <function name="move" value="movedragon"/>
   <skill name="magic" modifier="8"/>
   <skill name="tactics" modifier="8"/>
   <attack type="4" damage="2d20"/>
diff --git a/res/races/wyrm.xml b/res/races/wyrm.xml
index 3ee48ca67..dab1a9e1f 100644
--- a/res/races/wyrm.xml
+++ b/res/races/wyrm.xml
@@ -5,7 +5,6 @@ defensemodifier="10" scarepeasants="yes" fly="yes" walk="yes"
 teach="no" getitem="yes" resistbash="yes" dragon="yes" income="5000">
   <ai splitsize="1" killpeasants="yes" learn="yes" scare="1000"/>
   <function name="name" value="namedragon"/>
-  <function name="move" value="movedragon"/>
   <skill name="magic" modifier="12"/>
   <skill name="tactics" modifier="12"/>
   <attack type="4" damage="3d20"/>
diff --git a/res/races/youngdragon.xml b/res/races/youngdragon.xml
index d5b23b601..0ac2d35be 100644
--- a/res/races/youngdragon.xml
+++ b/res/races/youngdragon.xml
@@ -6,7 +6,6 @@ teach="no" getitem="yes" resistbash="yes" dragon="yes" income="150">
   <ai splitsize="6" killpeasants="yes" learn="yes" scare="160"/>
   <function name="name" value="namedragon"/>
   <function name="age" value="agefiredragon"/>
-  <function name="move" value="movedragon"/>
   <skill name="magic" modifier="4"/>
   <skill name="tactics" modifier="4"/>
   <attack type="4" damage="1d30"/>
diff --git a/src/kernel/race.h b/src/kernel/race.h
index 80f2622f3..32ff05ebd 100644
--- a/src/kernel/race.h
+++ b/src/kernel/race.h
@@ -145,7 +145,6 @@ extern "C" {
 
         race_name_func generate_name;
         void(*age) (struct unit * u);
-        bool(*move_allowed) (const struct region *, const struct region *);
         struct item *(*itemdrop) (const struct race *, int size);
         void(*init_familiar) (struct unit *);
 
diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c
index 44a8c161e..508516671 100644
--- a/src/kernel/xmlreader.c
+++ b/src/kernel/xmlreader.c
@@ -1798,10 +1798,6 @@ static int parse_races(xmlDocPtr doc)
             else if (strcmp((const char *)propValue, "age") == 0) {
                 rc->age = (void(*)(struct unit *))fun;
             }
-            else if (strcmp((const char *)propValue, "move") == 0) {
-                rc->move_allowed =
-                    (bool(*)(const struct region *, const struct region *))fun;
-            }
             else if (strcmp((const char *)propValue, "itemdrop") == 0) {
                 rc->itemdrop = (struct item * (*)(const struct race *, int))fun;
             }
diff --git a/src/races/races.c b/src/races/races.c
index 8af9cf2ed..bb699520e 100644
--- a/src/races/races.c
+++ b/src/races/races.c
@@ -88,15 +88,13 @@ static void equip_newunits(const struct equipment *eq, struct unit *u)
     }
 }
 
-/* Die Funktionen werden über den hier registrierten Namen in races.xml
+/* Die Funktionen werden �ber den hier registrierten Namen in races.xml
  * in die jeweilige Rassendefiniton eingebunden */
 void register_races(void)
 {
     /* function initfamiliar */
     register_function((pf_generic)oldfamiliars, "oldfamiliars");
 
-    register_function((pf_generic)allowed_dragon, "movedragon");
-
     register_function((pf_generic)allowed_swim, "moveswimming");
     register_function((pf_generic)allowed_fly, "moveflying");
     register_function((pf_generic)allowed_walk, "movewalking");