Mercurial > hg > early-roguelike
diff xrogue/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 | f54901b9c39b |
| children | 7c1cb43f346e |
line wrap: on
line diff
--- a/xrogue/rogue.h Sat Mar 05 12:10:20 2016 -0500 +++ b/xrogue/rogue.h Sat Mar 05 20:49:37 2016 -0500 @@ -933,7 +933,7 @@ struct delayed_action { int d_type; - int (*d_func)(); + void (*d_func)(); union { VOID *vp; int i; @@ -1258,7 +1258,7 @@ void check_residue(struct thing *tp); void chg_str(int amt); void choose_qst(void); -int cloak_charge(struct object *obj); +void cloak_charge(struct object *obj); void command(void); void confus_player(void); int const_bonus(void); @@ -1310,19 +1310,19 @@ void endmsg(void); void exit_game(int flag); void explode(struct thing *tp); -void extinguish(int (*dfunc)()); +void extinguish(void (*dfunc)()); void fall(struct linked_list *item, bool pr); coord *fallpos(coord *pos, bool be_clear, int range); void fatal(char *s); bool fight(coord *mp, struct object *weap, bool thrown); struct linked_list *find_mons(int y, int x); struct linked_list *find_obj(int y, int x); -struct delayed_action *find_slot(int (*func)()); +struct delayed_action *find_slot(void (*func)()); int findmindex(char *name); void fix_stick(struct object *cur); void fright(struct thing *th); void fumble(void); -void fuse(int (*dfunc)(), VOID *arg, int time, int type); +void fuse(void (*dfunc)(), VOID *arg, int time, int type); void genmonsters(int least, bool treas); coord get_coordinates(void); bool get_dir(coord *direction); @@ -1359,10 +1359,10 @@ bool is_magic(struct object *obj); bool isatrap(char ch); int itemweight(struct object *wh); -void kill_daemon(int (*dfunc)()); +void kill_daemon(void (*dfunc)()); void killed(struct linked_list *item, bool pr, bool points, bool treasure); -int land(void); -void lengthen(int (*dfunc)(), int xtime); +void land(void); +void lengthen(void (*dfunc)(), int xtime); void light(coord *cp); bool lit_room(struct room *rp); void look(bool wakeup, bool runend); @@ -1415,7 +1415,7 @@ short randmonster(bool wander, bool no_unique); void read_scroll(int which, int flag, bool is_scroll); void reap(void); -int res_strength(long howmuch); +void res_strength(long howmuch); bool restore(char *file, char *envp[]); void restscr(WINDOW *scr); int ring_eat(int hand); @@ -1452,7 +1452,7 @@ bool thrown); struct linked_list *spec_item(int type, int which, int hit, int damage); void spell_recovery(void); -void start_daemon(int (*dfunc)(), VOID *arg, int type); +void start_daemon(void (*dfunc)(), VOID *arg, int type); void status(bool display); void steal(void); bool step_ok(int y, int x, int can_on_monst, struct thing *flgptr); @@ -1475,7 +1475,7 @@ void unchoke(void); void unclrhead(void); void unconfuse(void); -int undance(void); +void undance(void); void unphase(void); void unsee(void); void unskill(void); @@ -1648,7 +1648,6 @@ extern FILE *logfile; extern LEVTYPE levtype; extern int (*add_abil[NUMABILITIES])(int); /* Functions to change abilities */ -extern int (*res_abil[NUMABILITIES])(); /* Functions to change abilities */ extern int mf_count; /* move_free counter - see actions.c(m_act()) */ extern int mf_jmpcnt; /* move_free counter for # of jumps */ extern int killed_chance; /* cumulative chance for goodies to loose it, fight.c */