diff --git a/src/common/kernel/border.c b/src/common/kernel/border.c index cfab0b31f..2742ced80 100644 --- a/src/common/kernel/border.c +++ b/src/common/kernel/border.c @@ -109,7 +109,7 @@ read_borders(FILE * f) fscanf(f, "%d %d %d %d ", &fx, &fy, &tx, &ty); bid = ++nextborder; } else { - fscanf(f, "%d %d %d %d %d", &bid, &fx, &fy, &tx, &ty); + fscanf(f, "%ud %d %d %d %d", &bid, &fx, &fy, &tx, &ty); } type = find_bordertype(zText); assert(type || !"border type not registered"); @@ -209,7 +209,7 @@ b_read(border * b, FILE *f) if (global.data_versiondata); else - fscanf(f, "%x ", (int*)&b->data); + fscanf(f, "%x ", (unsigned int*)&b->data); } void diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c index f17998dd2..d25c18e3e 100644 --- a/src/common/kernel/item.c +++ b/src/common/kernel/item.c @@ -2432,7 +2432,7 @@ rt_read(FILE * F) { resource_type * rt = calloc(sizeof(resource_type), 1); unsigned int hash; - int i = fscanf(F, "%d\n", &hash); + int i = fscanf(F, "%ud\n", &hash); if (i==0 || i==EOF) { free(rt); return NULL; diff --git a/src/eressea/main.c b/src/eressea/main.c index 60a3fe324..ce97ad7ac 100644 --- a/src/eressea/main.c +++ b/src/eressea/main.c @@ -558,8 +558,6 @@ typedef struct lostdata { int ship; } lostdata; -static unit * lostunits; - int main(int argc, char *argv[]) { diff --git a/src/mapper/logging.c b/src/mapper/logging.c index deb620927..a96b852f7 100644 --- a/src/mapper/logging.c +++ b/src/mapper/logging.c @@ -36,7 +36,7 @@ log_read(const char * filename) char buf[64]; while (*fp) fp=&(*fp)->next; - fscanf(log, "LOGVERSION %d\n", &global.data_version); + fscanf(log, "LOGVERSION %ud\n", &global.data_version); while (!feof(log)) { if(fscanf(log, "%s", buf) == EOF) break; if (strcmp(buf, "UNIT")==0) {