From 8421cf23c107bbf9eef225278dc703aba6232154 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Fri, 12 Oct 2007 19:31:28 +0000
Subject: [PATCH] =?UTF-8?q?http://eressea.upb.de/mantis/view.php=3Fid=3D13?=
 =?UTF-8?q?03=20"(gezauberte)=20Skelette=20k=C3=B6nnen=20nie=20bewachen"?=
 =?UTF-8?q?=20-=20removed=20an=20old=20hack=20(CANGUARD=20flag)=20-=20gave?=
 =?UTF-8?q?=20summoned=20undead=20some=20base=20skills.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/battle.c    |  2 +-
 src/common/kernel/race.h      |  1 -
 src/common/kernel/xmlreader.c |  1 -
 src/common/spells/spells.c    | 17 +++++++++++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 50e70f8c6..2aae90f0d 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -203,7 +203,7 @@ armedmen(const unit * u)
   item * itm;
   int n = 0;
   if (!(urace(u)->flags & RCF_NOWEAPONS)) {
-    if ((urace(u)->ec_flags & CANGUARD) || effskill(u, SK_WEAPONLESS)>=1) {
+    if (effskill(u, SK_WEAPONLESS)>=1) {
       /* kann ohne waffen bewachen: fuer drachen */
       n = u->number;
     } else {
diff --git a/src/common/kernel/race.h b/src/common/kernel/race.h
index 9cef3b003..3692effdb 100644
--- a/src/common/kernel/race.h
+++ b/src/common/kernel/race.h
@@ -140,7 +140,6 @@ extern int rc_specialdamage(const race *, const race *, const struct weapon_type
 #define GIVEPERSON     (1<<2)   /* übergibt Personen */
 #define GIVEUNIT       (1<<3)   /* Einheiten an andere Partei übergeben */
 #define GETITEM        (1<<4)   /* nimmt Gegenstände an */
-#define CANGUARD       (1<<5)   /* bewachen auch ohne Waffen */
 #define ECF_REC_HORSES     (1<<6)   /* Rekrutiert aus Pferden */
 #define ECF_REC_ETHEREAL   (1<<7)   /* Rekrutiert aus dem Nichts */
 #define ECF_REC_UNLIMITED  (1<<8)   /* Rekrutiert ohne Limit */
diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index 64205f3f7..4a51feb4c 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -1495,7 +1495,6 @@ parse_races(xmlDocPtr doc)
     if (xml_bvalue(node, "giveperson", false)) rc->ec_flags |= GIVEPERSON;
     if (xml_bvalue(node, "giveunit", false)) rc->ec_flags |= GIVEUNIT;
     if (xml_bvalue(node, "getitem", false)) rc->ec_flags |= GETITEM;
-    if (xml_bvalue(node, "canguard", false)) rc->ec_flags |= CANGUARD;
     if (xml_bvalue(node, "recruithorses", false)) rc->ec_flags |= ECF_REC_HORSES;
     if (xml_bvalue(node, "recruitethereal", false)) rc->ec_flags |= ECF_REC_ETHEREAL;
     if (xml_bvalue(node, "recruitunlimited", false)) rc->ec_flags |= ECF_REC_UNLIMITED;
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 6cb0a4278..08632b8a3 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -3590,6 +3590,22 @@ sp_bloodsacrifice(castorder *co)
   return cast_level;
 }
 
+/** gives a summoned undead unit some base skills.
+ */
+static void
+skill_summoned(unit * u, int level)
+{
+  if (level>0) {
+    const race * rc = u->race;
+    skill_t sk;
+    for (sk=0;sk!=MAXSKILLS;++sk) {
+      if (rc->bonus[sk>0]) {
+        set_level(u, sk, level);
+      }
+    }
+  }
+}
+
 /* ------------------------------------------------------------- */
 /* Name:       Totenruf - Mächte des Todes
  * Stufe:      6
@@ -3630,6 +3646,7 @@ sp_summonundead(castorder *co)
 
   u = create_unit(r, mage->faction, undead, race, 0, NULL, mage);
   make_undead_unit(u);
+  skill_summoned(u, cast_level/2);
 
   ADDMSG(&mage->faction->msgs, msg_message("summonundead_effect_1", "mage region amount", mage, r, undead));
   ADDMSG(&r->msgs, msg_message("summonundead_effect_2", "mage region", mage, r));