forked from github/server
Fehler beim Einlesen des default-befehls
This commit is contained in:
parent
94ade452b7
commit
6602252027
|
@ -977,7 +977,7 @@ alliedunit(const unit * u, const faction * f2, int mode)
|
|||
mode = (mode & automode) | (mode & HELP_GIVE);
|
||||
|
||||
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;
|
||||
return alliedgroup(pl, u->faction, f2, sf, mode);
|
||||
}
|
||||
|
|
|
@ -1091,7 +1091,7 @@ readunit(FILE * F)
|
|||
if (ord!=NULL) addlist(&u->orders, ord);
|
||||
freadstr(F, buf, sizeof(buf));
|
||||
}
|
||||
rs(F, buf);
|
||||
freadstr(F, buf, sizeof(buf));
|
||||
u->lastorder = parse_order(buf, u->faction->locale);
|
||||
set_order(&u->thisorder, NULL);
|
||||
|
||||
|
|
|
@ -175,12 +175,12 @@ create_wormholes(void)
|
|||
}
|
||||
|
||||
match = (region**)malloc(sizeof(region*) * count);
|
||||
qsort(match, count, sizeof(region *), cmp_age);
|
||||
rptr = rlist;
|
||||
while (i!=count) {
|
||||
match[i++] = rptr->data;
|
||||
rptr = rptr->next;
|
||||
}
|
||||
qsort(match, count, sizeof(region *), cmp_age);
|
||||
free_regionlist(rlist);
|
||||
|
||||
count /= 2;
|
||||
|
|
Loading…
Reference in New Issue