- Settings für nächste Woche aktiviert

- Kleinkram

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

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;
 }

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)
 

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
 

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
 

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