Mercurial > hg > early-roguelike
diff srogue/rogue.ext @ 239:837044d2c362
Merge the GCC5 and build fix branches.
This fixes all warnings produced by GCC 5, except the ones related to
system functions. Those could be fixed by including the proper headers,
but it would be better to replace the system-dependent code with
functions from mdport.c.
| author | John "Elwin" Edwards |
|---|---|
| date | Fri, 11 Mar 2016 19:47:52 -0500 |
| parents | b67b99f6c92b |
| children | d3968e9cb98d |
line wrap: on
line diff
--- a/srogue/rogue.ext Tue Mar 08 19:45:41 2016 -0500 +++ b/srogue/rogue.ext Fri Mar 11 19:47:52 2016 -0500 @@ -96,7 +96,7 @@ void encwrite(void *starta, unsigned int size, FILE *outf); void endit(int a); void endmsg(void); -void extinguish(int (*func)()); +void extinguish(void (*func)()); int extras(void); void fall(struct linked_list *item, bool pr); bool fallpos(struct coord *pos, struct coord *newpos, bool passages); @@ -105,7 +105,7 @@ struct linked_list *find_mons(int y, int x); struct linked_list *find_obj(int y, int x); void fix_stick(struct object *cur); -void fuse(int (*func)(), int arg, int time); +void fuse(void (*func)(), int arg, int time); void game_err(int a); void genocide(void); bool get_dir(void); @@ -140,7 +140,7 @@ bool isring(int hand, int ring); bool iswearing(int ring); void killed(struct linked_list *item, bool pr); -void lengthen(int (*func)(), int xtime); +void lengthen(void (*func)(), int xtime); void lev_mon(void); void light(struct coord *cp); void look(bool wakeup); @@ -215,7 +215,7 @@ char show(int y, int x); bool showtop(int showname); void sight(int fromfuse); -void start_daemon(int (*func)(), int arg, int type); +void start_daemon(void (*func)(), int arg, int type); void status(int fromfuse); bool step_ok(unsigned char ch); void stomach(int fromfuse);