Early Roguelike Collection: srogue/things.c annotate

annotate srogue/things.c @ 162:600873555ec0

Don't swap signal handlers in md_shellescape(). md_shellescape() sets SIGINT and SIGQUIT to be ignored, storing the previous handlers, and restores them after the shell exits. But it mixed up the two handlers. Since the signals were usually handled by the same function, this fix doesn't have much effect, but anything that makes signal code less confusing is a good thing.

author	John "Elwin" Edwards
date	Mon, 08 Jun 2015 10:01:25 -0400
parents	3aa87373c908
children	94a0d9dd5ce1

rev	line source
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	1 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	2 * Contains functions for dealing with things like
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	3 * potions and scrolls
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	4 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	5 * @(#)things.c 9.0 (rdk) 7/17/84
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	6 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	7 * Super-Rogue
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	8 * Copyright (C) 1984 Robert D. Kindelberger
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	9 * All rights reserved.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	10 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	11 * Based on "Rogue: Exploring the Dungeons of Doom"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	12 * Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	13 * All rights reserved.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	14 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	15 * See the file LICENSE.TXT for full copyright and licensing information.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	16 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	17
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	18 #include <ctype.h>
60 3aa87373c908 srogue: include missing headers. elwin parents: 40 diff changeset	19 #include <string.h>
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	20 #include "rogue.h"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	21 #include "rogue.ext"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	22
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	23
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	24 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	25 * inv_name:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	26 * Return the name of something as it would appear in an inventory.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	27 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	28 char *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	29 inv_name(obj, drop)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	30 struct object *obj;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	31 bool drop;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	32 {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	33 reg char pb, tn, *pl;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	34 reg int wh, knowit;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	35 char nm[3], inm, q;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	36
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	37 wh = obj->o_which;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	38 knowit = FALSE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	39 if (obj->o_count > 1)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	40 pl = "s";
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	41 else
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	42 pl = "";
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	43 if (obj->o_count > 1)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	44 sprintf(nm, "%d", obj->o_count);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	45 else
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	46 strcpy(nm, "A");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	47 tn = obj->o_typname;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	48 q = "";
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	49 switch(obj->o_type) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	50 case SCROLL:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	51 sprintf(prbuf, "%s %s%s ", nm, tn, pl);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	52 pb = &prbuf[strlen(prbuf)];
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	53 if (s_know[wh] \|\| o_on(obj,ISPOST)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	54 knowit = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	55 sprintf(pb, "of %s", s_magic[wh].mi_name);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	56 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	57 else if (s_guess[wh])
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	58 sprintf(pb, "called %s", s_guess[wh]);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	59 else
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	60 sprintf(pb, "titled '%s'", s_names[wh]);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	61 when POTION:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	62 sprintf(prbuf, "%s %s%s ", nm, tn, pl);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	63 pb = &prbuf[strlen(prbuf)];
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	64 if (p_know[wh] \|\| o_on(obj, ISPOST)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	65 sprintf(pb, "of %s", p_magic[wh].mi_name);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	66 knowit = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	67 if (p_know[wh]) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	68 pb = &prbuf[strlen(prbuf)];
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	69 sprintf(pb,"(%s)",p_colors[wh]);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	70 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	71 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	72 else if (p_guess[wh])
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	73 sprintf(pb,"called %s(%s)", p_guess[wh],p_colors[wh]);
40 984f7d5afb6f srogue: fix '2n orange potions' description bug. elwin parents: 36 diff changeset	74 else if (obj->o_count == 1)
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	75 sprintf(prbuf,"%s%s %s %s%s", nm, vowelstr(p_colors[wh]),
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	76 p_colors[wh], tn, pl);
40 984f7d5afb6f srogue: fix '2n orange potions' description bug. elwin parents: 36 diff changeset	77 else
984f7d5afb6f srogue: fix '2n orange potions' description bug. elwin parents: 36 diff changeset	78 sprintf(prbuf,"%s %s %s%s", nm, p_colors[wh], tn, pl);
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	79 when FOOD:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	80 if (wh == 1) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	81 if (obj->o_count == 1)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	82 q = vowelstr(fruit);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	83 sprintf(prbuf, "%s%s %s%s", nm, q, fruit, pl);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	84 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	85 else {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	86 if (obj->o_count == 1)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	87 sprintf(prbuf, "Some %s", tn);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	88 else
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	89 sprintf(prbuf, "%s rations of %s", nm, tn);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	90 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	91 knowit = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	92 when WEAPON:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	93 inm = w_magic[wh].mi_name;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	94 strcpy(prbuf, nm);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	95 if (obj->o_count == 1)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	96 q = vowelstr(inm);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	97 pb = &prbuf[strlen(prbuf)];
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	98 if (o_on(obj,ISKNOW \| ISPOST)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	99 knowit = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	100 sprintf(pb, " %s %s", num(obj->o_hplus, obj->o_dplus), inm);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	101 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	102 else
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	103 sprintf(pb, "%s %s", q, inm);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	104 strcat(prbuf, pl);
2128c7dc8a40

Mercurial > hg > early-roguelike

annotate srogue/things.c @ 162:600873555ec0