Early Roguelike Collection: xrogue/potions.c annotate

annotate xrogue/potions.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	ce0cf824c192
children	f54901b9c39b

rev	line source
133 e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	2 potions.c - Functions for dealing with potions
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	3
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	4 XRogue: Expeditions into the Dungeons of Doom
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	5 Copyright (C) 1991 Robert Pietkivitch
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	6 All rights reserved.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	7
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	8 Based on "Advanced Rogue"
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	9 Copyright (C) 1984, 1985 Michael Morgan, Ken Dalka and AT&T
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	10 All rights reserved.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	11
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	12 Based on "Rogue: Exploring the Dungeons of Doom"
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	13 Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	14 All rights reserved.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	15
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	16 See the file LICENSE.TXT for full copyright and licensing information.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	17 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	18
135 ce0cf824c192 xrogue: add missing includes. John "Elwin" Edwards parents: 133 diff changeset	19 #include <stdlib.h>
133 e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20 #include <curses.h>
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	21 #include "rogue.h"
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	22
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24 * add_abil is an array of functions used to change attributes. It must be
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25 * ordered according to the attribute definitions in rogue.h.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28 int (*add_abil[NUMABILITIES])() = {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29 add_intelligence, add_strength, add_wisdom, add_dexterity,
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30 add_constitution, add_charisma
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	31 };
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	33 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34 * res_abil is an array of functions used to change attributes. It must be
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35 * ordered according to the attribute definitions in rogue.h.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	36 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	37
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38 int (*res_abil[NUMABILITIES])() = {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39 res_intelligence, res_strength, res_wisdom, res_dexterity,
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 res_constitution, res_charisma
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41 };
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	42
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	44 * Increase player's constitution
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	47 int
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	48 add_constitution(change)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49 int change;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	50 {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	51 /* Do the potion */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 if (change < 0) {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53 msg("You feel less healthy now.");
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 pstats.s_const += change;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55 if (pstats.s_const < 1) {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 pstats.s_hpt = -1;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 msg("You collapse! --More--");
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58 wait_for(' ');
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 death(D_CONSTITUTION);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60 }
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	61 }
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62 else {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 msg("You feel healthier now.");
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	64 pstats.s_const = min(pstats.s_const + change, MAXATT);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	65 }
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67 /* Adjust the maximum */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68 if (max_stats.s_const < pstats.s_const)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69 max_stats.s_const = pstats.s_const;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	70
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	71 return(0);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 }
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 * Increase player's charisma
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	77
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	78 int
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 add_charisma(change)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 int change;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81 {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82 /* Do the potion */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 if (change < 0) msg("You feel less attractive now.");
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 else msg("You feel more attractive now.");
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 pstats.s_charisma += change;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	87 if (pstats.s_charisma > MAXATT) pstats.s_charisma = MAXATT;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	88 else if (pstats.s_charisma < 3) pstats.s_charisma = 3;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 /* Adjust the maximum */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91 if (max_stats.s_charisma < pstats.s_charisma)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	92 max_stats.s_charisma = pstats.s_charisma;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards

Mercurial > hg > early-roguelike

annotate xrogue/potions.c @ 162:600873555ec0