From 50860ea0ef94e1e601768126a795d1739a560cf3 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 5 Aug 2016 21:58:06 +0200 Subject: [PATCH] fix reading data from very old files --- src/kernel/connection.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/kernel/connection.c b/src/kernel/connection.c index 41c67299a..d9f1871d0 100644 --- a/src/kernel/connection.c +++ b/src/kernel/connection.c @@ -651,17 +651,12 @@ int read_borders(gamedata *data) if (r != NULL) to = r; } - if ((type->read && !type->write)) { - log_warning("ignore invalid border '%s' between '%s' and '%s'\n", zText, regionname(from, 0), regionname(to, 0)); - } - else { + if (type->read) { connection *b = new_border(type, from, to); nextborder--; /* new_border erhöht den Wert */ b->id = bid; assert(bid <= nextborder); - if (type->read) { - type->read(b, data); - } + type->read(b, data); if (data->version < NOBORDERATTRIBS_VERSION) { attrib *a = NULL; int result = read_attribs(data, &a, b); @@ -675,6 +670,9 @@ int read_borders(gamedata *data) return result; } } + if (!type->write) { + log_warning("invalid border '%s' between '%s' and '%s'\n", zText, regionname(from, 0), regionname(to, 0)); + } } } return 0;