Early Roguelike Collection: xrogue/weapons.c annotate

annotate xrogue/weapons.c @ 152:0c775afe0072

arogue7, xrogue: fix command repetition. In both games, command() loops and calls the action function twice for each command: once to schedule it by setting player.t_action and player.t_no_move, and again, to actually do it, once player.t_no_move has been reduced to 0. Each loop decremented count, so repeated commands were only repeated half the number of times the player typed. count is now decremented only when ch has been set to the repeated command.

author	John "Elwin" Edwards
date	Thu, 28 May 2015 11:08:03 -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 weapons.c - Functions for dealing with problems brought about by weapons
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 <curses.h>
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20 #include <ctype.h>
135 ce0cf824c192 xrogue: add missing includes. John "Elwin" Edwards parents: 133 diff changeset	21 #include <string.h>
133 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 boomerang(ydelta, xdelta, item, tp)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25 int ydelta, xdelta;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26 register struct linked_list *item;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27 register struct thing *tp;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28 {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29 register struct object *obj;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30 struct thing midpoint;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	31 coord oldpos;
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 obj = OBJPTR(item);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34 oldpos = obj->o_pos;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35
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 * make it appear to fly at the target
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39 do_motion(obj, ydelta, xdelta, tp);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 hit_monster(unc(obj->o_pos), obj, tp);
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 * Now let's make it fly back to the wielder. We need to
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	44 * use midpoint to fool do_motion into thinking the action
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 * starts there. Do_motion only looks at the t_pos field.
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 midpoint.t_pos = obj->o_pos; /* Simulate a new start position */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	48 do_motion(obj, -ydelta, -xdelta, &midpoint);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	50 obj->o_pos = oldpos;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	51 }
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 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 * do the actual motion on the screen done by an object traveling
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55 * across the room. Note that we should not look at any field in
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 * tp other than t_pos unless we change boomerang().
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 do_motion(obj, ydelta, xdelta, tp)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60 register struct object *obj;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	61 register int ydelta, xdelta;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62 register struct thing *tp;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	64
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 * Come fly with us ...
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 obj->o_pos = tp->t_pos;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69 for (;;) {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	70 register int ch;
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 * Erase the old one
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 if (!ce(obj->o_pos, tp->t_pos) &&
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 cansee(unc(obj->o_pos)) &&
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 mvwinch(cw, obj->o_pos.y, obj->o_pos.x) != ' ') {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	77 mvwaddch(cw, obj->o_pos.y, obj->o_pos.x, show(obj->o_pos.y, obj->o_pos.x));
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 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 * Get the new position
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 obj->o_pos.y += ydelta;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 obj->o_pos.x += xdelta;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 if (shoot_ok(ch = winat(obj->o_pos.y, obj->o_pos.x)) && ch != DOOR && !ce(obj->o_pos, hero)) {
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 * It hasn't hit anything yet, so display it
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	87 * If it alright.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	88 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 if (cansee(unc(obj->o_pos)) &&
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 mvwinch(cw, obj->o_pos.y, obj->o_pos.x) != ' ') {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91 if (obj->o_type == MISSILE) nofont(cw);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents:

Mercurial > hg > early-roguelike

annotate xrogue/weapons.c @ 152:0c775afe0072