Bugfix fehlende Regionen

FAIL in read_move
This commit is contained in:
Enno Rehling 2002-04-07 21:06:38 +00:00
parent 4d1347424e
commit d323582109
4 changed files with 7 additions and 4 deletions

View File

@ -36,7 +36,7 @@ read_moved(attrib * a, FILE * F)
{ {
fscanf(F, "%d", &a->data.i); fscanf(F, "%d", &a->data.i);
if (a->data.i !=0 ) return AT_READ_OK; 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 = { attrib_type at_moved = {

View File

@ -2554,7 +2554,12 @@ add_seen(const struct region * r, unsigned char mode, boolean dis)
seen_region * find = find_seen(r); seen_region * find = find_seen(r);
if (find) { if (find) {
if (find->mode >= mode) return false; 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 */ /* take it out the list, so it can get processed again */
find->next->prev = find->prev; find->next->prev = find->prev;
if (find->prev) find->prev->next = find->next; if (find->prev) find->prev->next = find->next;

View File

@ -264,7 +264,6 @@ a_read(FILE * f, attrib ** attribs)
a_add(attribs, na); a_add(attribs, na);
break; break;
case AT_READ_FAIL: case AT_READ_FAIL:
log_warning(("reading attribute %s failed\n", zText));
a_free(na); a_free(na);
break; break;
default: default:

View File

@ -55,7 +55,6 @@ read_triggers(FILE * F, trigger ** tp)
tp = &(*tp)->next; tp = &(*tp)->next;
break; break;
case AT_READ_FAIL: case AT_READ_FAIL:
log_warning(("reading trigger for %s failed\n", ttype->name));
t_free(*tp); t_free(*tp);
*tp = NULL; *tp = NULL;
break; break;