From eadda41bcb73bd60320601f0e978b0ee4f190f64 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 1 Jan 2006 17:19:51 +0000
Subject: [PATCH] no more find_spellbyid for resource files.

---
 src/common/gamecode/creport.c   |  6 +++---
 src/common/kernel/xmlreader.c   |  8 +-------
 src/res/vinyambar/wdw-races.xml | 12 ++++++------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index ad2242080..83a46b5df 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -942,10 +942,9 @@ cr_find_address(FILE * F, const faction * uf, const faction_list * addresses)
 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =  */
 
 static void
-cr_reportspell(FILE * F, spellid_t id, const struct locale * lang)
+cr_reportspell(FILE * F, 	spell *sp, const struct locale * lang)
 {
 	int k;
-	spell *sp = find_spellbyid(id);
 	const char * name = add_translation(mkname("spell", sp->sname), spell_name(sp, lang));
 
 	fprintf(F, "ZAUBER %d\n", hashstring(spell_name(sp, default_locale)));
@@ -1180,7 +1179,8 @@ report_computer(const char * filename, report_context * ctx)
 	cr_find_address(F, f, ctx->addresses);
 	a = a_find(f->attribs, &at_reportspell);
 	while (a) {
-		cr_reportspell(F, (spellid_t)a->data.i, f->locale);
+    spell *sp = find_spellbyid((spellid_t)a->data.i);
+		cr_reportspell(F, sp, f->locale);
 		a = a->nexttype;
 	}
 	for (a=a_find(f->attribs, &at_showitem);a;a=a->nexttype) {
diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index b0c908ace..2502e2cc0 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -71,13 +71,7 @@ xml_spell(xmlNode * node, const char * name)
   const spell * sp = NULL;
   xmlChar * property = xmlGetProp(node, BAD_CAST name);
   if (property!=NULL) {
-    int i = atoi((const char *)property);
-    if (i>0) {
-      sp = find_spellbyid((spellid_t)i);
-    }
-    if (sp==NULL) {
-      sp = find_spell(M_NONE, (const char *)property);
-    }
+    sp = find_spell(M_NONE, (const char *)property);
     assert(sp);
     xmlFree(property);
   }
diff --git a/src/res/vinyambar/wdw-races.xml b/src/res/vinyambar/wdw-races.xml
index d903e2cb2..7934f1a3e 100644
--- a/src/res/vinyambar/wdw-races.xml
+++ b/src/res/vinyambar/wdw-races.xml
@@ -146,9 +146,9 @@
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="5d30"/>
-    <attack type="6" spell="174"/>
-    <attack type="6" spell="175"/>
-    <precombatspell spell="176"/>
+    <attack type="6" spell="drain_skills"/>
+    <attack type="6" spell="aura_of_fear"/>
+    <precombatspell spell="shadowcall"/>
   </race>
   <race name="apophis" magres="0.950000" maxaura="1.000000" regaura="3.000000" recruitcost="2500000" weight="100" capacity="100000" speed="1.000000" hp="2700" ac="10" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="12" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes" shapeshift="yes">
     <ai splitsize="1" killpeasants="yes" learn="yes"/>
@@ -159,9 +159,9 @@
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="5d30"/>
-    <attack type="6" spell="174"/>
-    <attack type="6" spell="175"/>
-    <precombatspell spell="176"/>
+    <attack type="6" spell="drain_skills"/>
+    <attack type="6" spell="aura_of_fear"/>
+    <precombatspell spell="shadowcall"/>
   </race>
 
   <race name="phoenix" magres="0.900000" maxaura="1.000000" regaura="2.000000" recruitcost="50000" weight="50000" capacity="30000" speed="2.000000" hp="500" ac="6" damage="1d20" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes" resistcut="yes" resistpierce="yes">