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

Fehler beim Einlesen des default-befehls

This commit is contained in:
Enno Rehling 2004-07-06 15:11:27 +00:00
parent 94ade452b7
commit 6602252027
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -977,7 +977,7 @@ alliedunit(const unit * u, const faction * f2, int mode)
mode = (mode & automode) | (mode & HELP_GIVE); mode = (mode & automode) | (mode & HELP_GIVE);
sf = u->faction->allies; sf = u->faction->allies;
a = a_find(u->attribs, &at_group); a = a_findc(u->attribs, &at_group);
if (a!=NULL) sf = ((group*)a->data.v)->allies; if (a!=NULL) sf = ((group*)a->data.v)->allies;
return alliedgroup(pl, u->faction, f2, sf, mode); return alliedgroup(pl, u->faction, f2, sf, mode);
} }

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

@ -1091,7 +1091,7 @@ readunit(FILE * F)
if (ord!=NULL) addlist(&u->orders, ord); if (ord!=NULL) addlist(&u->orders, ord);
freadstr(F, buf, sizeof(buf)); freadstr(F, buf, sizeof(buf));
} }
rs(F, buf); freadstr(F, buf, sizeof(buf));
u->lastorder = parse_order(buf, u->faction->locale); u->lastorder = parse_order(buf, u->faction->locale);
set_order(&u->thisorder, NULL); set_order(&u->thisorder, NULL);

2
src/common/modules/wormhole.c
View File

@ -175,12 +175,12 @@ create_wormholes(void)
} }
match = (region**)malloc(sizeof(region*) * count); match = (region**)malloc(sizeof(region*) * count);
qsort(match, count, sizeof(region *), cmp_age);
rptr = rlist; rptr = rlist;
while (i!=count) { while (i!=count) {
match[i++] = rptr->data; match[i++] = rptr->data;
rptr = rptr->next; rptr = rptr->next;
} }
qsort(match, count, sizeof(region *), cmp_age);
free_regionlist(rlist); free_regionlist(rlist);
count /= 2; count /= 2;