From 2e60a2a325651d2a18933a21f392689a939eb740 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 3 Feb 2001 18:46:15 +0000 Subject: [PATCH] fehler in onvertierung der trigger --- src/common/kernel/building.c | 4 ++-- src/eressea/korrektur.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/kernel/building.c b/src/common/kernel/building.c index 65249f0c3..3b39fa887 100644 --- a/src/common/kernel/building.c +++ b/src/common/kernel/building.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: building.c,v 1.4 2001/02/03 13:45:32 enno Exp $ + * $Id: building.c,v 1.5 2001/02/03 18:46:15 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -824,7 +824,7 @@ bt_read(FILE * F) char * s = buf+1; assert(*(semi-2)=='\"'); *(semi-2)=0; - if (!strcmp(semi, "name")) bt->_name = strdup(s); + if (!strcmp(semi, "name") && !bt->_name) bt->_name = strdup(s); } else { int i = atoi(buf); diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index ac3d34520..3325cd8e2 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: korrektur.c,v 1.11 2001/02/03 13:45:34 enno Exp $ + * $Id: korrektur.c,v 1.12 2001/02/03 18:46:15 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -1681,7 +1681,7 @@ convert_triggers(void) fprintf(stderr, "WARNING: unknown relation %d between %s and 0x%p not converted\n", rel->id, unitname(u), u2); break; } - a = a->next; + a = a->nexttype; } u = u->next; }