Early Roguelike Collection: srogue/fight.c annotate

annotate srogue/fight.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	2128c7dc8a40
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 * All the fighting gets done here
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	3 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	4 * @(#)fight.c 9.0 (rdk) 7/17/84
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	5 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	6 * Super-Rogue
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	7 * Copyright (C) 1984 Robert D. Kindelberger
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	8 * All rights reserved.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	9 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	10 * Based on "Rogue: Exploring the Dungeons of Doom"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	11 * 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	12 * All rights reserved.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	13 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	14 * 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	15 */
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 #include <ctype.h>
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	18 #include "rogue.h"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	19 #include "rogue.ext"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	20
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	21
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 * fight:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	24 * The player attacks the monster.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	25 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	26 fight(mp, weap, thrown)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	27 struct coord *mp;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	28 struct object *weap;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	29 bool thrown;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	30 {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	31
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	32 reg struct thing *tp;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	33 reg struct stats *st;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	34 reg struct linked_list *item;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	35 bool did_hit = TRUE;
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 if (pl_on(ISETHER)) /* cant fight when ethereal */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	38 return 0;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	39
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	40 if ((item = find_mons(mp->y, mp->x)) == NULL) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	41 mvaddch(mp->y, mp->x, FLOOR);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	42 mvwaddch(mw, mp->y, mp->x, ' ');
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	43 look(FALSE);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	44 msg("That monster must have been an illusion.");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	45 return 0;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	46 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	47 tp = THINGPTR(item);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	48 st = &tp->t_stats;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	49 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	50 * Since we are fighting, things are not quiet so
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	51 * no healing takes place.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	52 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	53 quiet = 0;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	54 isfight = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	55 runto(mp, &hero);
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 * Let him know it was really a mimic (if it was one).
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	58 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	59 if(tp->t_type == 'M' && tp->t_disguise != 'M' && pl_off(ISBLIND)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	60 msg("Wait! That's a mimic!");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	61 tp->t_disguise = 'M';
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	62 did_hit = thrown;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	63 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	64 if (did_hit) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	65 reg char *mname;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	66
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	67 did_hit = FALSE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	68 if (pl_on(ISBLIND))
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	69 mname = "it";
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	70 else
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	71 mname = monsters[tp->t_indx].m_name;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	72 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	73 * If the hero can see the invisibles, then
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	74 * make it easier to hit.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	75 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	76 if (pl_on(CANSEE) && on(tp, ISINVIS) && off(tp, WASHIT)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	77 tp->t_flags \|= WASHIT;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	78 st->s_arm += 3;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	79 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	80 if (roll_em(him, st, weap, thrown)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	81 did_hit = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	82 if (thrown)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	83 thunk(weap, mname);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	84 else
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	85 hit(NULL);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	86 if (pl_on(CANHUH)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	87 msg("Your hands stop glowing red");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	88 msg("The %s appears confused.", mname);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	89 tp->t_flags \|= ISHUH;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	90 player.t_flags &= ~CANHUH;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	91 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	92 * If our hero was stuck by a bone devil,
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	93 * release him now because the devil is
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	94 * confused.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	95 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	96 if (pl_on(ISHELD))
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	97 unhold(tp->t_type);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	98 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	99 if (st->s_hpt <= 0)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	100 killed(item, TRUE);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	101 else if (monhurt(tp) && off(*tp, ISWOUND)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	102 if (levtype != MAZELEV && tp->t_room != NULL &&
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	103 !rf_on(tp->t_room, ISTREAS)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	104 tp->t_flags \|= ISWOUND;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	105 msg("You wounded %s.",prname(mname,FALSE));
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	106 unhold(tp->t_type);

Mercurial > hg > early-roguelike

annotate srogue/fight.c @ 162:600873555ec0