From 6602252027d2741dbb9d7188bddc8560f3698dec Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 6 Jul 2004 15:11:27 +0000 Subject: [PATCH] Fehler beim Einlesen des default-befehls --- src/common/kernel/eressea.c | 2 +- src/common/kernel/save.c | 2 +- src/common/modules/wormhole.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index e5c264621..b2d26a0d4 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -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); } diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index 431449625..4ceb7c46d 100644 --- a/src/common/kernel/save.c +++ b/src/common/kernel/save.c @@ -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); diff --git a/src/common/modules/wormhole.c b/src/common/modules/wormhole.c index afb4be222..dab49ad1b 100644 --- a/src/common/modules/wormhole.c +++ b/src/common/modules/wormhole.c @@ -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;