From b04b3ea168eb3849b4c28ba706c9b758624625f4 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 26 Nov 2005 00:09:29 +0000
Subject: [PATCH] kingdoms: missing mallorn seeds

---
 src/common/items/seed.c    | 39 +++++++++++++++++++-------------------
 src/common/kernel/region.h |  2 +-
 src/res/kingdoms.xml       | 16 ++++++++--------
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/common/items/seed.c b/src/common/items/seed.c
index 5687eefbe..2e7c38f71 100644
--- a/src/common/items/seed.c
+++ b/src/common/items/seed.c
@@ -48,10 +48,10 @@ limit_seeds(const region * r, const resource_type * rtype)
 void
 init_seed(void)
 {
-	attrib * a;
+  attrib * a;
   resource_limit * rdata;
 
-	rt_seed = rt_find("seed");
+  rt_seed = rt_find("seed");
   if (rt_seed!=NULL) {
     a = a_add(&rt_seed->attribs, a_new(&at_resourcelimit));
     rdata = (resource_limit*)a->data.v;
@@ -65,34 +65,35 @@ init_seed(void)
 static void
 produce_mallornseeds(region * r, const resource_type * rtype, int norders)
 {
-	assert(rtype==rt_mallornseed && r->land && r->land->trees[0] >= norders);
-	assert(fval(r, RF_MALLORN));
-	r->land->trees[0] -= norders;
+  assert(rtype==rt_mallornseed && r->land && r->land->trees[0] >= norders);
+  assert(fval(r, RF_MALLORN));
+  r->land->trees[0] -= norders;
 }
 
 static int
 limit_mallornseeds(const region * r, const resource_type * rtype)
 {
-	assert(rtype==rt_mallornseed);
-	if (!fval(r, RF_MALLORN)) {
-		return 0;
-	}
-	return r->land?r->land->trees[0]:0;
+  assert(rtype==rt_mallornseed);
+  if (!fval(r, RF_MALLORN)) {
+    return 0;
+  }
+  return r->land?r->land->trees[0]:0;
 }
 
 void
 init_mallornseed(void)
 {
-	attrib * a;
+  attrib * a;
   resource_limit * rdata;
 
-	rt_mallornseed = rt_find("mallornseed");
-  assert(rt_mallornseed!=NULL);
-	rt_mallornseed->flags |= RTF_LIMITED;
-	rt_mallornseed->flags |= RTF_POOLED;
+  rt_mallornseed = rt_find("mallornseed");
+  if (rt_mallornseed!=NULL) {
+    rt_mallornseed->flags |= RTF_LIMITED;
+    rt_mallornseed->flags |= RTF_POOLED;
 	
-	a = a_add(&rt_mallornseed->attribs, a_new(&at_resourcelimit));
-	rdata = (resource_limit*)a->data.v;
-	rdata->limit = limit_mallornseeds;
-	rdata->use = produce_mallornseeds;
+    a = a_add(&rt_mallornseed->attribs, a_new(&at_resourcelimit));
+    rdata = (resource_limit*)a->data.v;
+    rdata->limit = limit_mallornseeds;
+    rdata->use = produce_mallornseeds;
+  }
 }
diff --git a/src/common/kernel/region.h b/src/common/kernel/region.h
index f01793956..5a3b9b71f 100644
--- a/src/common/kernel/region.h
+++ b/src/common/kernel/region.h
@@ -182,7 +182,7 @@ void deathcounts(struct region * r, int delta);
 void chaoscounts(struct region * r, int delta);
 
 void setluxuries(struct region * r, const struct luxury_type * sale);
-extern int get_maxluxuries();
+extern int get_maxluxuries(void);
 
 short rroad(const struct region * r, direction_t d);
 void rsetroad(struct region * r, direction_t d, short value);
diff --git a/src/res/kingdoms.xml b/src/res/kingdoms.xml
index 267d37e37..2adfdb5c8 100644
--- a/src/res/kingdoms.xml
+++ b/src/res/kingdoms.xml
@@ -6,11 +6,11 @@
   <xi:include href="de/strings.xml"/>
   <xi:include href="en/strings.xml"/>
 
-  <xi:include href="knigdoms/resources.xml"/>
-  <xi:include href="knigdoms/races.xml"/>
+  <xi:include href="kingdoms/resources.xml"/>
+  <xi:include href="kingdoms/races.xml"/>
   <xi:include href="prefixes.xml"/>
   <xi:include href="calendar.xml"/>
-  <xi:include href="knigdoms/terrains.xml"/>
+  <xi:include href="kingdoms/terrains.xml"/>
 
   <equipment>
     <set name="new_faction">
@@ -19,7 +19,7 @@
     </set>
   </equipment>
 
-  <game name="knigdoms" welcome="kingdoms">
+  <game name="kingdoms" welcome="kingdoms">
     <!-- Game specific settings -->
     <order name="ARBEITEN" disable="yes"/>
     <order name="BEKLAUEN" disable="yes"/>
@@ -101,12 +101,12 @@
   </game>
   <strings>
     <string name="newbie_info_1">
-      <text locale="de">Bitte denke daran, deine Befehle mit dem Betreff ERESSEA BEFEHLE an knigdoms-server@eressea.de zu senden. Am besten, du verwendest die Befehlsvorlage am Ende des Reports.</text>
-      <text locale="en">Remember to send your orders to knigdoms-server@eressea.de with the subject ERESSEA ORDERS.</text>
+      <text locale="de">Bitte denke daran, deine Befehle mit dem Betreff ERESSEA BEFEHLE an kingdoms-server@eressea.de zu senden. Am besten, du verwendest die Befehlsvorlage am Ende des Reports.</text>
+      <text locale="en">Remember to send your orders to kingdoms-server@eressea.de with the subject ERESSEA ORDERS.</text>
     </string>
     <string name="mailto">
-      <text locale="de">koe-server@eressea.de</text>
-      <text locale="en">koe-server@eressea.de</text>
+      <text locale="de">kingdoms-server@eressea.de</text>
+      <text locale="en">kingdoms-server@eressea.de</text>
     </string>
     <string name="mailcmd">
       <text locale="de">ERESSEA BEFEHLE</text>