From 3f41e0d7363b87bcb5133d9405234dbb6942d0d5 Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sun, 3 Feb 2002 11:55:49 +0000
Subject: [PATCH] - Dateinamen

---
 src/common/gamecode/report.c  | 4 ++--
 src/common/settings-eressea.h | 4 ++--
 src/eressea/korrektur.c       | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 6bc258f74..f1c3bcdcb 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -2793,8 +2793,8 @@ reports(void)
 						turn, factionid(f), turn, factionid(f), turn, factionid(f));
 				}
 
-				fprintf(shfp, "eresseamail.zipped $addr \"%s %s\" \"%s-%d.zip\" "
-				    "%s.zip\n", global.gamename, gamedate_short(), factionid(f), turn, factionid(f));
+				fprintf(shfp, "eresseamail.zipped $addr \"%s %s\" \"%d-%s.zip\" "
+				    "%d-%s.zip\n", global.gamename, gamedate_short(), turn, factionid(f), turn, factionid(f));
 
 			} else if(f->options & wants_bzip2) {
 
diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h
index 02dee3107..9c94841c5 100644
--- a/src/common/settings-eressea.h
+++ b/src/common/settings-eressea.h
@@ -21,8 +21,8 @@
 #define REMOVENMRNEWBIE 1
 #define REMOVENMRTIMEOUT 1
 #define HUNGER_DISABLES_LONGORDERS 1
-#define REDUCED_PEASANTGROWTH 1
-#define RACE_ADJUSTMENTS 1
+#define REDUCED_PEASANTGROWTH 0
+#define RACE_ADJUSTMENTS 0
 
 #define SKILLPOINTS 1
 #define TEACHDIFFERENCE 1
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index 5674d9a7f..04c74097b 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -2633,6 +2633,7 @@ level(int days)
 	return l-1;
 }
 
+#if SKILLPOINTS == 0
 int
 convert_skills(void)
 {