From a26a079f10c11d1273b705060c743440e40302a2 Mon Sep 17 00:00:00 2001
From: Katja Zedel <katze@felidae.kn-bremen.de>
Date: Sat, 11 May 2002 18:12:25 +0000
Subject: [PATCH] =?UTF-8?q?der=20curse=20hei=C3=9Ft=20nicht=20MAGICSTONE?=
 =?UTF-8?q?=20sondern=20magicwalls?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/battle.c        | 6 +++---
 src/common/kernel/build.c         | 6 +++---
 src/common/kernel/curse.h         | 2 +-
 src/common/kernel/spell.c         | 4 ++--
 src/common/spells/buildingcurse.c | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 2af694f37..3baccdd69 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -1639,10 +1639,10 @@ skilldiff(troop at, troop dt, int dist)
 
 	if (df->building) {
 		boolean init = false;
-		static const curse_type * strongwall_ct, * magicstone_ct;
+		static const curse_type * strongwall_ct, * magicwalls_ct;
 		if (!init) {
 			strongwall_ct = ct_find("strongwall");
-			magicstone_ct = ct_find("magicstone");
+			magicwalls_ct = ct_find("magicwalls");
 			init=true;
 		}
 		if (df->building->type->flags & BTF_PROTECTION) {
@@ -1663,7 +1663,7 @@ skilldiff(troop at, troop dt, int dist)
 				is_protected = 2;
 			}
 		}
-		if (magicstone_ct && curse_active(get_curse(df->building->attribs, magicstone_ct))) {
+		if (magicwalls_ct && curse_active(get_curse(df->building->attribs, magicwalls_ct))) {
 			/* Verdoppelt Burgenbonus */
 			skdiff -= buildingeffsize(df->building, false);
 		}
diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c
index 3ec8553b3..5fed65b1d 100644
--- a/src/common/kernel/build.c
+++ b/src/common/kernel/build.c
@@ -182,8 +182,8 @@ siege(region * r, unit * u)
 	int d;
 	int bewaffnete, katapultiere = 0;
 	static boolean init = false;
-	static const curse_type * magicstone_ct;
-	if (!init) { init = true; magicstone_ct = ct_find("magicstone"); }
+	static const curse_type * magicwalls_ct;
+	if (!init) { init = true; magicwalls_ct = ct_find("magicwalls"); }
 	/* gibt es ueberhaupt Burgen? */
 
 	b = getbuilding(r);
@@ -233,7 +233,7 @@ siege(region * r, unit * u)
 	d = min(d, b->size - 1);
 
 	/* meldung, schaden anrichten */
-	if (d && !curse_active(get_curse(b->attribs, magicstone_ct))) {
+	if (d && !curse_active(get_curse(b->attribs, magicwalls_ct))) {
 		b->size -= d;
 		new_use_pooled(u, &rt_catapultammo, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, d);
 		d = 100 * d / b->size;
diff --git a/src/common/kernel/curse.h b/src/common/kernel/curse.h
index 0fbcf557d..04943c43c 100644
--- a/src/common/kernel/curse.h
+++ b/src/common/kernel/curse.h
@@ -100,7 +100,7 @@ enum {
 	C_SHIP_FLYING,		/* 10 - Luftschiff-Zauber */
 	C_SHIP_NODRIFT,		/* 11 - GünstigeWinde-Zauber */
 	C_DEPRESSION,
-	C_MAGICSTONE,     /* 13 - Heimstein */
+	C_MAGICWALLS,     /* 13 - Heimstein */
 	C_STRONGWALL,	    /* 14 - Feste Mauer - Precombat*/
 	C_ASTRALBLOCK,		/* 15 - Astralblock */
 	C_GENEROUS,	      /* 16 - Unterhaltung vermehren */
diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c
index ed48f3e16..2ece753cd 100644
--- a/src/common/kernel/spell.c
+++ b/src/common/kernel/spell.c
@@ -2098,7 +2098,7 @@ sp_homestone(castorder *co)
 		return 0;
 	}
 
-	c = create_curse(mage, &mage->building->attribs, ct_find("magicstone"),
+	c = create_curse(mage, &mage->building->attribs, ct_find("magicwalls"),
 			force*force, 1, 0, 0);
 
 	if (c==NULL) {
@@ -2433,7 +2433,7 @@ sp_earthquake(castorder *co)
 			continue;
 
 		/* Schutzzauber */
-		if(is_cursed(burg->attribs, C_MAGICSTONE, 0))
+		if(is_cursed(burg->attribs, C_MAGICWALLS, 0))
 			continue;
 
 		/* Magieresistenz */
diff --git a/src/common/spells/buildingcurse.c b/src/common/spells/buildingcurse.c
index 09f9831b6..552a467ac 100644
--- a/src/common/spells/buildingcurse.c
+++ b/src/common/spells/buildingcurse.c
@@ -53,7 +53,7 @@ cinfo_building(const locale * lang, void * obj, typ_t typ, curse *c, int self)
 
 /* CurseInfo mit Spezialabfragen */
 
-/* C_MAGICSTONE*/
+/* C_MAGICWALLS*/
 static int
 cinfo_magicrunes(void * obj, typ_t typ, curse *c, int self)
 {