Early Roguelike Collection: rogue4/things.c annotate

annotate rogue4/things.c @ 304:e52a8a7ad4c5

Fix many compiler warnings. There should only be two changes in behavior: arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly applied to characters who are not monks instead of monks who are not empty-handed. urogue/fight.c: fixed an interaction with the "debug" macro that could cause the wrong message to be displayed.

author	John "Elwin" Edwards
date	Wed, 14 Apr 2021 18:55:33 -0400
parents	0250220d8cdd
children

rev	line source
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	1 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	2 * Contains functions for dealing with things like potions, scrolls,
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	3 * and other items.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	4 *
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	5 * @(#)things.c 4.26 (Berkeley) 5/18/82
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	6 *
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	7 * Rogue: Exploring the Dungeons of Doom
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	8 * Copyright (C) 1980, 1981, 1982 Michael Toy, Ken Arnold and Glenn Wichman
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	9 * All rights reserved.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	10 *
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	11 * See the file LICENSE.TXT for full copyright and licensing information.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	12 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	13
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	14 #include <curses.h>
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	15 #include <ctype.h>
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	16 #include <string.h>
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	17 #include "rogue.h"
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	18
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	19 int pick_one(struct magic_item *magic, int nitems);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	20 void print_disc(char type);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	21 void set_order(short *order, int numthings);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	22 char *nothing(char type);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	23
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	24 bool got_genocide = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	25
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	26 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	27 * inv_name:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	28 * Return the name of something as it would appear in an
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	29 * inventory.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	30 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	31 char *
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	32 inv_name(THING *obj, bool drop)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	33 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	34 register char *pb;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	35
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	36 pb = prbuf;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	37 switch (obj->o_type)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	38 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	39 case SCROLL:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	40 if (obj->o_count == 1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	41 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	42 strcpy(pb, "A scroll ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	43 pb = &prbuf[9];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	44 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	45 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	46 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	47 sprintf(pb, "%d scrolls ", obj->o_count);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	48 pb = &prbuf[strlen(prbuf)];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	49 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	50 if (s_know[obj->o_which])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	51 sprintf(pb, "of %s", s_magic[obj->o_which].mi_name);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	52 else if (s_guess[obj->o_which])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	53 sprintf(pb, "called %s", s_guess[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	54 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	55 sprintf(pb, "titled '%s'", s_names[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	56 when POTION:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	57 if (obj->o_count == 1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	58 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	59 strcpy(pb, "A potion ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	60 pb = &prbuf[9];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	61 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	62 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	63 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	64 sprintf(pb, "%d potions ", obj->o_count);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	65 pb = &pb[strlen(prbuf)];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	66 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	67 if (p_know[obj->o_which])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	68 sprintf(pb, "of %s(%s)", p_magic[obj->o_which].mi_name,
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	69 p_colors[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	70 else if (p_guess[obj->o_which])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	71 sprintf(pb, "called %s(%s)", p_guess[obj->o_which],
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	72 p_colors[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	73 else if (obj->o_count == 1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	74 sprintf(prbuf, "A%s %s potion", vowelstr(p_colors[obj->o_which]),
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	75 p_colors[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	76 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	77 sprintf(prbuf, "%d %s potions", obj->o_count,
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	78 p_colors[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	79 when FOOD:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	80 if (obj->o_which == 1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	81 if (obj->o_count == 1)
300 0250220d8cdd Fix an assortment of compiler warnings. John "Elwin" Edwards parents: 244 diff changeset	82 sprintf(pb, "A%s %.76s", vowelstr(fruit), fruit);
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	83 else
300 0250220d8cdd Fix an assortment of compiler warnings. John "Elwin" Edwards parents: 244 diff changeset	84 sprintf(pb, "%d %.66ss", obj->o_count, fruit);
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	85 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	86 if (obj->o_count == 1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	87 strcpy(pb, "Some food");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	88 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	89 sprintf(pb, "%d rations of food", obj->o_count);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	90 when WEAPON:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	91 if (obj->o_count > 1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	92 sprintf(pb, "%d ", obj->o_count);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	93 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	94 sprintf(pb, "A%s ", vowelstr(w_names[obj->o_which]));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	95 pb = &prbuf[strlen(prbuf)];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	96 if (obj->o_flags & ISKNOW)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	97 sprintf(pb, "%s %s", num(obj->o_hplus, obj->o_dplus, WEAPON),
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	98 w_names[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	99 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	100 sprintf(pb, "%s", w_names[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	101 if (obj->o_count > 1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	102 strcat(pb, "s");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	103 when ARMOR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	104 if (obj->o_flags & ISKNOW)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	105 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	106 sprintf(pb, "%s %s [",
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	107 num(a_class[obj->o_which] - obj->o_ac, 0, ARMOR),
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	108 a_names[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	109 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	110 strcat(pb, "armor class ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	111 pb = &prbuf[strlen(prbuf)];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	112 sprintf(pb, "%d]", obj->o_ac);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	113 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	114 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	115 sprintf(pb, "%s", a_names[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	116 when AMULET:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	117 strcpy(pb, "The Amulet of Yendor");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	118 when STICK:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	119 sprintf(pb, "A%s %s ", vowelstr(ws_type[obj->o_which]),
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	120 ws_type[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	121 pb = &prbuf[strlen(prbuf)];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	122 if (ws_know[obj->o_which])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	123 sprintf(pb, "of %s%s(%s)", ws_magic[obj->o_which].mi_name,
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	124 charge_str(obj), ws_made[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	125 else if (ws_guess[obj->o_which])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	126 sprintf(pb, "called %s(%s)", ws_guess[obj->o_which],
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	127 ws_made[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	128 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	129 sprintf(pb = &prbuf[1], "%s %s %s",
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	130 vowelstr(ws_made[obj->o_which]), ws_made[obj->o_which],
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	131 ws_type[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	132 when RING:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	133 if (r_know[obj->o_which])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	134 sprintf(pb, "A%s ring of %s(%s)", ring_num(obj),
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	135 r_magic[obj->o_which].mi_name, r_stones[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	136 else if (r_guess[obj->o_which])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	137 sprintf(pb, "A ring called %s(%s)",
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	138 r_guess[obj->o_which], r_stones[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	139 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	140 sprintf(pb, "A%s %s ring", vowelstr(r_stones[obj->o_which]),
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	141 r_stones[obj->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	142 when GOLD:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	143 sprintf(pb, "%d pieces of gold", obj->o_goldval);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	144 #ifdef WIZARD
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	145 otherwise:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	146 debug("Picked up something funny %s", unctrol(obj->o_type));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	147 sprintf(pb, "Something bizarre %s", unctrol(obj->o_type));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	148 #endif
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	149 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	150 if (obj == cur_armor)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	151 strcat(pb, " (being worn)");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	152 if (obj == cur_weapon)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	153 strcat(pb, " (weapon in hand)");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	154 if (obj == cur_ring[LEFT])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	155 strcat(pb, " (on left hand)");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	156 else if (obj == cur_ring[RIGHT])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	157 strcat(pb, " (on right hand)");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	158 if (drop && isupper(prbuf[0]))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	159 prbuf[0] = tolower(prbuf[0]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	160 else if (!drop && islower(*prbuf))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	161 prbuf = toupper(prbuf);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	162 return prbuf;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	163 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	164
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	165 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	166 * drop:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	167 * Put something down
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	168 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	169 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	170 drop(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	171 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	172 register char ch;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	173 register THING nobj, op;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	174
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	175 ch = chat(hero.y, hero.x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	176 if (ch != FLOOR && ch != PASSAGE)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	177 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	178 after = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	179 msg("there is something there already");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	180 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	181 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	182 if ((op = get_item("drop", 0)) == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	183 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	184 if (!dropcheck(op))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	185 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	186 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	187 * Take it out of the pack
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	188 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	189 if (op->o_count >= 2 && op->o_type != WEAPON)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	190 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	191 op->o_count--;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	192 nobj = new_item();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	193 nobj = op;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	194 nobj->o_count = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	195 op = nobj;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	196 if (op->o_group != 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	197 inpack++;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	198 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	199 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	200 detach(pack, op);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	201 inpack--;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	202 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	203 * Link it into the level object list
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	204 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	205 attach(lvl_obj, op);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	206 chat(hero.y, hero.x) = op->o_type;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	207 flat(hero.y, hero.x) \|= F_DROPPED;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	208 op->o_pos = hero;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	209 if (op->o_type == AMULET)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	210 amulet = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	211 msg("dropped %s", inv_name(op, TRUE));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	212 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	213
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	214 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	215 * dropcheck:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	216 * Do special checks for dropping or unweilding\|unwearing\|unringing
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	217 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	218 bool
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	219 dropcheck(THING *op)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	220 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	221 if (op == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	222 return TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	223 if (op != cur_armor && op != cur_weapon
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	224 && op != cur_ring[LEFT] && op != cur_ring[RIGHT])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	225 return TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	226 if (op->o_flags & ISCURSED)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	227 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	228 msg("you can't. It appears to be cursed");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	229 return FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	230 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	231 if (op == cur_weapon)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	232 cur_weapon = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	233 else if (op == cur_armor)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	234 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	235 waste_time();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	236 cur_armor = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	237 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	238 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	239 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	240 cur_ring[op == cur_ring[LEFT] ? LEFT : RIGHT] = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	241 switch (op->o_which)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	242 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	243 case R_ADDSTR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	244 chg_str(-op->o_ac);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	245 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	246 case R_SEEINVIS:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	247 unsee();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	248 extinguish(unsee);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	249 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	250 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	251 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	252 return TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	253 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	254
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	255 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	256 * new_thing:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	257 * Return a new thing
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	258 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	259 THING *
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	260 new_thing(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	261 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	262 register THING *cur;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	263 register int j, k;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	264
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	265 cur = new_item();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	266 cur->o_hplus = cur->o_dplus = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	267 strcpy(cur->o_damage,"0d0");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	268 strcpy(cur->o_hurldmg,"0d0");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	269 cur->o_ac = 11;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	270 cur->o_count = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	271 cur->o_group = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	272 cur->o_flags = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	273 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	274 * Decide what kind of object it will be
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	275 * If we haven't had food for a while, let it be food.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	276 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	277 switch (no_food > 3 ? 2 : pick_one(things, NUMTHINGS))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	278 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	279 case 0:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	280 cur->o_type = POTION;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	281 cur->o_which = pick_one(p_magic, MAXPOTIONS);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	282 when 1:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	283 cur->o_type = SCROLL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	284 cur->o_which = pick_one(s_magic, MAXSCROLLS);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	285 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	286 * Only one genocide scroll allowed per game, so if it's
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	287 * the second one, then turn it into a identify scroll
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	288 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	289 if (cur->o_which == S_GENOCIDE)
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 300 diff changeset	290 {
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	291 if (got_genocide)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	292 cur->o_which = S_IDENT;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	293 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	294 got_genocide = TRUE;
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 300 diff changeset	295 }
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	296 when 2:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	297 no_food = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	298 cur->o_type = FOOD;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	299 if (rnd(10) != 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	300 cur->o_which = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	301 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	302 cur->o_which = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	303 when 3:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	304 cur->o_type = WEAPON;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	305 cur->o_which = rnd(MAXWEAPONS);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	306 init_weapon(cur, cur->o_which);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	307 if ((k = rnd(100)) < 10)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	308 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	309 cur->o_flags \|= ISCURSED;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	310 cur->o_hplus -= rnd(3) + 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	311 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	312 else if (k < 15)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	313 cur->o_hplus += rnd(3) + 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	314 when 4:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	315 cur->o_type = ARMOR;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	316 for (j = 0, k = rnd(100); j < MAXARMORS; j++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	317 if (k < a_chances[j])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	318 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	319 #ifdef WIZARD
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	320 if (j == MAXARMORS)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	321 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	322 debug("Picked a bad armor %d", k);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	323 j = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	324 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	325 #endif
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	326 cur->o_which = j;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	327 cur->o_ac = a_class[j];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	328 if ((k = rnd(100)) < 20)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	329 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	330 cur->o_flags \|= ISCURSED;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	331 cur->o_ac += rnd(3) + 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	332 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	333 else if (k < 28)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	334 cur->o_ac -= rnd(3) + 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	335 when 5:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	336 cur->o_type = RING;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	337 cur->o_which = pick_one(r_magic, MAXRINGS);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	338 switch (cur->o_which)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	339 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	340 case R_ADDSTR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	341 case R_PROTECT:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	342 case R_ADDHIT:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	343 case R_ADDDAM:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	344 if ((cur->o_ac = rnd(3)) == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	345 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	346 cur->o_ac = -1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	347 cur->o_flags \|= ISCURSED;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	348 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	349 when R_AGGR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	350 case R_TELEPORT:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	351 cur->o_flags \|= ISCURSED;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	352 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	353 when 6:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	354 cur->o_type = STICK;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	355 cur->o_which = pick_one(ws_magic, MAXSTICKS);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	356 fix_stick(cur);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	357 #ifdef WIZARD
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	358 otherwise:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	359 debug("Picked a bad kind of object");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	360 wait_for(' ');
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	361 #endif
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	362 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	363 return cur;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	364 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	365
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	366 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	367 * pick_one:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	368 * Pick an item out of a list of nitems possible magic items
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	369 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	370 int
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	371 pick_one(struct magic_item *magic, int nitems)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	372 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	373 register struct magic_item *end;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	374 register int i;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	375 register struct magic_item *start;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	376
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	377 start = magic;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	378 for (end = &magic[nitems], i = rnd(100); magic < end; magic++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	379 if (i < magic->mi_prob)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	380 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	381 if (magic == end)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	382 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	383 #ifdef WIZARD
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	384 if (wizard)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	385 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	386 msg("bad pick_one: %d from %d items", i, nitems);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	387 for (magic = start; magic < end; magic++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	388 msg("%s: %d%%", magic->mi_name, magic->mi_prob);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	389 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	390 #endif
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	391 magic = start;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	392 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	393 return magic - start;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	394 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	395
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	396 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	397 * discovered:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	398 * list what the player has discovered in this game of a certain type
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	399 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	400 static int line_cnt = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	401
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	402 static bool newpage = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	403
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	404 static char lastfmt, lastarg;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	405
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	406 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	407 discovered(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	408 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	409 register char ch;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	410 register bool disc_list;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	411
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	412 do {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	413 disc_list = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	414 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	415 addmsg("for ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	416 addmsg("what type");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	417 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	418 addmsg(" of object do you want a list");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	419 msg("? (* for all)");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	420 ch = readchar();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	421 switch (ch)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	422 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	423 case ESCAPE:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	424 msg("");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	425 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	426 case POTION:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	427 case SCROLL:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	428 case RING:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	429 case STICK:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	430 case '*':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	431 disc_list = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	432 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	433 default:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	434 if (terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	435 msg("Not a type");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	436 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	437 msg("Please type one of %c%c%c%c (ESCAPE to quit)", POTION, SCROLL, RING, STICK);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	438 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	439 } while (!disc_list);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	440 if (ch == '*')
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	441 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	442 print_disc(POTION);
235 2dcf10d45d5b Rogue V4: add two more function declarations. John "Elwin" Edwards parents: 215 diff changeset	443 add_line("", NULL);
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	444 print_disc(SCROLL);
235 2dcf10d45d5b Rogue V4: add two more function declarations. John "Elwin" Edwards parents: 215 diff changeset	445 add_line("", NULL);
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	446 print_disc(RING);
235 2dcf10d45d5b Rogue V4: add two more function declarations. John "Elwin" Edwards parents: 215 diff changeset	447 add_line("", NULL);
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	448 print_disc(STICK);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	449 end_line();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	450 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	451 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	452 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	453 print_disc(ch);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	454 end_line();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	455 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	456 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	457
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	458 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	459 * print_disc:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	460 * Print what we've discovered of type 'type'
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	461 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	462
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	463 #define MAX(a,b,c,d) (a > b ? (a > c ? (a > d ? a : d) : (c > d ? c : d)) : (b > c ? (b > d ? b : d) : (c > d ? c : d)))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	464
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	465 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	466 print_disc(char type)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	467 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	468 register bool *know = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	469 register char **guess = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	470 register int i, maxnum = 0, num_found;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	471 static THING obj;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	472 static short order[MAX(MAXSCROLLS, MAXPOTIONS, MAXRINGS, MAXSTICKS)];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	473
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	474 switch (type)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	475 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	476 case SCROLL:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	477 maxnum = MAXSCROLLS;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	478 know = s_know;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	479 guess = s_guess;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	480 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	481 case POTION:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	482 maxnum = MAXPOTIONS;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	483 know = p_know;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	484 guess = p_guess;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	485 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	486 case RING:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	487 maxnum = MAXRINGS;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	488 know = r_know;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	489 guess = r_guess;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	490 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	491 case STICK:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	492 maxnum = MAXSTICKS;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	493 know = ws_know;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	494 guess = ws_guess;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	495 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	496 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	497 set_order(order, maxnum);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	498 obj.o_count = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	499 obj.o_flags = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	500 num_found = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	501 for (i = 0; i < maxnum; i++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	502 if (know[order[i]] \|\| guess[order[i]])
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	503 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	504 obj.o_type = type;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	505 obj.o_which = order[i];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	506 add_line("%s", inv_name(&obj, FALSE));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	507 num_found++;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	508 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	509 if (num_found == 0)
235 2dcf10d45d5b Rogue V4: add two more function declarations. John "Elwin" Edwards parents: 215 diff changeset	510 add_line(nothing(type), NULL);
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	511 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	512
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	513 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	514 * set_order:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	515 * Set up order for list
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	516 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	517 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	518 set_order(short *order, int numthings)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	519 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	520 register int i, r, t;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	521
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	522 for (i = 0; i< numthings; i++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	523 order[i] = i;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	524
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	525 for (i = numthings; i > 0; i--)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	526 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	527 r = rnd(i);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	528 t = order[i - 1];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	529 order[i - 1] = order[r];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	530 order[r] = t;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	531 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	532 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	533
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	534 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	535 * add_line:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	536 * Add a line to the list of discoveries
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	537 */
235 2dcf10d45d5b Rogue V4: add two more function declarations. John "Elwin" Edwards parents: 215 diff changeset	538 void
2dcf10d45d5b Rogue V4: add two more function declarations. John "Elwin" Edwards parents: 215 diff changeset	539 add_line(char fmt, char arg)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	540 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	541 if (line_cnt == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	542 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	543 wclear(hw);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	544 if (slow_invent)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	545 mpos = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	546 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	547 if (slow_invent)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	548 {
235 2dcf10d45d5b Rogue V4: add two more function declarations. John "Elwin" Edwards parents: 215 diff changeset	549 if (fmt != NULL && *fmt != '\0')
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	550 msg(fmt, arg);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	551 line_cnt++;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	552 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	553 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	554 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	555 if (line_cnt >= LINES - 1 \|\| fmt == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	556 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	557 mvwaddstr(hw, LINES - 1, 0, "--Press space to continue--");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	558 wrefresh(hw);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	559 w_wait_for(hw,' ');
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	560 clearok(curscr, TRUE);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	561 wclear(hw);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	562 touchwin(stdscr);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	563 newpage = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	564 line_cnt = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	565 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	566 if (fmt != NULL && !(line_cnt == 0 && *fmt == '\0'))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	567 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	568 mvwprintw(hw, line_cnt++, 0, fmt, arg);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	569 lastfmt = fmt;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	570 lastarg = arg;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	571 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	572 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	573 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	574
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	575 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	576 * end_line:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	577 * End the list of lines
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	578 */
235 2dcf10d45d5b Rogue V4: add two more function declarations. John "Elwin" Edwards parents: 215 diff changeset	579 void
2dcf10d45d5b Rogue V4: add two more function declarations. John "Elwin" Edwards parents: 215 diff changeset	580 end_line(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	581 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	582 if (!slow_invent)
244 ded75a57405c Rogue V4, V5: fix messages when viewing the identified items. John "Elwin" Edwards parents: 235 diff changeset	583 {
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	584 if (line_cnt == 1 && !newpage)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	585 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	586 mpos = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	587 msg(lastfmt, lastarg);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	588 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	589 else
244 ded75a57405c Rogue V4, V5: fix messages when viewing the identified items. John "Elwin" Edwards parents: 235 diff changeset	590 {
235 2dcf10d45d5b Rogue V4: add two more function declarations. John "Elwin" Edwards parents: 215 diff changeset	591 add_line(NULL, NULL);
244 ded75a57405c Rogue V4, V5: fix messages when viewing the identified items. John "Elwin" Edwards parents: 235 diff changeset	592 msg("");
ded75a57405c Rogue V4, V5: fix messages when viewing the identified items. John "Elwin" Edwards parents: 235 diff changeset	593 }
ded75a57405c Rogue V4, V5: fix messages when viewing the identified items. John "Elwin" Edwards parents: 235 diff changeset	594 }
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	595 line_cnt = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	596 newpage = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	597 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	598
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	599 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	600 * nothing:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	601 * Set up prbuf so that message for "nothing found" is there
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	602 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	603 char *
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	604 nothing(char type)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	605 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	606 register char sp, tystr = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	607
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	608 if (terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	609 sprintf(prbuf, "Nothing");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	610 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	611 sprintf(prbuf, "Haven't discovered anything");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	612 if (type != '*')
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	613 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	614 sp = &prbuf[strlen(prbuf)];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	615 switch (type)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	616 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	617 case POTION: tystr = "potion";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	618 when SCROLL: tystr = "scroll";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	619 when RING: tystr = "ring";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	620 when STICK: tystr = "stick";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	621 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	622 sprintf(sp, " about any %ss", tystr);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	623 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	624 return prbuf;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	625 }

Mercurial > hg > early-roguelike

annotate rogue4/things.c @ 304:e52a8a7ad4c5