From 39829881c896e37c768dc6ea234805eb7210390e Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sun, 27 Jan 2002 10:57:26 +0000
Subject: [PATCH] - age_factions und use aus processorders gezogen, macht
 Debugging   etwas einfacher.

---
 src/common/gamecode/laws.c    | 59 +++++++++++++++++++++--------------
 src/common/settings-eressea.h |  2 +-
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index 4265fa564..f6adb2d16 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -3241,30 +3241,10 @@ update_spells(void)
 
 }
 
-void
-processorders (void)
+static void
+age_factions(void)
 {
 	faction *f;
-	region *r;
-	unit *u;
-	strlist *S;
-
-	if (turn == 0) srand(time((time_t *) NULL));
-	else srand(turn);
-
-	puts(" - neue Einheiten erschaffen...");
-	new_units();
-
-	puts(" - Monster KI...");
-	plan_monsters();
-	set_passw();		/* und pruefe auf illegale Befehle */
-
-	puts(" - Defaults und Instant-Befehle...");
-	setdefaults();
-	instant_orders();
-
-	mail();
-	puts(" - Altern");
 
 	for (f = factions; f; f = f->next) {
 		f->age = f->age + 1;
@@ -3273,8 +3253,14 @@ processorders (void)
 				"newbieimmunity%i:turns", IMMUN_GEGEN_ANGRIFF - f->age));
 		}
 	}
+}
 
-	puts(" - Benutzen");
+static void
+use(void)
+{
+	region *r;
+	unit *u;
+	strlist *S;
 
 	for (r = regions; r; r = r->next) {
 		for (u = r->units; u; u = u->next) {
@@ -3292,6 +3278,33 @@ processorders (void)
 			}
 		}
 	}
+}
+
+void
+processorders (void)
+{
+	region *r;
+
+	if (turn == 0) srand(time((time_t *) NULL));
+	else srand(turn);
+
+	puts(" - neue Einheiten erschaffen...");
+	new_units();
+
+	puts(" - Monster KI...");
+	plan_monsters();
+	set_passw();		/* und pruefe auf illegale Befehle */
+
+	puts(" - Defaults und Instant-Befehle...");
+	setdefaults();
+	instant_orders();
+
+	mail();
+	puts(" - Altern");
+	age_factions();
+
+	puts(" - Benutzen");
+	use();
 
 	puts(" - Kontaktieren, Betreten von Schiffen und Gebäuden (1.Versuch)");
 	do_misc(0);
diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h
index eba5698b6..350ab955a 100644
--- a/src/common/settings-eressea.h
+++ b/src/common/settings-eressea.h
@@ -18,6 +18,6 @@
 #define NEW_RESOURCEGROWTH 1
 #define LARGE_CASTLES 1
 #define GROWING_TREES 1
-#define REMOVENMRNEWBIE 0
+#define REMOVENMRNEWBIE 1
 #define REMOVENMRTIMEOUT 1
 #define HUNGER_DISABLES_LONGORDERS 1