Early Roguelike Collection: arogue7/weapons.c annotate

annotate arogue7/weapons.c @ 311:28e22fb35989

Fix one more batch of compiler warnings. A few of these were potential bugs.

author	John "Elwin" Edwards
date	Tue, 04 May 2021 21:03:47 -0400
parents	f9ef86cf22b2
children

rev	line source
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	2 * weapons.c - Functions for dealing with problems brought about by weapons
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	3 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	4 * Advanced Rogue
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	5 * Copyright (C) 1984, 1985, 1986 Michael Morgan, Ken Dalka and AT&T
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	6 * All rights reserved.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	7 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	8 * Based on "Rogue: Exploring the Dungeons of Doom"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	9 * Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	10 * All rights reserved.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	11 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	12 * See the file LICENSE.TXT for full copyright and licensing information.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	13 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	14
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	15 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	16 * Functions for dealing with problems brought about by weapons
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	17 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	18 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	19
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20 #include "curses.h"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	21 #include <ctype.h>
126 b786053d2f37 arogue7: add missing header includes. John "Elwin" Edwards parents: 125 diff changeset	22 #include <string.h>
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23 #include "rogue.h"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	25 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	26 boomerang(int ydelta, int xdelta, struct linked_list item, struct thing tp)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28 register struct object *obj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29 struct thing midpoint;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30 coord oldpos;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	31
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32 obj = OBJPTR(item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	33 oldpos = obj->o_pos;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	36 * make it appear to fly at the target
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	37 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38 do_motion(obj, ydelta, xdelta, tp);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39 hit_monster(unc(obj->o_pos), obj, tp);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	42 * Now let's make it fly back to the wielder. We need to
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43 * use midpoint to fool do_motion into thinking the action
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	44 * starts there. Do_motion only looks at the t_pos field.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46 midpoint.t_pos = obj->o_pos; /* Simulate a new start position */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	47 do_motion(obj, -ydelta, -xdelta, &midpoint);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	48
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49 obj->o_pos = oldpos;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	50 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	51
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53 * do the actual motion on the screen done by an object traveling
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 * across the room. Note that we should not look at any field in
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55 * tp other than t_pos unless we change boomerang().
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 */
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	57 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	58 do_motion(struct object obj, int ydelta, int xdelta, struct thing tp)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	61 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62 * Come fly with us ...
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	64 obj->o_pos = tp->t_pos;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	65 for (; ;) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66 register int ch;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68 * Erase the old one
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	70 if (!ce(obj->o_pos, tp->t_pos) &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	71 cansee(unc(obj->o_pos)) &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 mvwinch(cw, obj->o_pos.y, obj->o_pos.x) != ' ') {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73 mvwaddch(cw, obj->o_pos.y, obj->o_pos.x, show(obj->o_pos.y, obj->o_pos.x));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 * Get the new position
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	77 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	78 obj->o_pos.y += ydelta;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 obj->o_pos.x += xdelta;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 if (shoot_ok(ch = winat(obj->o_pos.y, obj->o_pos.x)) && ch != DOOR && !ce(obj->o_pos, hero)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82 * It hasn't hit anything yet, so display it
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 * If it alright.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85 if (cansee(unc(obj->o_pos)) &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 mvwinch(cw, obj->o_pos.y, obj->o_pos.x) != ' ') {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	87 mvwaddch(cw, obj->o_pos.y, obj->o_pos.x, obj->o_type);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	88 draw(cw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 continue;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	92
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	93 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	94 * Did we stop because of a monster or the hero? If we did
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	95 * not, we want to move our position back one because we could
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	96 * not actually make it this far.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	97 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	98 if (!isalpha(ch) &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	99 !(obj->o_pos.y == hero.y && obj->o_pos.x == hero.x)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	100 obj->o_pos.y -= ydelta;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	101 obj->o_pos.x -= xdelta;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	102 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	103
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	104 break;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	105 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	106 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	107
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	108
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	109 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	110 * fall:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	111 * Drop an item someplace around here.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	112 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	113
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	114 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	115 fall(struct linked_list *item, bool pr)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	116 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	117 register struct object *obj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	118 register struct room *rp;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	119 register int i;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	120 struct object *tobj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	121 struct linked_list *titem;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	122 coord *fpos;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	123
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	124 obj = OBJPTR(item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	125 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	126 * try to drop the item, look up to 3 squares away for now
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	127 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	128 for (i=1; i<4; i++) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	129 if ((fpos = fallpos(&obj->o_pos, FALSE, i)) != NULL)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	130 break;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	131 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	132
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	133 if (fpos != NULL) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	134 if (obj->o_group) { /* try to add groups together */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	135 for(titem=lvl_obj; titem!=NULL; titem=next(titem)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	136 tobj = OBJPTR(titem);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	137 if (tobj->o_group == obj->o_group &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	138 tobj->o_pos.y == fpos->y &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	139 tobj->o_pos.x == fpos->x) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	140 tobj->o_count += obj->o_count;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	141 o_discard(item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	142 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	143 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	144 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	145 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	146 mvaddch(fpos->y, fpos->x, obj->o_type);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	147 obj->o_pos = *fpos;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	148 if ((rp = roomin(&hero)) != NULL &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	149 lit_room(rp)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	150 light(&hero);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	151 mvwaddch(cw, hero.y, hero.x, PLAYER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	152 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	153 attach(lvl_obj, item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	154 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	155 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	156 if (pr) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	157 msg("The %s vanishes as it hits the ground.",
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	158 weaps[obj->o_which].w_name);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	159 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	160 o_discard(item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	161 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	162
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	163
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	164 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	165 * Does the missile hit the monster
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	166 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	167
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	168 bool
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	169 hit_monster(int y, int x, struct object obj, struct thing tp)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	170 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	171 static coord mp;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	172
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	173 mp.y = y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	174 mp.x = x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	175 if (tp == &player) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	176 /* Make sure there is a monster where it landed */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	177 if (!isalpha(mvwinch(mw, y, x))) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	178 return(FALSE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	179 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	180
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	181 /* Player hits monster */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	182 return(fight(&mp, obj, TRUE));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	183 } else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	184 if (!ce(mp, hero)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	185 /* Monster hits monster */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	186 return(skirmish(tp, &mp, obj, TRUE));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	187 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	188
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	189 /* Monster hits player */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	190 return(attack(tp, obj, TRUE));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	191 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	192 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	193
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	194 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	195 * init_weapon:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	196 * Set up the initial goodies for a weapon
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	197 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	198
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	199 void
311 28e22fb35989 Fix one more batch of compiler warnings. John "Elwin" Edwards parents: 219 diff changeset	200 init_weapon(struct object *weap, int type)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	201 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	202 register struct init_weps *iwp;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	203
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	204 iwp = &weaps[type];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	205 strncpy(weap->o_damage, iwp->w_dam, sizeof(weap->o_damage));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	206 strncpy(weap->o_hurldmg, iwp->w_hrl, sizeof(weap->o_hurldmg));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	207 weap->o_launch = iwp->w_launch;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	208 weap->o_flags = iwp->w_flags;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	209 weap->o_weight = iwp->w_wght;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	210 if (weap->o_flags & ISMANY) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	211 weap->o_count = rnd(8) + 8;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	212 weap->o_group = newgrp();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	213 } else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	214 weap->o_count = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	215 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	216 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	217
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	218 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	219 * missile:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	220 * Fire a missile in a given direction
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	221 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	222
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	223 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	224 missile(int ydelta, int xdelta, struct linked_list item, struct thing tp)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	225 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	226 register struct object *obj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	227 register struct linked_list *nitem;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	228 char ch;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	229
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	230 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	231 * Get which thing we are hurling
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	232 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	233 if (item == NULL) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	234 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	235 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	236 obj = OBJPTR(item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	237 if (obj->o_type == RELIC && obj->o_which == AXE_AKLAD) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	238 boomerang(ydelta, xdelta, item, tp);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	239 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	240 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	241
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	242 if (!dropcheck(obj)) return; /* Can we get rid of it? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	243
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	244 if(!(obj->o_flags & ISMISL)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	245 while (TRUE) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	246 msg(terse ? "Really throw? (y or n): "
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	247 : "Do you really want to throw %s? (y or n): ",
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	248 inv_name(obj, TRUE));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	249 mpos = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	250 ch = readchar();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	251 if (ch == 'n' \|\| ch == ESCAPE) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	252 after = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	253 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	254 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	255 if (ch == 'y')
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	256 break;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	257 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	258 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	259 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	260 * Get rid of the thing. If it is a non-multiple item object, or
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	261 * if it is the last thing, just drop it. Otherwise, create a new
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	262 * item with a count of one.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	263 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	264 if (obj->o_count < 2) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	265 detach(tp->t_pack, item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	266 if (tp->t_pack == pack) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	267 inpack--;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	268 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	269 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	270 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	271 obj->o_count--;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	272 nitem = (struct linked_list ) new_item(sizeof obj);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	273 obj = OBJPTR(nitem);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	274 obj = (OBJPTR(item));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	275 obj->o_count = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	276 item = nitem;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	277 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	278 updpack(FALSE, tp);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	279 do_motion(obj, ydelta, xdelta, tp);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	280 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	281 * AHA! Here it has hit something. If it is a wall or a door,
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	282 * or if it misses (combat) the monster, put it on the floor
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	283 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	284 if (!hit_monster(unc(obj->o_pos), obj, tp)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	285 fall(item, TRUE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	286 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	287 mvwaddch(cw, hero.y, hero.x, PLAYER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	288 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	289
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	290 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	291 * num:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	292 * Figure out the plus number for armor/weapons
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	293 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	294
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	295 char *
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	296 num(int n1, int n2)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	297 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	298 static char numbuf[LINELEN];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	299
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	300 if (n1 == 0 && n2 == 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	301 return "+0";
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	302 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	303 if (n2 == 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	304 sprintf(numbuf, "%s%d", n1 < 0 ? "" : "+", n1);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	305 } else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	306 sprintf(numbuf, "%s%d, %s%d", n1 < 0 ? "" : "+", n1, n2 < 0 ? "" : "+", n2);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	307 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	308 return(numbuf);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	309 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	310
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	311 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	312 * wield:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	313 * Pull out a certain weapon
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	314 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	315
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	316 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 126 diff changeset	317 wield(void)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	318 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	319 register struct linked_list *item;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	320 register struct object obj, oweapon;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	321
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	322 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	323 * It takes 2 movement periods to unwield a weapon and 2 movement
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	324 * periods to wield a weapon.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	325 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	326 if (player.t_action != C_WIELD) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	327 player.t_action = C_WIELD;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	328 player.t_using = NULL; /* Make sure this is NULL! */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	329 if (cur_weapon != NULL) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	330 player.t_no_move = 2 * movement(&player);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	331 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	332 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	333 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	334
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	335 if ((oweapon = cur_weapon) != NULL) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	336 /* At this point we have waited at least 2 units */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	337 if (!dropcheck(cur_weapon)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	338 cur_weapon = oweapon;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	339 player.t_action = A_NIL;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	340 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	341 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	342 if (terse)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	343 addmsg("Was ");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	344 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	345 addmsg("You were ");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	346 msg("wielding %s", inv_name(oweapon, TRUE));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	347 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	348
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	349 /* We we have something picked out? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	350 if (player.t_using == NULL) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	351 /* Now, what does he want to wield? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	352 if ((item = get_item(pack, "wield", WIELDABLE, FALSE, FALSE)) == NULL) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	353 player.t_action = A_NIL;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	354 after = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	355 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	356 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	357 player.t_using = item;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	358 player.t_no_move = 2 * movement(&player);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	359 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	360 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	361
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	362 /* We have waited our time, let's wield the weapon */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	363 item = player.t_using;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	364 player.t_using = NULL;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	365 player.t_action = A_NIL;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	366
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	367 obj = OBJPTR(item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	368
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	369 if (is_current(obj)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	370 msg("Item in use.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	371 after = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	372 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	373 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	374 if (player.t_ctype != C_FIGHTER &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	375 player.t_ctype != C_RANGER &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	376 player.t_ctype != C_PALADIN &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	377 obj->o_type == WEAPON &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	378 (obj->o_which == TWOSWORD \|\|
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	379 (obj->o_which == BASWORD &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	380 player.t_ctype != C_ASSASIN))) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	381 msg("Only fighter types can wield a %s",
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	382 weaps[obj->o_which].w_name);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	383 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	384 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	385 if (terse) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	386 addmsg("W");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	387 } else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	388 addmsg("You are now w");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	389 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	390 msg("ielding %s", inv_name(obj, TRUE));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	391 cur_weapon = obj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	392 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	393

Mercurial > hg > early-roguelike

annotate arogue7/weapons.c @ 311:28e22fb35989