From dac7b9d7d68a2e28f567305e20c245ea6380e08f Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Fri, 9 Feb 2001 19:12:15 +0000
Subject: [PATCH] =?UTF-8?q?-=20Kr=C3=A4uterkarte=20f=C3=BCr=20den=20Mapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/eressea/korrektur.c |  9 ++-------
 src/mapper/mapper.c     | 26 +++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index 149ba19bd..c4e104ec3 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: korrektur.c,v 1.15 2001/02/09 13:53:53 corwin Exp $
+ *	$Id: korrektur.c,v 1.16 2001/02/09 19:12:15 corwin Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -976,12 +976,7 @@ show_newspells(void)
 	/* Alle geänderten Zauber in das array newspellids[]. mit SPL_NOSPELL
 	 * terminieren */
 
-	spellid_t newspellids[] = { SPL_ETERNIZEWALL,
-		SPL_CERDDOR_EARN_SILVER,
-		SPL_PUTTOREST,
-		SPL_UNHOLYPOWER,
-		SPL_HOLYGROUND,
-		SPL_NOSPELL };
+	spellid_t newspellids[] = { SPL_NOSPELL };
 
 	/* die id's der neuen oder veränderten Sprüche werden in newspellids[]
 	 * abgelegt */
diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c
index c0ac30d58..7f9ea8bee 100644
--- a/src/mapper/mapper.c
+++ b/src/mapper/mapper.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: mapper.c,v 1.8 2001/02/09 15:17:31 corwin Exp $
+ *	$Id: mapper.c,v 1.9 2001/02/09 19:12:15 corwin Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -12,7 +12,7 @@
  * prior permission by the authors of Eressea.
  */
 
-#define VERSION "3.2.0"
+#define VERSION "3.3.0"
 
 #define MAIN_C
 #define BOOL_DEFINED
@@ -198,6 +198,22 @@ RegionSymbol(region *r) {
 		}
 		break;
 #endif
+	case 3:
+		{
+			const herb_type *herb = rherbtype(r);
+			if(herb) {
+				const char *c = resourcename(herb2resource(herb),0);
+				int h = atoi(c+1);
+				if(h < 10) {
+					rs = '0'+h;
+				} else {
+					rs = 'a'+(h-10);
+				}
+			} else {
+				rs = terrain[rterrain(r)].symbol;
+			}
+		}
+		break;
 	default:
 		rs = terrain[rterrain(r)].symbol;
 		if(rs == 'P' && rtrees(r) >= 600) rs = 'F';
@@ -276,6 +292,10 @@ drawmap(boolean maponly) {
 			movexy(SX-14,SY-2);
 			addstr(" Handelskar ");
 			break;
+		case 3:
+			movexy(SX-14,SY-2);
+			addstr(" Botanik    ");
+			break;
 		}
 	}
 
@@ -895,7 +915,7 @@ movearound(int rx, int ry) {
 					ch = -9;
 					break;
 				case 'k':
-					politkarte = (politkarte+1)%3;
+					politkarte = (politkarte+1)%4;
 					ch = -9;
 					break;
 				case '{':