Early Roguelike Collection: xrogue/actions.c annotate

annotate xrogue/actions.c @ 314:2f0eb38da609

Advanced Rogue 7: fix a crash when casting magic missile. do_zap() dereferenced a struct object pointer while ignoring the result of a NULL check. XRogue had the same problem, though triggering it was unlikely, since XRogue does not include a magic missile spell. Reported by John Harris of @Play.

author	John "Elwin" Edwards
date	Thu, 21 Oct 2021 21:00:15 -0400
parents	e52a8a7ad4c5
children

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 actions.c - functions for dealing with monster actions
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
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	19 #include <ctype.h>
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 <limits.h>
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	22 #include "rogue.h"
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 int mf_count = 0; /* move_free counter - see actions.c(m_act()) */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25 int mf_jmpcnt = 0; /* move_free counter for # of jumps */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26
220 f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	27 void m_breathe(struct thing *tp);
f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	28 void m_select(struct thing *th, bool flee);
f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	29 void m_sonic(struct thing *tp);
f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	30 void m_spell(struct thing *tp);
f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	31 void m_summon(struct thing *tp);
f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	32 bool m_use_it(struct thing tp, bool flee, struct room rer, struct room *ree);
f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	33 bool m_use_pack(struct thing monster, coord defend_pos, int dist,
f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	34 coord *shoot_dir);
f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	35
133 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 * Did we disrupt a spell?
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38 */
220 f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	39 void
f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	40 dsrpt_monster(struct thing *tp, bool always, bool see_him)
133 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 switch (tp->t_action) {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43 case A_SUMMON:
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	44 case A_MISSILE:
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 case A_SLOW:
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46 tp->t_action = A_NIL; /* Just make the old fellow start over again */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	47 tp->t_no_move = movement(tp);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	48 tp->t_using = NULL; /* Just to be on the safe side */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49 turn_on(*tp, WASDISRUPTED);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	50 if (see_him)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	51 msg("%s's spell has been disrupted.",prname(monster_name(tp),TRUE));
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53 * maybe choose something else to do next time since player
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 * is disrupting us
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 tp->t_summon *= 2;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 tp->t_cast /= 2;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58 return;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 }
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 /* We may want to disrupt other actions, too */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62 if (always) {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 tp->t_action = A_NIL; /* Just make the old fellow start over again */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	64 tp->t_no_move = movement(tp);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	65 tp->t_using = NULL;/* Just to be on the safe side */
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 }
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68
220 f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	69 void
f54901b9c39b XRogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 133 diff changeset	70 dsrpt_player(void)
133 e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	71 {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 int which, action;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73 struct linked_list *item;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74 struct object *obj;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 action = player.t_action;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	77 which = player.t_selection;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	78
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 switch (action) {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 case C_CAST: /* Did we disrupt a spell? */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81 case C_PRAY:
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82 case C_CHANT:
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 msg("Your %s was disrupted!", action == C_CAST ? "spell" : "prayer");
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 /* Charge him 1/4 anyway */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	87 if (action == C_CAST)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	88 spell_power += magic_spells[which].s_cost / 4;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 else if (action == C_PRAY)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 pray_time += cleric_spells[which].s_cost / 4;

Mercurial > hg > early-roguelike

annotate xrogue/actions.c @ 314:2f0eb38da609