From 1528d7d1a550940d8a285a1c5fde4a7da92c78e8 Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sun, 23 Dec 2001 09:23:53 +0000
Subject: [PATCH] =?UTF-8?q?-=20makemonster=20raus,=20macht=20Bl=C3=B6dsinn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/eressea.c |  5 +++--
 src/eressea/korrektur.c     | 25 +++++++++++++------------
 src/mapper/mapper.c         |  4 ++++
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index 35321b871..74181c75a 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -1300,7 +1300,8 @@ findfaction (int n)
 		}
 	}
 #endif /* FUZZY_BASE36 */
-	if (n==MONSTER_FACTION) return makemonsters();
+	/* Gibt komische Seiteneffekte hier! */
+	/* if (n==MONSTER_FACTION) return makemonsters(); */
 	return NULL;
 }
 
@@ -1671,7 +1672,7 @@ create_unit(region * r, faction * f, int number, const struct race *urace, int i
 	assert(f->alive);
 	u_setfaction(u, f);
 	set_string(&u->thisorder, "");
-	set_string(&u->lastorder, LOC(u->faction->locale, keywords[K_WORK]));
+	set_string(&u->lastorder, LOC(u->faction->locale, "defaultorder"));
 	u_seteffstealth(u, -1);
 	u->race = urace;
 	u->irace = urace;
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index 07dd1555a..dcde679aa 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -2707,6 +2707,18 @@ randomized_resources(void)
 }
 #endif
 
+static int
+fix_idleout(void)
+{
+	faction *f;
+
+	f = findfaction(0);
+	fset(f, FL_NOIDLEOUT);
+	f = findfaction(atoi36("muse"));
+	fset(f, FL_NOIDLEOUT);
+	return 0;
+}
+
 void
 korrektur(void)
 {
@@ -2786,22 +2798,11 @@ korrektur(void)
 #endif
 
 	do_once("grat", fix_ratfamiliar());
-
 	do_once("fdmd", fix_demand());
 #if NEW_RESOURCEGROWTH
 	do_once("rndr", randomized_resources());
 #endif
-	{
-		/* Test der Message-Funktion. Ist leider noch nicht
-		 * Plane-übergreifend, deshalb die Waldelfen. */
-		faction *f = findfaction(atoi36("1"));
-		if(f) {
-			attrib *permission = a_find(f->attribs, &at_permissions);
-			if(!permission) permission = a_add(&f->attribs, a_new(&at_permissions));
-			a_add((attrib**)&permission->data.v, make_key(atoi36("gmmsgr")));
-			a_add((attrib**)&permission->data.v, make_key(atoi36("gmmsgu")));
-		}
-	}
+	do_once("idlo", fix_idleout());
 
   /* trade_orders(); */
 	if (global.data_version < NEWROAD_VERSION) {
diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c
index 5893c7ec5..1000335ae 100644
--- a/src/mapper/mapper.c
+++ b/src/mapper/mapper.c
@@ -422,7 +422,9 @@ drawmap(boolean maponly) {
 
 			addch(' ');
 			if (r) {
+#ifdef COLOR
 				int rc = RegionColor(r);
+#endif
 				if ((hl == -2 && r->units) ||
 					 (hl == -3 && r->buildings) ||
 					 (hl == -4 && r->ships) ||
@@ -436,7 +438,9 @@ drawmap(boolean maponly) {
 				else if (is_tagged(r))
 					addch(rs | A_BOLD);
 				else {
+#ifdef COLOR
 					attrset(rc | A_NORMAL);
+#endif
 					addch(rs);
 					attrset(A_NORMAL);
 				}