diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c index f5f0a417a..8fbae385a 100644 --- a/src/common/gamecode/creport.c +++ b/src/common/gamecode/creport.c @@ -814,7 +814,7 @@ static void show_allies(FILE * F, const faction * f, const ally * sf) { for (; sf; sf = sf->next) if (sf->faction) { - int mode = alliedfaction(NULL, f, sf->faction, HELP_ALL); + int mode = alliedgroup(NULL, f, sf->faction, sf, HELP_ALL); if (mode!=0 && sf->status>0) { fprintf(F, "ALLIANZ %d\n", sf->faction->no); fprintf(F, "\"%s\";Parteiname\n", sf->faction->name); diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index 5e30dc348..b921b0716 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -1650,17 +1650,17 @@ show_allies(const faction * f, const ally * allies) int dh = 0; const ally * sf; for (sf = allies; sf; sf = sf->next) { - int mode = alliedgroup(NULL, f, sf->faction, sf, HELP_ALL); + int mode = alliedgroup(NULL, f, sf->faction, sf, HELP_ALL); #ifdef ALLIANCES - if (f->alliance!=sf->faction->alliance) continue; + if (f->alliance!=sf->faction->alliance) continue; #endif if (mode > 0) ++allierte; } for (sf = allies; sf; sf = sf->next) { - int mode = alliedgroup(NULL, f, sf->faction, sf, HELP_ALL); + int mode = alliedgroup(NULL, f, sf->faction, sf, HELP_ALL); #ifdef ALLIANCES - if (f->alliance!=sf->faction->alliance) continue; + if (f->alliance!=sf->faction->alliance) continue; #endif if (mode <= 0) continue; i++; diff --git a/src/common/kernel/karma.c b/src/common/kernel/karma.c index cf13830df..3d608ad82 100644 --- a/src/common/kernel/karma.c +++ b/src/common/kernel/karma.c @@ -439,7 +439,7 @@ prayers(void) p = findparam(s, u->faction->locale); switch(p) { case P_AURA: - if(!is_mage) { + if(!is_mage(u)) { cmistake(u, S->s, 214, MSG_EVENT); continue; }