some spell syntax definitions fixed

src/common/gamecode/report.c

@@ -407,6 +407,10 @@ report_spell(FILE * F,  spell *sp, const struct locale * lang)
       }
       if (wrptr(&bufp, &size, bytes)!=0) WARN_STATIC_BUFFER();
     } else if (cp=='k') {
+      if (*params=='c') {
+        /* skip over a potential id */
+        ++params;
+      }
       for (targetp=targets;targetp->flag;++targetp) {
         if (sp->sptyp&targetp->flag) ++maxparam;
       }
@@ -439,8 +443,10 @@ report_spell(FILE * F,  spell *sp, const struct locale * lang)
         bytes = (int)strlcpy(bufp, " )", size);
         if (wrptr(&bufp, &size, bytes)!=0) WARN_STATIC_BUFFER();
       }
-    } else {
-      const char * cstr = strchr(syntaxp, ':');
+    } else if (cp=='i' || cp=='c') {
+      const char * cstr;
+      assert(syntaxp);
+      cstr = strchr(syntaxp, ':');
       if (!cstr) {
         locp = LOC(lang, mkname("spellpar", syntaxp));
       } else {

src/common/kernel/save.c

@@ -2008,23 +2008,6 @@ a_writevoid(const attrib * a, FILE * f)
 {
 }
 
-static char *
-read_quoted(FILE * f, char *c, size_t size)
-{
-  char * s = c;
-  do {
-    *s = (char) fgetc(f);
-  } while (*s!='"');
-
-  for (;;) {
-    *s = (char) fgetc(f);
-    if (*s=='"') break;
-    if (s<c+size) ++s;
-  }
-  *s = 0;
-  return c;
-}
-
 int
 a_readstring(attrib * a, FILE * F)
 {

src/common/spells/spells.c

@@ -7090,9 +7090,7 @@ static spelldata spelldaten[] =
     (spell_f)sp_fumbleshield, NULL
   },
   {
-    SPL_TRANSFERAURA_DRUIDE, "transferauradruide", NULL,
-    "aura",
-    "ui",
+    SPL_TRANSFERAURA_DRUIDE, "transferauradruide", NULL, "aura", "ui",
     M_DRUIDE, (UNITSPELL|ONSHIPCAST), 1, 6,
     {
       { "aura", 2, SPC_FIX },
@@ -7451,9 +7449,7 @@ static spelldata spelldaten[] =
     (spell_f)sp_combatrosthauch, NULL
   },
   {
-    SPL_TRANSFERAURA_CHAOS, "transferaurachaos", NULL,
-    "aura",
-    "ui",
+    SPL_TRANSFERAURA_CHAOS, "transferaurachaos", NULL, "aura", "ui",
     M_CHAOS, (UNITSPELL|ONSHIPCAST), 1, 7,
     {
       { "aura", 2, SPC_FIX },
@@ -7719,9 +7715,7 @@ static spelldata spelldaten[] =
     (spell_f)sp_icastle, NULL
   },
   {
-    SPL_TRANSFERAURA_TRAUM, "transferauratraum", NULL,
-    "aura",
-    "ui",
+    SPL_TRANSFERAURA_TRAUM, "transferauratraum", NULL, "aura", "ui",
     M_TRAUM, (UNITSPELL|ONSHIPCAST), 1, 3,
     {
       { "aura", 2, SPC_FIX },
@@ -8056,8 +8050,7 @@ static spelldata spelldaten[] =
     (spell_f)sp_hero, NULL
   },
   {
-    SPL_TRANSFERAURA_BARDE, "transfer_aura_song", NULL, NULL,
-    "ui",
+    SPL_TRANSFERAURA_BARDE, "transfer_aura_song", NULL, "aura", "ui",
     M_BARDE, (UNITSPELL|ONSHIPCAST), 1, 5,
     {
       { "aura", 2, SPC_FIX },
@@ -8449,9 +8442,7 @@ static spelldata spelldaten[] =
     (spell_f)sp_leaveastral, NULL
   },
   {
-    SPL_TRANSFERAURA_ASTRAL, "auratransfer", NULL,
-    "aura",
-    "ui",
+    SPL_TRANSFERAURA_ASTRAL, "auratransfer", NULL, "aura", "ui",
     M_ASTRAL, (UNITSPELL|ONSHIPCAST), 1, 5,
     {
       { "aura", 1, SPC_FIX },
@@ -8555,8 +8546,8 @@ static spelldata spelldaten[] =
     (spell_f)sp_flying_ship, NULL
   },
   {
-    SPL_DESTROY_MAGIC, "break_curse", NULL, NULL,
-    "kcc",
+    SPL_DESTROY_MAGIC, "break_curse", NULL, "spellid",
+    "kcc?",
     M_ASTRAL, (FARCASTING | SPELLLEVEL | ONSHIPCAST | TESTCANSEE | ANYTARGET), 3, 7,
     {
       { "aura", 3, SPC_LEVEL },

src/res/de/strings.xml

@@ -7493,6 +7493,11 @@
       <text locale="en">aura</text>
     </string>
 
+    <string name="spellid">
+      <text locale="de">Zauber-ID</text>
+      <text locale="en">spellid</text>
+    </string>
+
     <string name="direction">
       <text locale="de">Richtung</text>
       <text locale="en">direction</text>