diff --git a/src/common/attributes/moved.c b/src/common/attributes/moved.c index e6778f0b5..47eb7f6fa 100644 --- a/src/common/attributes/moved.c +++ b/src/common/attributes/moved.c @@ -35,8 +35,8 @@ static int 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_FAIL; + if (a->data.i !=0 ) return AT_READ_OK; + else return AT_READ_OK; /* eigentlich _FAIL, workaround */ } attrib_type at_moved = { diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c index 3466718d8..4711f8ed1 100644 --- a/src/common/gamecode/randenc.c +++ b/src/common/gamecode/randenc.c @@ -1060,8 +1060,6 @@ randomevents(void) drown(r); } - /* Orkische vermehren sich */ - for (r = regions; r; r = r->next) { for (u = r->units; u; u = u->next) { if (is_cursed(u->attribs, C_ORC, 0) diff --git a/src/common/kernel/alchemy.c b/src/common/kernel/alchemy.c index 34f384a34..d6537114e 100644 --- a/src/common/kernel/alchemy.c +++ b/src/common/kernel/alchemy.c @@ -194,7 +194,7 @@ a_readeffect(attrib *a, FILE *f) fscanf(f, "%s %d", zText, &power); ptype = pt_find(zText); } - if (ptype==NULL || power==0) return 0; + if (ptype==NULL || power==0) return AT_READ_FAIL; edata->type = ptype; edata->value = power; return AT_READ_OK; diff --git a/src/common/util/attrib.c b/src/common/util/attrib.c index 4b79f0c11..db82d3c33 100644 --- a/src/common/util/attrib.c +++ b/src/common/util/attrib.c @@ -264,7 +264,7 @@ a_read(FILE * f, attrib ** attribs) a_add(attribs, na); break; case AT_READ_FAIL: - log_warning(("reading attribute %s failed.\n", zText)); + 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 51a0be85a..a34dab456 100644 --- a/src/common/util/event.c +++ b/src/common/util/event.c @@ -55,7 +55,7 @@ read_triggers(FILE * F, trigger ** tp) tp = &(*tp)->next; break; case AT_READ_FAIL: - log_warning(("reading trigger for %s failed.\n", ttype->name)); + log_warning(("reading trigger for %s failed\n", ttype->name)); t_free(*tp); *tp = NULL; break;