Mercurial > hg > early-roguelike
diff arogue7/sticks.c @ 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 | f9ef86cf22b2 |
| children | e52a8a7ad4c5 |
line wrap: on
line diff
--- a/arogue7/sticks.c Tue Mar 08 20:47:57 2016 -0500 +++ b/arogue7/sticks.c Fri Mar 11 17:40:00 2016 -0500 @@ -590,7 +590,7 @@ turn_on(player, HASDISEASE); turn_on(player, HASINFEST); turn_on(player, DOROT); - fuse(cure_disease, 0, roll(HEALTIME,SICKTIME), AFTER); + fuse(cure_disease, NULL, roll(HEALTIME,SICKTIME), AFTER); infest_dam++; } else msg("You fell momentarily sick"); @@ -1188,7 +1188,7 @@ rnd(20)+HUHDURATION); else { turn_on(player, ISHUH); - fuse(unconfuse, 0, + fuse(unconfuse, NULL, rnd(20)+HUHDURATION, AFTER); msg( "The confusion gas has confused you.");