From 587799eb8db7c5d56dcb5109d4177d0e580ec376 Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sun, 28 Apr 2002 13:06:27 +0000
Subject: [PATCH] =?UTF-8?q?-=20Settings=20f=C3=BCr=20n=C3=A4chste=20Woche?=
 =?UTF-8?q?=20aktiviert=20-=20Kleinkram?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/eressea.c            |  3 +++
 src/common/kernel/region.c             |  4 ++--
 src/common/kernel/region.h             |  4 ++--
 src/common/settings-eressea.h          | 10 +++++-----
 src/common/settings-tutorial.h         |  2 +-
 src/common/settings-vinyambar-murder.h |  4 ++--
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index ef2ab6a8e..f9428756d 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -61,6 +61,8 @@
 #include <sql.h>
 #include <xml.h>
 
+#include <modules/xecmd.h>
+
 /* libc includes */
 #include <stdio.h>
 #include <stdlib.h>
@@ -2270,6 +2272,7 @@ attrib_init(void)
 	at_register(&at_germs);
 #endif
 	at_register(&at_laen); /* required for old datafiles */
+	at_register(&at_xontormiaexpress); /* required for old datafiles */
 }
 
 void
diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c
index dea5e694e..38b2fa5d7 100644
--- a/src/common/kernel/region.c
+++ b/src/common/kernel/region.c
@@ -614,7 +614,7 @@ rmoney(const region * r)
 }
 
 void
-rsethorses(region *r, int value)
+rsethorses(const region *r, int value)
 {
 	assert(value >= 0);
 	if(r->land)
@@ -622,7 +622,7 @@ rsethorses(region *r, int value)
 }
 
 int
-rhorses(region *r)
+rhorses(const region *r)
 {
 	return r->land?r->land->horses:0;
 }
diff --git a/src/common/kernel/region.h b/src/common/kernel/region.h
index d53b7d26b..6259c4cff 100644
--- a/src/common/kernel/region.h
+++ b/src/common/kernel/region.h
@@ -171,8 +171,8 @@ int rpeasants(const struct region * r);
 void rsetpeasants(struct region * r, int value);
 int rmoney(const struct region * r);
 void rsetmoney(struct region * r, int value);
-int rhorses(struct region * r);
-void rsethorses(struct region * r, int value);
+int rhorses(const struct region * r);
+void rsethorses(const struct region * r, int value);
 
 #define rbuildings(r) ((r)->buildings)
 
diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h
index 28c40bb52..093f94acc 100644
--- a/src/common/settings-eressea.h
+++ b/src/common/settings-eressea.h
@@ -30,10 +30,10 @@
 #define SKILLPOINTS 0
 #define NEW_MIGRATION 1
 #define PEASANTS_DO_NOT_STARVE 0
-#define GUARD_DISABLES_RECRUIT 0
-#define GUARD_DISABLES_PRODUCTION 0
-#define RESOURCE_QUANTITY 1.0
-#define RECRUITFRACTION 5
+#define GUARD_DISABLES_RECRUIT 1
+#define GUARD_DISABLES_PRODUCTION 1
+#define RESOURCE_QUANTITY 0.5
+#define RECRUITFRACTION 40		/* 100/RECRUITFRACTION% */
 #define CATAPULT_AMMUNITION 0	/* Gebaut werden kann sie auch mit 0! */
-#define CHANGED_CROSSBOWS 0
+#define CHANGED_CROSSBOWS 1
 
diff --git a/src/common/settings-tutorial.h b/src/common/settings-tutorial.h
index 872ed7e85..68c5ede13 100644
--- a/src/common/settings-tutorial.h
+++ b/src/common/settings-tutorial.h
@@ -33,7 +33,7 @@
 #define GUARD_DISABLES_RECRUIT 0
 #define GUARD_DISABLES_PRODUCTION 0
 #define RESOURCE_QUANTITY 1.0
-#define RECRUITFRACTION 10
+#define RECRUITFRACTION 20
 #define CATAPULT_AMMUNITION 0
 #define CHANGED_CROSSBOWS 0
 
diff --git a/src/common/settings-vinyambar-murder.h b/src/common/settings-vinyambar-murder.h
index 4bc4d5cf1..0d61ec10c 100644
--- a/src/common/settings-vinyambar-murder.h
+++ b/src/common/settings-vinyambar-murder.h
@@ -33,9 +33,9 @@
 #define GUARD_DISABLES_RECRUIT 1
 #define GUARD_DISABLES_PRODUCTION 1
 #define RESOURCE_QUANTITY 1.0
-#define RECRUITFRACTION 5
+#define RECRUITFRACTION 40
 #define CATAPULT_AMMUNITION 1
-#define CHANGED_CROSSBOWS 0
+#define CHANGED_CROSSBOWS 1
 
 #define VICTORY_CONDITION VICTORY_MURDER
 #define VICTORY_DELAY 4