Mercurial > hg > early-roguelike
view rogue3/armor.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
/* * This file contains misc functions for dealing with armor * @(#)armor.c 3.9 (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" /* * wear: * The player wants to wear something, so let him/her put it on. */ void wear() { register struct linked_list *item; register struct object *obj; if (cur_armor != NULL) { addmsg("You are already wearing some"); if (!terse) addmsg(". You'll have to take it off first"); endmsg(); after = FALSE; return; } if ((item = get_item("wear", ARMOR)) == NULL) return; obj = (struct object *) ldata(item); if (obj->o_type != ARMOR) { msg("You can't wear that."); return; } waste_time(); if (!terse) addmsg("You are now w"); else addmsg("W"); msg("earing %s.", a_names[obj->o_which]); cur_armor = obj; obj->o_flags |= ISKNOW; } /* * take_off: * Get the armor off of the players back */ void take_off() { register struct object *obj; if ((obj = cur_armor) == NULL) { if (terse) msg("Not wearing armor"); else msg("You aren't wearing any armor"); return; } if (!dropcheck(cur_armor)) return; cur_armor = NULL; if (terse) addmsg("Was"); else addmsg("You used to be "); msg(" wearing %c) %s", pack_char(obj), inv_name(obj, TRUE)); } /* * waste_time: * Do nothing but let other things happen */ void waste_time() { do_daemons(BEFORE); do_fuses(BEFORE); do_daemons(AFTER); do_fuses(AFTER); }