From 046290ebdbb6fa9137916ff251a33109006ded30 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 9 Oct 2005 09:09:51 +0000
Subject: [PATCH] =?UTF-8?q?Bugfix:=20spellnames=20sind=20nicht=20von=20sp-?=
 =?UTF-8?q?>info=20abh=C3=A4ngig.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/gamecode/creport.c | 18 +++++-------------
 src/common/kernel/spell.c     | 12 ++++++------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index 12176f33f..459ff636f 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -810,20 +810,15 @@ cr_output_unit(FILE * F, const region * r,
         fprintf(F, "SPRUECHE\n");
         for (;slist; slist = slist->next) {
           spell * sp = slist->data;
-          const char * name = sp->sname;
-          if (sp->level > t) continue;
-          if (sp->info==NULL) {
-            name = add_translation(mkname("spell", name), spell_name(sp, f->locale));
+          if (sp->level <= t) {
+            const char * name = add_translation(mkname("spell", sp->sname), spell_name(sp, f->locale));
+            fprintf(F, "\"%s\"\n", name);
           }
-          fprintf(F, "\"%s\"\n", name);
         }
         for (i=0;i!=MAXCOMBATSPELLS;++i) {
           const spell * sp = mage->combatspells[i].sp;
           if (sp) {
-            const char * name = sp->sname;
-            if (sp->info==NULL) {
-              name = add_translation(mkname("spell", name), spell_name(sp, f->locale));
-            }
+            const char * name = add_translation(mkname("spell", sp->sname), spell_name(sp, f->locale));
             fprintf(F, "KAMPFZAUBER %d\n", i);
             fprintf(F, "\"%s\";name\n", name);
             fprintf(F, "%d;level\n", mage->combatspells[i].level);
@@ -968,10 +963,7 @@ cr_reportspell(FILE * F, spellid_t id, const struct locale * lang)
 {
 	int k;
 	spell *sp = find_spellbyid(id);
-	const char * name = sp->sname;
-	if (sp->info==NULL) {
-		name = add_translation(mkname("spell", name), spell_name(sp, lang));
-	}
+	const char * name = add_translation(mkname("spell", sp->sname), spell_name(sp, lang));
 
 	fprintf(F, "ZAUBER %d\n", hashstring(spell_name(sp, default_locale)));
 	fprintf(F, "\"%s\";name\n", name);
diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c
index e9a36c959..c8e484b70 100644
--- a/src/common/kernel/spell.c
+++ b/src/common/kernel/spell.c
@@ -7517,12 +7517,12 @@ init_spellnames(const struct locale * lang, magic_t mtype)
   sn->mtype = mtype;
   for (slist=spells;slist!=NULL;slist=slist->next) {
     spell * sp = slist->data;
-    const char * n = sp->sname;
-    variant token;
-    if (sp->magietyp!=mtype) continue;
-    if (sp->info==NULL) n = locale_string(lang, mkname("spell", n));
-    token.v = sp;
-    addtoken(&sn->names, n, token);
+    if (sp->magietyp==mtype) {
+      const char * n = spell_name(sp, lang);
+      variant token;
+      token.v = sp;
+      addtoken(&sn->names, n, token);
+    }
   }
   return spellnames = sn;
 }