Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Bugfix is_mage 

- Bugfix Allianzen im CR
This commit is contained in:
Enno Rehling 2003-01-12 09:33:20 +00:00
parent e84dffb9a2
commit 7edf02f55c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/gamecode/creport.c
View File

@ -814,7 +814,7 @@ static void
show_allies(FILE * F, const faction * f, const ally * sf) show_allies(FILE * F, const faction * f, const ally * sf)
{ {
for (; sf; sf = sf->next) if (sf->faction) { 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) { if (mode!=0 && sf->status>0) {
fprintf(F, "ALLIANZ %d\n", sf->faction->no); fprintf(F, "ALLIANZ %d\n", sf->faction->no);
fprintf(F, "\"%s\";Parteiname\n", sf->faction->name); fprintf(F, "\"%s\";Parteiname\n", sf->faction->name);

8
src/common/gamecode/report.c
View File

@ -1650,17 +1650,17 @@ show_allies(const faction * f, const ally * allies)
int dh = 0; int dh = 0;
const ally * sf; const ally * sf;
for (sf = allies; sf; sf = sf->next) { 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 #ifdef ALLIANCES
if (f->alliance!=sf->faction->alliance) continue; if (f->alliance!=sf->faction->alliance) continue;
#endif #endif
if (mode > 0) ++allierte; if (mode > 0) ++allierte;
} }
for (sf = allies; sf; sf = sf->next) { 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 #ifdef ALLIANCES
if (f->alliance!=sf->faction->alliance) continue; if (f->alliance!=sf->faction->alliance) continue;
#endif #endif
if (mode <= 0) continue; if (mode <= 0) continue;
i++; i++;

2
src/common/kernel/karma.c
View File

@ -439,7 +439,7 @@ prayers(void)
p = findparam(s, u->faction->locale); p = findparam(s, u->faction->locale);
switch(p) { switch(p) {
case P_AURA: case P_AURA:
if(!is_mage) { if(!is_mage(u)) {
cmistake(u, S->s, 214, MSG_EVENT); cmistake(u, S->s, 214, MSG_EVENT);
continue; continue;
} }