Mercurial > hg > early-roguelike
view rogue5/list.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
/* * Functions for dealing with linked lists of goodies * * @(#)list.c 4.12 (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 <stdlib.h> #include <curses.h> #include "rogue.h" #ifdef MASTER int total = 0; /* total dynamic memory bytes */ #endif /* * detach: * takes an item out of whatever linked list it might be in */ void _detach(THING **list, THING *item) { if (*list == item) *list = next(item); if (prev(item) != NULL) item->l_prev->l_next = next(item); if (next(item) != NULL) item->l_next->l_prev = prev(item); item->l_next = NULL; item->l_prev = NULL; } /* * _attach: * add an item to the head of a list */ void _attach(THING **list, THING *item) { if (*list != NULL) { item->l_next = *list; (*list)->l_prev = item; item->l_prev = NULL; } else { item->l_next = NULL; item->l_prev = NULL; } *list = item; } /* * _free_list: * Throw the whole blamed thing away */ void _free_list(THING **ptr) { THING *item; while (*ptr != NULL) { item = *ptr; *ptr = next(item); discard(item); } } /* * discard: * Free up an item */ void discard(THING *item) { #ifdef MASTER total--; #endif free(item); } /* * new_item * Get a new item with a specified size */ THING * new_item(void) { THING *item; if ((item = calloc(1, sizeof *item)) == NULL) { #ifdef MASTER msg("ran out of memory after %d items", total); #endif return NULL; } #ifdef MASTER total++; #endif item->l_next = NULL; item->l_prev = NULL; return item; }