Mercurial > hg > early-roguelike

diff xrogue/fight.c @ 238:e1cd27c5464f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7c1cb43f346e
children e52a8a7ad4c5
line wrap: on
line diff
--- a/xrogue/fight.c	Tue Mar 08 20:47:57 2016 -0500
+++ b/xrogue/fight.c	Fri Mar 11 17:40:00 2016 -0500
@@ -966,7 +966,6 @@
     register struct linked_list *pitem, *nexti, *mitem;
     char *monst;
     int adj;    /* used for hit point adj. below. */
-    long temp;
 
     tp = THINGPTR(item);
 
@@ -1029,8 +1028,7 @@
                 if (roll(1,100) < killed_chance) {
             msg("You had a feeling this was going to happen... ");
                     msg("**POOF**  ");
-                    temp = C_ASSASSIN;  /* make him pay */
-                    changeclass(&temp);
+                    changeclass(C_ASSASSIN);  /* make him pay */
                 }
                 else {
                     switch (rnd(9)) {