comparison arogue7/fight.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
comparison
equal deleted inserted replaced
237:2236ef808bcb 238:e1cd27c5464f
536 if (!save(VS_MAGIC, &player, 0) && off(player, ISCLEAR)) { 536 if (!save(VS_MAGIC, &player, 0) && off(player, ISCLEAR)) {
537 msg("You feel disoriented."); 537 msg("You feel disoriented.");
538 if (find_slot(unconfuse)) 538 if (find_slot(unconfuse))
539 lengthen(unconfuse, HUHDURATION); 539 lengthen(unconfuse, HUHDURATION);
540 else 540 else
541 fuse(unconfuse, 0, HUHDURATION, AFTER); 541 fuse(unconfuse, NULL, HUHDURATION, AFTER);
542 turn_on(player, ISHUH); 542 turn_on(player, ISHUH);
543 } 543 }
544 else msg("You feel dizzy, but it quickly passes."); 544 else msg("You feel dizzy, but it quickly passes.");
545 } 545 }
546 /* Player or monster hits monster */ 546 /* Player or monster hits monster */