diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index df82fd2e2..5489615ef 100644 --- a/src/common/gamecode/report.c +++ b/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 { diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index a665c11ce..1494ab640 100644 --- a/src/common/kernel/save.c +++ b/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 (saura + + Zauber-ID + spellid + + Richtung direction