Mercurial > hg > early-roguelike
diff rogue4/rogue.h @ 228:b67b99f6c92b
Daemons and fuses now return void.
Functions for starting and stopping daemons and fuses now expect the
type 'void (*func)()'. Only a few functions in XRogue needed to be
modified to fit. Determining the type of the argument is left for a
later date.
Building with GCC5 should now produce less than 200 lines of warnings
per game.
| author | John "Elwin" Edwards |
|---|---|
| date | Sat, 05 Mar 2016 20:49:37 -0500 |
| parents | 696277507a2e |
| children | 0990adf580ee |
line wrap: on
line diff
--- a/rogue4/rogue.h Sat Mar 05 12:10:20 2016 -0500 +++ b/rogue4/rogue.h Sat Mar 05 20:49:37 2016 -0500 @@ -324,7 +324,7 @@ struct delayed_action { int d_type; - int (*d_func)(); + void (*d_func)(); int d_arg; int d_time; }; @@ -517,7 +517,7 @@ void encwrite(void *starta, int size, FILE *outf); 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 +526,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 +547,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 +601,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);