From d3235821090c5b95b30d400ff19e980505a6f567 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 7 Apr 2002 21:06:38 +0000 Subject: [PATCH] Bugfix fehlende Regionen FAIL in read_move --- src/common/attributes/moved.c | 2 +- src/common/gamecode/report.c | 7 ++++++- src/common/util/attrib.c | 1 - src/common/util/event.c | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/common/attributes/moved.c b/src/common/attributes/moved.c index 47eb7f6fa..698ed8cef 100644 --- a/src/common/attributes/moved.c +++ b/src/common/attributes/moved.c @@ -36,7 +36,7 @@ read_moved(attrib * a, FILE * F) { fscanf(F, "%d", &a->data.i); if (a->data.i !=0 ) return AT_READ_OK; - else return AT_READ_OK; /* eigentlich _FAIL, workaround */ + else return AT_READ_FAIL; } attrib_type at_moved = { diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index 477db36a1..bd126c52f 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -2554,7 +2554,12 @@ add_seen(const struct region * r, unsigned char mode, boolean dis) seen_region * find = find_seen(r); if (find) { if (find->mode >= mode) return false; - if (find->mode>see_neighbour || find->next==NULL) return true; + if (find->mode>see_neighbour) return true; + if (find->next==NULL) { + find->mode = mode; + find->disbelieves |= dis; + return true; + } /* take it out the list, so it can get processed again */ find->next->prev = find->prev; if (find->prev) find->prev->next = find->next; diff --git a/src/common/util/attrib.c b/src/common/util/attrib.c index db82d3c33..1ae190bb8 100644 --- a/src/common/util/attrib.c +++ b/src/common/util/attrib.c @@ -264,7 +264,6 @@ a_read(FILE * f, attrib ** attribs) a_add(attribs, na); break; case AT_READ_FAIL: - log_warning(("reading attribute %s failed\n", zText)); a_free(na); break; default: diff --git a/src/common/util/event.c b/src/common/util/event.c index a34dab456..dc57ab5c3 100644 --- a/src/common/util/event.c +++ b/src/common/util/event.c @@ -55,7 +55,6 @@ read_triggers(FILE * F, trigger ** tp) tp = &(*tp)->next; break; case AT_READ_FAIL: - log_warning(("reading trigger for %s failed\n", ttype->name)); t_free(*tp); *tp = NULL; break;