Mercurial > hg > early-roguelike
view arogue5/daemon.c @ 254:e940e6c00751
Add some braces to a loop in parse_opts().
A for loop had no braces around its body, which was a single if-else
statement. In Advanced Rogue 5, another statement had been added,
accidentally removing the if-else from the loop. This could have
resulted in an out-of-bounds access to the options array.
In the other games, the added braces are only for clarity.
author | John "Elwin" Edwards |
---|---|
date | Fri, 10 Feb 2017 09:02:58 -0500 |
parents | b67b99f6c92b |
children | 0250220d8cdd |
line wrap: on
line source
/* * Contains functions for dealing with things that happen in the future. * * Advanced Rogue * Copyright (C) 1984, 1985 Michael Morgan, Ken Dalka and AT&T * All rights reserved. * * Based on "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 _X_ { EMPTY } struct delayed_action d_list[MAXDAEMONS] = { _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_ }; struct delayed_action f_list[MAXFUSES] = { _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_ }; int demoncnt = 0; /* number of active daemons */ int fusecnt = 0; /* * d_slot: * Find an empty slot in the daemon list */ struct delayed_action * d_slot(void) { reg int i; reg struct delayed_action *dev; for (i = 0, dev = d_list; i < MAXDAEMONS; i++, dev++) if (dev->d_type == EMPTY) return dev; return NULL; } /* * f_slot: * Find an empty slot in the fuses list */ struct delayed_action * f_slot(void) { reg int i; reg struct delayed_action *dev; for (i = 0, dev = f_list; i < MAXFUSES; i++, dev++) if (dev->d_type == EMPTY) return dev; return NULL; } /* * find_slot: * Find a particular slot in the table */ struct delayed_action * find_slot(void (*func)()) { reg int i; reg struct delayed_action *dev; for (i = 0, dev = f_list; i < MAXFUSES; i++, 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)(), void *arg, int type) { reg 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; demoncnt += 1; /* update count */ } } /* * kill_daemon: * Remove a daemon from the list */ void kill_daemon(void (*func)()) { reg struct delayed_action *dev; reg int i; for (i = 0, dev = d_list; i < MAXDAEMONS; i++, dev++) { if (dev->d_type != EMPTY && func == dev->d_func) break; } if (i >= MAXDAEMONS) return; /* if not found, forget it */ /* * Take it out of the list */ dev->d_type = EMPTY; dev->d_arg = NULL; dev->d_func = NULL; dev->d_time = 0; demoncnt -= 1; /* update count */ } /* * do_daemons: * Run all the daemons that are active with the current flag, * passing the argument to the function. */ void do_daemons(int flag) { reg 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_func != NULL && 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)(), void *arg, int time, int type) { reg struct delayed_action *wire; wire = f_slot(); if (wire != NULL) { wire->d_type = type; wire->d_func = func; wire->d_arg = arg; wire->d_time = time; fusecnt += 1; /* update count */ } } /* * lengthen: * Increase the time until a fuse goes off */ void lengthen(void (*func)(), int xtime) { reg struct delayed_action *wire; if ((wire = find_slot(func)) == NULL) return; wire->d_time += xtime; } /* * extinguish: * Put out a fuse */ void extinguish(void (*func)()) { reg struct delayed_action *wire; if ((wire = find_slot(func)) == NULL) return; wire->d_type = EMPTY; wire->d_func = NULL; wire->d_arg = NULL; wire->d_time = 0; fusecnt -= 1; } /* * do_fuses: * Decrement counters and start needed fuses */ void do_fuses(int flag) { reg struct delayed_action *wire; /* * Step though the list */ for (wire = f_list; wire <= &f_list[MAXFUSES-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; if (wire->d_func != NULL) (*wire->d_func)(wire->d_arg); fusecnt -= 1; } } } /* * activity: * Show wizard number of demaons and memory blocks used */ void activity(void) { sprintf(outstring,"Daemons = %d : Fuses = %d : Memory Items = %d : Memory Used = %d", demoncnt,fusecnt,total,md_memused()); msg(outstring); }