Mercurial > hg > early-roguelike
view srogue/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 | 2128c7dc8a40 |
children | d6b7c3fb37ea |
line wrap: on
line source
/* * Functions for dealing with linked lists of goodies * * @(#)list.c 9.0 (rdk) 7/17/84 * * Super-Rogue * Copyright (C) 1984 Robert D. Kindelberger * 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 <stdlib.h> #include "rogue.h" #include "rogue.ext" /* * detach: * Takes an item out of whatever linked list it might be in */ _detach(list, item) struct linked_list **list, *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 */ _attach(list, item) struct linked_list **list, *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 */ _free_list(ptr) struct linked_list **ptr; { register struct linked_list *item; while (*ptr != NULL) { item = *ptr; *ptr = next(item); discard(item); } } /* * discard: free up an item */ discard(item) struct linked_list *item; { total -= 2; FREE(item->l_data); FREE(item); } /* * new_item: get a new item with a specified size */ struct linked_list * new_item(size) int size; { register struct linked_list *item; item = (struct linked_list *) new(sizeof *item); item->l_data = new(size); item->l_next = item->l_prev = NULL; return item; } char * new(size) int size; { register char *space = ALLOC(size); if (space == NULL) { sprintf(prbuf,"Rogue ran out of memory (%d).",sbrk(0)); fatal(prbuf); } total++; return space; }