Mercurial > hg > early-roguelike
diff arogue7/rogue.h @ 238:e1cd27c5464f
arogue7, xrogue: improve the handling of the arguments to fuses.
fuse() now expects a pointer as the argument to a fuse function. If
this is one of the functions that takes int, fuse() follows the pointer
and stores that value in the f_list slot, in the integer field of the
argument union. When the fuse goes off, do_fuses() recognizes the
function and passes it the integer field instead of the pointer.
This has the disadvantage of hard-coding the functions that require int
in daemon.c, but since the int is copied into f_list, it no longer has
to be in static or global memory, which simplifies several files.
| author | John "Elwin" Edwards |
|---|---|
| date | Fri, 11 Mar 2016 17:40:00 -0500 |
| parents | b67b99f6c92b |
| children | 3d4252fa2ed3 |
line wrap: on
line diff
--- a/arogue7/rogue.h Tue Mar 08 20:47:57 2016 -0500 +++ b/arogue7/rogue.h Fri Mar 11 17:40:00 2016 -0500 @@ -1223,7 +1223,7 @@ int findmindex(char *name); void fix_stick(struct object *cur); void fumble(void); -void fuse(void (*func)(), int arg, int time, int type); +void fuse(void (*func)(), void *arg, int time, int type); void genmonsters(int least, bool treas); coord get_coordinates(void); bool get_dir(coord *direction); @@ -1357,7 +1357,7 @@ bool thrown); struct linked_list *spec_item(int type, int which, int hit, int damage); void spell_recovery(void); -void start_daemon(void (*func)(), int arg, int type); +void start_daemon(void (*func)(), 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);