From abd85666ac47fe52a4b488675cab2681119689c6 Mon Sep 17 00:00:00 2001 From: Katja Zedel Date: Sat, 11 May 2002 19:09:33 +0000 Subject: [PATCH] =?UTF-8?q?fix=20curseinfo=20-=20klammer=20fehlte=20(wer?= =?UTF-8?q?=20l=C3=B6scht=20meine=20klammern=20weg=3F=3F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/gamecode/creport.c | 3 ++- src/common/gamecode/report.c | 3 ++- src/common/spells/unitcurse.c | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c index 588856f36..6b92cbf15 100644 --- a/src/common/gamecode/creport.c +++ b/src/common/gamecode/creport.c @@ -241,11 +241,12 @@ print_curses(FILE * F, const faction * viewer, const void * obj, typ_t typ) if (fval(a->type, ATF_CURSE)) { c = (curse *)a->data.v; - if (c->type->curseinfo) + if (c->type->curseinfo){ if (c->type->cansee){ self = c->type->cansee(viewer, obj, typ, c, self); } dh = c->type->curseinfo(viewer->locale, obj, typ, c, self); + } if (dh == 1) { if (!header) { header = 1; diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index a42c8fc1d..9ad880a5c 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -730,11 +730,12 @@ print_curses(FILE *F, const faction *viewer, const void * obj, typ_t typ, int in if (fval(a->type, ATF_CURSE)) { curse *c = (curse *)a->data.v; - if (c->type->curseinfo) + if (c->type->curseinfo) { if (c->type->cansee){ self = c->type->cansee(viewer, obj, typ, c, self); } dh = c->type->curseinfo(viewer->locale, obj, typ, c, self); + } if (dh == 1) { rnl(F); rparagraph(F, buf, indent, 0); diff --git a/src/common/spells/unitcurse.c b/src/common/spells/unitcurse.c index 279a2cfa0..ac1e50c8b 100644 --- a/src/common/spells/unitcurse.c +++ b/src/common/spells/unitcurse.c @@ -334,7 +334,7 @@ cinfo_sparkle(const struct locale * lang, const void * obj, typ_t typ, struct cu static struct curse_type ct_sparkle = { "sparkle", CURSETYP_UNIT, CURSE_SPREADMODULO, ( M_MEN | M_DURATION ), "Dieser Zauber ist einer der ersten, den junge Magier in der Schule lernen.", - NULL + cinfo_sparkle }; /* ------------------------------------------------------------- */ @@ -361,7 +361,7 @@ static struct curse_type ct_strength = { "strength", CURSETYP_UNIT, CURSE_SPREADMODULO, M_MEN, "Dieser Zauber vermehrt die Stärke der verzauberten Personen um ein " "vielfaches.", - NULL + cinfo_strength }; /* ------------------------------------------------------------- */ @@ -387,7 +387,7 @@ static struct curse_type ct_worse = { "worse", CURSETYP_UNIT, CURSE_SPREADMODULO, M_MEN, "", - NULL + cinfo_allskills }; /* ------------------------------------------------------------- */