Mercurial > hg > early-roguelike
view rogue5/daemon.c @ 114:a5433ba4cabf
arogue5: fix some daemon-related pointer/int casting.
Daemons and fuses take a single argument, nominally an int but either
ignored or unsafely cast to a pointer. Its type has now been changed
to void*.
The save/restore code no longer tries to store this argument in the
savefile. For doctor(), this is not a problem, because player is the
only argument it is ever given as a daemon. However, alchemy() will
fail to do anything when passed NULL. Fixing this would be complicated
but possible.
Summary: the code is slightly safer, but alchemy jugs are guaranteed to
stop working after save and restore, instead of just extremely likely.
author | John "Elwin" Edwards |
---|---|
date | Fri, 28 Mar 2014 10:57:03 -0700 |
parents | f502bf60e6e4 |
children |
line wrap: on
line source
/* * Contains functions for dealing with things that happen in the * future. * * @(#)daemon.c 4.7 (Berkeley) 02/05/99 * * Rogue: Exploring the Dungeons of Doom * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman * All rights reserved. * * See the file LICENSE.TXT for full copyright and licensing information. */ #include <curses.h> #include "rogue.h" #define DAEMON -1 /* * d_slot: * Find an empty slot in the daemon/fuse list */ struct delayed_action * d_slot(void) { struct delayed_action *dev; for (dev = d_list; dev <= &d_list[MAXDAEMONS-1]; dev++) if (dev->d_type == EMPTY) return dev; #ifdef MASTER debug("Ran out of fuse slots"); #endif return NULL; } /* * find_slot: * Find a particular slot in the table */ struct delayed_action * find_slot(void (*func)()) { struct delayed_action *dev; for (dev = d_list; dev <= &d_list[MAXDAEMONS-1]; dev++) if (dev->d_type != EMPTY && func == dev->d_func) return dev; return NULL; } /* * start_daemon: * Start a daemon, takes a function. */ void start_daemon(void (*func)(), int arg, int type) { struct delayed_action *dev; dev = d_slot(); dev->d_type = type; dev->d_func = func; dev->d_arg = arg; dev->d_time = DAEMON; } /* * kill_daemon: * Remove a daemon from the list */ void kill_daemon(void (*func)()) { struct delayed_action *dev; if ((dev = find_slot(func)) == NULL) return; /* * Take it out of the list */ dev->d_type = EMPTY; } /* * do_daemons: * Run all the daemons that are active with the current flag, * passing the argument to the function. */ void do_daemons(int flag) { struct delayed_action *dev; /* * Loop through the devil list */ for (dev = d_list; dev <= &d_list[MAXDAEMONS-1]; dev++) /* * Executing each one, giving it the proper arguments */ if (dev->d_type == flag && dev->d_time == DAEMON) (*dev->d_func)(dev->d_arg); } /* * fuse: * Start a fuse to go off in a certain number of turns */ void fuse(void (*func)(), int arg, int time, int type) { struct delayed_action *wire; wire = d_slot(); wire->d_type = type; wire->d_func = func; wire->d_arg = arg; wire->d_time = time; } /* * lengthen: * Increase the time until a fuse goes off */ void lengthen(void (*func)(), int xtime) { struct delayed_action *wire; if ((wire = find_slot(func)) == NULL) return; wire->d_time += xtime; } /* * extinguish: * Put out a fuse */ void extinguish(void (*func)()) { struct delayed_action *wire; if ((wire = find_slot(func)) == NULL) return; wire->d_type = EMPTY; } /* * do_fuses: * Decrement counters and start needed fuses */ void do_fuses(int flag) { struct delayed_action *wire; /* * Step though the list */ for (wire = d_list; wire <= &d_list[MAXDAEMONS-1]; wire++) /* * Decrementing counters and starting things we want. We also need * to remove the fuse from the list once it has gone off. */ if (flag == wire->d_type && wire->d_time > 0 && --wire->d_time == 0) { wire->d_type = EMPTY; (*wire->d_func)(wire->d_arg); } }