Mercurial > hg > early-roguelike
diff arogue7/monsters.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 | 28e22fb35989 |
line wrap: on
line diff
--- a/arogue7/monsters.c Tue Mar 08 20:47:57 2016 -0500 +++ b/arogue7/monsters.c Fri Mar 11 17:40:00 2016 -0500 @@ -649,7 +649,7 @@ if (find_slot(unconfuse)) lengthen(unconfuse, HUHDURATION); else { - fuse(unconfuse, 0, HUHDURATION, AFTER); + fuse(unconfuse, NULL, HUHDURATION, AFTER); msg("%s's gaze has confused you.",prname(mname, TRUE)); turn_on(player, ISHUH); } @@ -691,7 +691,7 @@ if (!save(VS_WAND, &player, 0)) { msg("The gaze of %s blinds you", prname(mname, FALSE)); turn_on(player, ISBLIND); - fuse(sight, 0, rnd(30)+20, AFTER); + fuse(sight, NULL, rnd(30)+20, AFTER); light(&hero); } }