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 @@ - 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 @@ - @@ -745,7 +744,6 @@ - @@ -758,7 +756,6 @@ - @@ -1141,7 +1138,6 @@ - @@ -1273,7 +1269,6 @@ - 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"> - 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"> - 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"> - 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");