Mercurial > hg > early-roguelike
view rogue5/rings.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 | f502bf60e6e4 |
children |
line wrap: on
line source
/* * Routines dealing specifically with rings * * @(#)rings.c 4.19 (Berkeley) 05/29/83 * * 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 <curses.h> #include "rogue.h" /* * ring_on: * Put a ring on a hand */ void ring_on(void) { THING *obj; int ring; obj = get_item("put on", RING); /* * Make certain that it is somethings that we want to wear */ if (obj == NULL) return; if (obj->o_type != RING) { if (!terse) msg("it would be difficult to wrap that around a finger"); else msg("not a ring"); return; } /* * find out which hand to put it on */ if (is_current(obj)) return; if (cur_ring[LEFT] == NULL && cur_ring[RIGHT] == NULL) { if ((ring = gethand()) < 0) return; } else if (cur_ring[LEFT] == NULL) ring = LEFT; else if (cur_ring[RIGHT] == NULL) ring = RIGHT; else { if (!terse) msg("you already have a ring on each hand"); else msg("wearing two"); return; } cur_ring[ring] = obj; /* * Calculate the effect it has on the poor guy. */ switch (obj->o_which) { case R_ADDSTR: chg_str(obj->o_arm); break; case R_SEEINVIS: invis_on(); break; case R_AGGR: aggravate(); break; } if (!terse) addmsg("you are now wearing "); msg("%s (%c)", inv_name(obj, TRUE), obj->o_packch); } /* * ring_off: * take off a ring */ void ring_off(void) { int ring; THING *obj; if (cur_ring[LEFT] == NULL && cur_ring[RIGHT] == NULL) { if (terse) msg("no rings"); else msg("you aren't wearing any rings"); return; } else if (cur_ring[LEFT] == NULL) ring = RIGHT; else if (cur_ring[RIGHT] == NULL) ring = LEFT; else if ((ring = gethand()) < 0) return; mpos = 0; obj = cur_ring[ring]; if (obj == NULL) { msg("not wearing such a ring"); return; } if (dropcheck(obj)) msg("was wearing %s(%c)", inv_name(obj, TRUE), obj->o_packch); } /* * gethand: * Which hand is the hero interested in? */ int gethand(void) { int c; for (;;) { if (terse) msg("left or right ring? "); else msg("left hand or right hand? "); if ((c = readchar()) == ESCAPE) return -1; mpos = 0; if (c == 'l' || c == 'L') return LEFT; else if (c == 'r' || c == 'R') return RIGHT; if (terse) msg("L or R"); else msg("please type L or R"); } } /* * ring_eat: * How much food does this ring use up? */ int ring_eat(int hand) { THING *ring; int eat; int uses[] = { 1, /* R_PROTECT */ 1, /* R_ADDSTR */ 1, /* R_SUSTSTR */ -3, /* R_SEARCH */ -5, /* R_SEEINVIS */ 0, /* R_NOP */ 0, /* R_AGGR */ -3, /* R_ADDHIT */ -3, /* R_ADDDAM */ 2, /* R_REGEN */ -2, /* R_DIGEST */ 0, /* R_TELEPORT */ 1, /* R_STEALTH */ 1 /* R_SUSTARM */ }; if ((ring = cur_ring[hand]) == NULL) return 0; if ((eat = uses[ring->o_which]) < 0) eat = (rnd(-eat) == 0); if (ring->o_which == R_DIGEST) eat = -eat; return eat; } /* * ring_num: * Print ring bonuses */ const char * ring_num(const THING *obj) { static char buf[10]; if (!(obj->o_flags & ISKNOW)) return ""; switch (obj->o_which) { case R_PROTECT: case R_ADDSTR: case R_ADDDAM: case R_ADDHIT: sprintf(buf, " [%s]", num(obj->o_arm, 0, RING)); otherwise: return ""; } return buf; }