Mercurial > hg > early-roguelike
view rogue3/daemon.c @ 111:7f8f43943b1f
Fix some terribly depressing corruption during restore.
In rogue5/state.c, rs_read_daemons() zeroes out the argument and delay
if the daemon slot is empty. Unfortunately that code ended up on the
wrong side of the brace that closes the for loop, so instead of running
after each daemon, it got run once after the loop exited, when the
index was of course out of bounds.
This tended to manifest, when compiled with -O2, by overwriting hw and
setting it to NULL. When inventory() next ran, hw would be passed to
wgetch(), which returns ERR when it gets a NULL argument. This made
md_readchar() think something was wrong and autosave the game.
Upon investigation, rogue3 was found to commit the same mistake.
rogue4 and srogue don't zero the data. arogue5 already does it
properly.
Someday I am going to run all this through Valgrind. Someday when I
am a kinder person who will not be driven to invoke hordes of trolls
and centaurs upon the original authors.
author | John "Elwin" Edwards |
---|---|
date | Wed, 08 Jan 2014 16:44:16 -0500 |
parents | 527e2150eaf0 |
children |
line wrap: on
line source
/* * Contains functions for dealing with things that happen in the * future. * * @(#)daemon.c 3.3 (Berkeley) 6/15/81 * * Rogue: Exploring the Dungeons of Doom * Copyright (C) 1980, 1981 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 EMPTY 0 #define DAEMON -1 #define MAXDAEMONS 20 #define _X_ { EMPTY } struct delayed_action d_list[MAXDAEMONS] = { _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, }; /* * d_slot: * Find an empty slot in the daemon/fuse list */ struct delayed_action * d_slot() { register int i; register struct delayed_action *dev; for (i = 0, dev = d_list; i < MAXDAEMONS; i++, dev++) if (dev->d_type == EMPTY) return dev; debug("Ran out of fuse slots"); return NULL; } /* * find_slot: * Find a particular slot in the table */ struct delayed_action * find_slot(void (*func)()) { register int i; register struct delayed_action *dev; for (i = 0, dev = d_list; i < MAXDAEMONS; i++, dev++) if (dev->d_type != EMPTY && func == dev->d_func) return dev; return NULL; } /* * daemon: * Start a daemon, takes a function. */ void start_daemon(void (*func)(), int arg, int type) { register struct delayed_action *dev; dev = d_slot(); if (dev != NULL) { 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)()) { register 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) { register 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) { register struct delayed_action *wire; wire = d_slot(); if (wire != NULL) { 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) { register struct delayed_action *wire; if ((wire = find_slot(func)) == NULL) return; wire->d_time += xtime; } /* * extinguish: * Put out a fuse */ void extinguish(void (*func)()) { register 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) { register 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); } } }