remove funpointer for spoils

res/e3a/races.xml

@@ -34,7 +34,6 @@
 
   <race name="human" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <param name="other_race" value="elf"/>
     <skill name="riding" modifier="+1"/>
     <skill name="shipcraft" modifier="2"/>
@@ -48,7 +47,6 @@
 
   <race name="orc" studyspeed="-5" magres="-5" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <param name="other_race" value="troll"/>
 
     <skill name="bow" speed="+5"/>
@@ -76,7 +74,6 @@
 
   <race name="halfling" defensemodifier="1" magres="5" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <param name="other_race" value="dwarf"/>
     <param name="luxury_trade" value="600"/>
     <skill name="bow" modifier="-1"/>
@@ -103,7 +100,6 @@
 
   <race name="demon" magres="15" maxaura="1.0" regaura="1.1" recruitcost="360" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="30" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" shapeshift="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="cartmaking" modifier="-2"/>
     <skill name="forestry" modifier="1"/>
     <skill name="melee" modifier="1"/>
@@ -123,7 +119,6 @@
 
   <race name="elf" magres="10" maxaura="1.0" regaura="1.1" recruitcost="200" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="armorer" modifier="-1"/>
     <skill name="bow" modifier="2"/>
     <skill name="building" modifier="-1"/>
@@ -142,7 +137,6 @@
 
   <race name="troll" magres="10" maxaura="1.0" regaura="1.0" recruitcost="260" maintenance="10" weight="2000" capacity="1080" speed="1.0" hp="20" ac="1" damage="1d5+3" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <param name="armor.stamina" value="4"/> <!-- +1 natural armor per X levels stamina -->
     <skill name="armorer" modifier="2"/>
     <skill name="bow" modifier="-2"/>
@@ -165,7 +159,6 @@
 
   <race name="dwarf" magres="5" maxaura="1.0" regaura="0.9" recruitcost="240" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="armorer" modifier="2"/>
     <skill name="bow" modifier="-1"/>
     <skill name="building" modifier="2"/>

res/eressea/races.xml

@@ -12,7 +12,6 @@
 
   <race name="human" maxaura="1.000000" regaura="1.000000" recruitcost="75" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <param name="migrants.formula" value="1"/>
     <skill name="trade" modifier="1"/>
     <skill name="herbalism" modifier="-1"/>
@@ -780,7 +779,6 @@
   </race>
   <race name="aquarian" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" shipspeed="yes" playerrace="yes" coastal="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="mining" modifier="-2"/>
     <skill name="building" modifier="-1"/>
     <skill name="trade" modifier="2"/>
@@ -799,7 +797,6 @@
   </race>
   <race name="cat" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" defensemodifier="1" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="-1"/>
     <skill name="mining" modifier="-2"/>
     <skill name="building" modifier="-1"/>
@@ -825,7 +822,6 @@
   </race>
   <race name="halfling" magres="5" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <param name="hunger.damage" value="1d14+14"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="mining" modifier="1"/>
@@ -858,7 +854,6 @@
   </race>
   <race name="insect" magres="50" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="mining" modifier="1"/>
     <skill name="bow" modifier="-2"/>
@@ -888,7 +883,6 @@
   <race name="demon" magres="15" maxaura="1.000000" regaura="1.250000" recruitcost="150" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="50" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" shapeshift="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="initfamiliar" value="oldfamiliars"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="2"/>
     <skill name="trade" modifier="-3"/>
     <skill name="forestry" modifier="1"/>
@@ -919,7 +913,6 @@
   </race>
   <race name="troll" magres="10" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="2000" capacity="1080" speed="1.000000" hp="30" ac="1" damage="1d5+3" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="mining" modifier="2"/>
     <skill name="bow" modifier="-2"/>
     <skill name="building" modifier="2"/>
@@ -951,7 +944,6 @@
   <race name="goblin" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="40" maintenance="10" weight="600" capacity="440" speed="1.000000" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="initfamiliar" value="oldfamiliars"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="1"/>
     <skill name="mining" modifier="1"/>
     <skill name="building" modifier="1"/>
@@ -1149,7 +1141,6 @@
   <race name="snotling" magres="-5" maxaura="1.000000" regaura="1.000000" 
   maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="no" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="1"/>
     <skill name="mining" modifier="1"/>
     <skill name="building" modifier="1"/>
@@ -1179,7 +1170,6 @@
   </race>
   <race name="elf" magres="10" maxaura="1.000000" regaura="1.250000" recruitcost="130" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="-1"/>
     <skill name="mining" modifier="-2"/>
     <skill name="bow" modifier="2"/>
@@ -1206,7 +1196,6 @@
   </race>
   <race name="dwarf" magres="5" maxaura="1.000000" regaura="0.500000" recruitcost="110" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="mining" modifier="2"/>
     <skill name="bow" modifier="-1"/>
     <skill name="building" modifier="2"/>

res/races/aquarian.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <race name="aquarian" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" shipspeed="yes" playerrace="yes" coastal="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="mining" modifier="-2"/>
     <skill name="building" modifier="-1"/>
     <skill name="trade" modifier="2"/>

res/races/cat.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <race name="cat" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" defensemodifier="1" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="-1"/>
     <skill name="mining" modifier="-2"/>
     <skill name="building" modifier="-1"/>

res/races/demon.xml

@@ -6,7 +6,6 @@ unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes"
 shapeshift="yes" giveperson="yes" giveunit="yes" getitem="yes"
 recruitethereal="yes" equipment="yes" healing="1.5">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="2"/>
     <skill name="trade" modifier="-3"/>
     <skill name="forestry" modifier="1"/>

res/races/dwarf.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <race name="dwarf" magres="5" maxaura="1.000000" regaura="0.500000" recruitcost="110" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="mining" modifier="2"/>
     <skill name="bow" modifier="-1"/>
     <skill name="building" modifier="2"/>

res/races/elf.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <race name="elf" magres="10" maxaura="1.000000" regaura="1.250000" recruitcost="130" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="-1"/>
     <skill name="mining" modifier="-2"/>
     <skill name="bow" modifier="2"/>

res/races/goblin-2.xml

@@ -5,7 +5,6 @@ speed="1.0" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0"
 playerrace="yes" walk="yes" giveperson="yes" giveunit="yes"
 getitem="yes" equipment="yes" healing="2.0">
   <ai splitsize="10000" moverandom="yes" learn="yes"/>
-  <function name="itemdrop" value="defaultdrops"/>
   <param name="hunger.damage" value="1d8+7"/>
   <param name="other_race" value="demon"/>
   <param name="recruit_multi" value="0.5"/>

res/races/goblin-3.xml

@@ -5,7 +5,6 @@ speed="1.0" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0"
 playerrace="yes" walk="yes" giveperson="yes" giveunit="yes"
 getitem="yes" equipment="yes" healing="2.0">
   <ai splitsize="10000" moverandom="yes" learn="yes"/>
-  <function name="itemdrop" value="defaultdrops"/>
   <param name="hunger.damage" value="1d8+7"/>
   <param name="other_race" value="demon"/>
   <param name="recruit_multi" value="0.5"/>

res/races/goblin.xml

@@ -6,7 +6,6 @@ unarmedattack="-2" unarmeddefense="0" playerrace="yes" walk="yes"
 giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"
 healing="2.0">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="1"/>
     <skill name="mining" modifier="1"/>
     <skill name="building" modifier="1"/>

res/races/halfling.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" ?>
 <race name="halfling" magres="5" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
+    <param name="hunger.damage" value="1d14+14"/>
-	<param name="hunger.damage" value="1d14+14"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="mining" modifier="1"/>
     <skill name="bow" modifier="-1"/>

res/races/human.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <race name="human" maxaura="1.000000" regaura="1.000000" recruitcost="75" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="trade" modifier="1"/>
     <skill name="herbalism" modifier="-1"/>
     <skill name="shipcraft" modifier="1"/>

res/races/insect.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <race name="insect" magres="5" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="mining" modifier="1"/>
     <skill name="bow" modifier="-2"/>

res/races/troll.xml

@@ -6,7 +6,6 @@ unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes"
 giveperson="yes" giveunit="yes" getitem="yes" equipment="yes"
 healing="1.5">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
-    <function name="itemdrop" value="defaultdrops"/>
     <skill name="mining" modifier="2"/>
     <skill name="bow" modifier="-2"/>
     <skill name="building" modifier="2"/>

src/battle.c

@@ -925,14 +925,12 @@ void kill_troop(troop dt)
     if (!df->alive) {
         char eqname[64];
         const struct equipment *eq;
-        if (u_race(du)->itemdrop) {
+        const race *rc = u_race(du);
-            item *drops = u_race(du)->itemdrop(u_race(du), du->number - df->run.number);
+        item *drops = item_spoil(rc, du->number - df->run.number);
-
+        if (drops != NULL) {
-            if (drops != NULL) {
+            i_merge(&du->items, &drops);
-                i_merge(&du->items, &drops);
-            }
         }
-        sprintf(eqname, "%s_spoils", u_race(du)->_name);
+        sprintf(eqname, "%s_spoils", rc->_name);
         eq = get_equipment(eqname);
         if (eq != NULL) {
             equip_items(&du->items, eq);

src/kernel/item.c

@@ -1175,7 +1175,7 @@ attrib_type at_resourcelimit = {
     finalize_resourcelimit,
 };
 
-static item *default_spoil(const struct race *rc, int size)
+item *item_spoil(const struct race *rc, int size)
 {
     item *itm = NULL;
 
@@ -1303,7 +1303,6 @@ void register_resources(void)
     register_function((pf_generic)res_changepermaura, "changepermaura");
     register_function((pf_generic)res_changehp, "changehp");
     register_function((pf_generic)res_changeaura, "changeaura");
-    register_function((pf_generic)default_spoil, "defaultdrops");
 
     register_item_use(use_potion, "usepotion");
     register_item_use(use_potion_delayed, "usepotion_delayed");

src/kernel/item.h

@@ -309,6 +309,7 @@ extern "C" {
 
     extern const struct potion_type *oldpotiontype[];
     const struct resource_type *get_resourcetype(resource_t rt);
+    struct item *item_spoil(const struct race *rc, int size);
 
     int get_item(const struct unit * u, const struct item_type *itype);
     int set_item(struct unit * u, const struct item_type *itype, int value);

src/kernel/race.h

@@ -145,7 +145,6 @@ extern "C" {
 
         race_name_func generate_name;
         void(*age) (struct unit * u);
-        struct item *(*itemdrop) (const struct race *, int size);
         void(*init_familiar) (struct unit *);
 
         struct rcoption *options; /* rarely used properties */

src/kernel/xmlreader.c

@@ -1798,9 +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, "itemdrop") == 0) {
-                rc->itemdrop = (struct item * (*)(const struct race *, int))fun;
-            }
             else if (strcmp((const char *)propValue, "initfamiliar") == 0) {
                 rc->init_familiar = (void(*)(struct unit *))fun;
             }