Mercurial > hg > early-roguelike
diff rogue4/rogue.h @ 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 | 2dcf10d45d5b |
| children | d3968e9cb98d |
line wrap: on
line diff
--- a/rogue4/rogue.h Tue Mar 08 19:45:41 2016 -0500 +++ b/rogue4/rogue.h Fri Mar 11 19:47:52 2016 -0500 @@ -324,7 +324,7 @@ struct delayed_action { int d_type; - int (*d_func)(); + void (*d_func)(); int d_arg; int d_time; }; @@ -484,6 +484,7 @@ void _detach(THING **list, THING *item); void _free_list(THING **ptr); bool add_haste(bool potion); +void add_line(char *fmt, char *arg); void add_pack(THING *obj, bool silent); void add_str(str_t *sp, int amt); void addmsg(char *fmt, ...); @@ -515,9 +516,10 @@ void eat(void); int encread(void *starta, int size, int inf); void encwrite(void *starta, int size, FILE *outf); +void end_line(void); void endmsg(void); void enter_room(coord *cp); -void extinguish(int (*func)()); +void extinguish(void (*func)()); void fall(THING *obj, bool pr); bool fallpos(coord *pos, coord *newpos, bool pass); void fatal(char *s); @@ -526,7 +528,7 @@ void fire_bolt(coord *start, coord *dir, char *name); void fix_stick(THING *cur); void flush_type(void); -void fuse(int (*func)(), int arg, int time, int type); +void fuse(void (*func)(), int arg, int time, int type); void genocide(void); bool get_dir(void); THING *get_item(char *purpose, int type); @@ -547,11 +549,11 @@ bool is_current(THING *obj); bool is_magic(THING *obj); bool issymlink(char *sp); -void kill_daemon(int (*func)()); +void kill_daemon(void (*func)()); void killed(THING *tp, bool pr); void leave(int sig); void leave_room(coord *cp); -void lengthen(int (*func)(), int xtime); +void lengthen(void (*func)(), int xtime); bool lock_sc(void); void look(bool wakeup); void missile(int ydelta, int xdelta); @@ -601,7 +603,7 @@ void show_win(WINDOW *scr, char *message); void sight(void); int sign(int nm); -void start_daemon(int (*func)(), int arg, int type); +void start_daemon(void (*func)(), int arg, int type); void start_score(void); void status(void); bool step_ok(char ch); @@ -619,7 +621,7 @@ char *unctrol(char ch); void unlock_sc(void); void unsee(void); -char *vowelstr(char *str); +char *vowelstr(const char *str); char *xcrypt(const char *key, const char *setting); void w_wait_for(WINDOW *win, char ch); void wait_for(char ch);