From cefa3e61bb486c784655811c05a9631b604fcff6 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Wed, 1 May 2002 20:06:32 +0000
Subject: [PATCH] making the mapper compile

---
 src/mapper/map_region.c | 12 ++++++------
 src/mapper/map_units.c  |  4 ++--
 src/mapper/mapper.c     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mapper/map_region.c b/src/mapper/map_region.c
index c93fcd87f..dbc649391 100644
--- a/src/mapper/map_region.c
+++ b/src/mapper/map_region.c
@@ -149,17 +149,17 @@ SpecialFunction(region *r)
 	wrefresh(win);
 	switch(getch()) {
 	case '1':
-		if(!is_cursed_internal(r->attribs, C_CURSED_BY_THE_GODS, 0)) {
-			create_curse(NULL, &r->attribs, C_CURSED_BY_THE_GODS, 0,
+		if (get_curse(r->attribs, ct_find("godcursezone"))==NULL) {
+			curse * c = create_curse(NULL, &r->attribs, ct_find("godcursezone"),
 				100, 100, 0, 0);
-			set_curseflag(r->attribs, C_CURSED_BY_THE_GODS, 0, CURSE_ISNEW|CURSE_IMMUN);
+			curse_setflag(c, CURSE_ISNEW|CURSE_IMMUNE);
 			modified = 1;
 			break;
 		}
 	case '2':
-		if(!is_cursed_internal(r->attribs, C_PEACE, 0)) {
-			create_curse(NULL, &r->attribs, C_PEACE, 0, 100, 2, 0, 0);
-			set_curseflag(r->attribs, C_PEACE, 0, CURSE_IMMUN);
+		if(!is_cursed_internal(r->attribs, ct_find("peacezone"))) {
+			curse * c = create_curse(NULL, &r->attribs, ct_find("peacezone"), 100, 2, 0, 0);
+			curse_setflag(c, CURSE_IMMUNE);
 			modified = 1;
 		}
 	default:
diff --git a/src/mapper/map_units.c b/src/mapper/map_units.c
index 4ed6e8cf6..d869df972 100644
--- a/src/mapper/map_units.c
+++ b/src/mapper/map_units.c
@@ -948,7 +948,7 @@ showunits(region * r)
 	building *b;
 	ship *sh;
 	dbllist *eh = NULL, *unten, *oben, *hlp = NULL, *such = NULL, *tmp;
-	int line, ch, bottom, bot, f, f2;
+	int line, ch, bottom, bot, f;
 	size_t lt;
 	char *s = NULL, *txt, *suchtext = 0, str[45], lbuf[256];
 
@@ -1511,7 +1511,7 @@ showunits(region * r)
 							clipregion = r;
 							break;
 						case '\023':
-							clipship = findship(f2);
+							clipship = findship(f);
 							shipregion = r;
 							break;
 						}
diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c
index f27467e08..7e08ea888 100644
--- a/src/mapper/mapper.c
+++ b/src/mapper/mapper.c
@@ -442,7 +442,7 @@ drawmap(boolean maponly) {
 					 (hl == -5 && has_laen(r)) ||
 					 (hl == -6 && fval(r, RF_MALLORN)) ||
 					 (hl == -7 && fval(r, RF_CHAOTIC)) ||
-					 (hl == -8 && is_cursed_internal(r->attribs, C_CURSED_BY_THE_GODS, 0)) ||
+					 (hl == -8 && get_curse(r->attribs, ct_find("godcursezone"))) ||
 					 (hl == -9 && newbie_region(r)) ||
 					 (hl == -10 && dropout_region(r)) ||
 					 (hl >= 0 && factionhere(r, hl)) ||