From a6c73eb65a764f9f917187dc42c2c02114a3e486 Mon Sep 17 00:00:00 2001 From: "John \"Elwin\" Edwards" Date: Sun, 6 Mar 2016 21:02:59 -0500 Subject: [PATCH] Fix various overlooked causes of warnings. GCC5 now produces under 300 lines of warnings, but the remaining ones will require more complex solutions. --- arogue5/rogue.h | 1 + rogue4/state.c | 5 ++++- srogue/rogue.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arogue5/rogue.h b/arogue5/rogue.h index 9be0567..38ae143 100644 --- a/arogue5/rogue.h +++ b/arogue5/rogue.h @@ -1165,6 +1165,7 @@ void use_mm(int which); char *vowelstr(char *str); void wait_for(WINDOW *win, char ch); struct linked_list *wake_monster(int y, int x); +void wanderer(void); void waste_time(void); char *weap_name(struct object *obj); void wear(void); diff --git a/rogue4/state.c b/rogue4/state.c index 07f10fd..13e95c3 100644 --- a/rogue4/state.c +++ b/rogue4/state.c @@ -70,6 +70,9 @@ #define READSTAT ((format_error == 0) && (read_error == 0)) #define WRITESTAT (write_error == 0) +int rs_write_int(FILE *savef, int c); +int rs_read_int(int inf, int *i); + int read_error = FALSE; int write_error = FALSE; int format_error = FALSE; @@ -1533,7 +1536,7 @@ rs_write_thing(FILE *savef, THING *t) return(WRITESTAT); } -int +void rs_fix_thing(THING *t) { THING *item; diff --git a/srogue/rogue.h b/srogue/rogue.h index 9c5adec..a003572 100644 --- a/srogue/rogue.h +++ b/srogue/rogue.h @@ -565,7 +565,7 @@ struct monlev { struct linked_list { struct linked_list *l_next; struct linked_list *l_prev; - char *l_data; /* Various structure pointers */ + void *l_data; /* Various structure pointers */ };