[ViewVC] Diff of: cvs/deliantra/server/common/item.C

Comparing deliantra/server/common/item.C (file contents):
Revision 1.10 by elmex, Wed Dec 20 10:31:00 2006 UTC vs.
Revision 1.42 by root, Wed Apr 9 14:36:47 2008 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	#include <global.h>	24	#include <global.h>
25	#include <funcpoint.h>	25	#include <funcpoint.h>
26	#include <living.h>	26	#include <living.h>
27	#include <spells.h>	27	#include <spells.h>
		28
		29	const char *const coins[NUM_COINS + 1] = { "royalty", "platinacoin", "goldcoin", "silvercoin", 0 };
28		30
29	/* the ordering of this is actually doesn't make a difference	31	/* the ordering of this is actually doesn't make a difference
30	* However, for ease of use, new entries should go at the end	32	* However, for ease of use, new entries should go at the end
31	* so those people that debug the code that get used to something	33	* so those people that debug the code that get used to something
32	* being in the location 4 don't get confused.	34	* being in the location 4 don't get confused.
46	* may be better.	48	* may be better.
47	* Basically, for the use/nonuse, the code does something like:	49	* Basically, for the use/nonuse, the code does something like:
48	* "This item goes %s\n", with the use/nonuse values filling in the %s	50	* "This item goes %s\n", with the use/nonuse values filling in the %s
49	*/	51	*/
50	Body_Locations body_locations[NUM_BODY_LOCATIONS] = {	52	Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
51	{"body_range", "in your range slot", "in a human's range slot"},	53	{KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
52	{"body_arm", "on your arm", "on a human's arm"},	54	{KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
53	{"body_torso", "on your body", "on a human's torso"},	55	{KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
54	{"body_head", "on your head", "on a human's head"},	56	{KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
55	{"body_neck", "around your neck", "around a humans neck"},	57	{KW_body_arm , "You can put it on your arm" , "It goes on a human's arm"},
56	{"body_skill", "in your skill slot", "in a human's skill slot"},	58	{KW_body_torso , "You can wear it on your body" , "It goes on a human's torso"},
57	{"body_finger", "on your finger", "on a human's finger"} ,	59	{KW_body_head , "You can wear it on your head" , "It goes on a human's head"},
		60	{KW_body_neck , "You can wear it around your neck" , "It goes around a human's neck"},
		61	{KW_body_finger , "You can wear it on your finger" , "It goes on a human's finger"} ,
58	{"body_shoulder", "around your shoulders", "around a human's shoulders"},	62	{KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
59	{"body_foot", "on your feet", "on a human's feet"},	63	{KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
60	{"body_hand", "on your hands", "on a human's hands"},	64	{KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
61	{"body_wrist", "around your wrists", "around a human's wrist"},	65	{KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
62	{"body_waist", "around your waist", "around a human's waist"},	66	{KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
63	/{"body_dragon_torso", "your body", "a dragon's body"} /	67	/{"body_dragon_torso", "your body", "a dragon's body"} /
64	};	68	};
65		69
66	static char numbers[21][20] = {	70	static char numbers[21][20] = {
67	"no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",	71	"no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
…		…
99	{POTION, "potion", "potions", SK_ALCHEMY, 0},	103	{POTION, "potion", "potions", SK_ALCHEMY, 0},
100	{FOOD, "food", "food", SK_WOODSMAN, 0},	104	{FOOD, "food", "food", SK_WOODSMAN, 0},
101	{POISON, "poison", "poisons", SK_ALCHEMY, 0},	105	{POISON, "poison", "poisons", SK_ALCHEMY, 0},
102	{BOOK, "book", "books", SK_LITERACY, 0},	106	{BOOK, "book", "books", SK_LITERACY, 0},
103	{CLOCK, "clock", "clocks", 0, 0},	107	{CLOCK, "clock", "clocks", 0, 0},
104	{LIGHTNING, "lightning", "lightning", 0, 0},
105	{ARROW, "arrow", "arrows", SK_BOWYER, 0},	108	{ARROW, "arrow", "arrows", SK_BOWYER, 0},
106	{BOW, "bow", "bows", SK_BOWYER, 0},	109	{BOW, "bow", "bows", SK_BOWYER, 0},
107	{WEAPON, "weapon", "weapons", SK_SMITHERY, 0},	110	{WEAPON, "weapon", "weapons", SK_SMITHERY, 0},
108	{ARMOUR, "armour", "armour", SK_SMITHERY, 0},	111	{ARMOUR, "armour", "armour", SK_SMITHERY, 0},
109	{PEDESTAL, "pedestal", "pedestals", 0, 0},	112	{PEDESTAL, "pedestal", "pedestals", 0, 0},
…		…
158	{FLOOR, "floor", "floors", 0, 0},	161	{FLOOR, "floor", "floors", 0, 0},
159	{FLESH, "flesh", "flesh", SK_WOODSMAN, 0},	162	{FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
160	{INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},	163	{INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
161	{SKILL_TOOL, "skill tool", "skill tools", 0, 0},	164	{SKILL_TOOL, "skill tool", "skill tools", 0, 0},
162	{LIGHTER, "lighter", "lighters", 0, 0},	165	{LIGHTER, "lighter", "lighters", 0, 0},
163	{TRAP_PART, "trap part", "trap parts", 0, 0},	166	{BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
164	{WALL, "wall", "walls", 0, 0},
165	{LIGHT_SOURCE, "light source", "light sources", 0, 0},
166	{MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},	167	{MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
167	{MONSTER, "monster", "monsters", 0, 0},
168	{SPAWN_GENERATOR, "monster generator", "monster generators", 0, 0},
169	{LAMP, "lamp", "lamps", 0, 0},	168	{LAMP, "lamp", "lamps", 0, 0},
170	{DUPLICATOR, "duplicator", "duplicators", 0, 0},	169	{DUPLICATOR, "duplicator", "duplicators", 0, 0},
171	{TOOL, "tool", "tools", 0, 0},
172	{SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},	170	{SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
173	{BUILDFAC, "building facility", "building facilities", 0, 0},
174	{CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},	171	{CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
175	{SPINNER, "spinner", "spinners", 0, 0},	172	{SPINNER, "spinner", "spinners", 0, 0},
176	{GATE, "gate", "gates", 0, 0},	173	{GATE, "gate", "gates", 0, 0},
177	{BUTTON, "button", "buttons", 0, 0},	174	{BUTTON, "button", "buttons", 0, 0},
178	{CF_HANDLE, "cf handle", "cf handles", 0, 0},	175	{CF_HANDLE, "cf handle", "cf handles", 0, 0},
…		…
185	{SPELL_EFFECT, "spell effect", "spell effects", 0, 0},	182	{SPELL_EFFECT, "spell effect", "spell effects", 0, 0},
186	{CONVERTER, "converter", "converters", 0, 0},	183	{CONVERTER, "converter", "converters", 0, 0},
187	{BRACERS, "bracers", "bracers", SK_SMITHERY, 0},	184	{BRACERS, "bracers", "bracers", SK_SMITHERY, 0},
188	{POISONING, "poisoning", "poisonings", 0, 0},	185	{POISONING, "poisoning", "poisonings", 0, 0},
189	{SAVEBED, "savebed", "savebeds", 0, 0},	186	{SAVEBED, "savebed", "savebeds", 0, 0},
190	{POISONCLOUD, "poison cloud", "poison clouds", 0, 0},
191	{FIREHOLES, "fireholes", "fireholes", 0, 0},
192	{WAND, "wand", "wands", SK_THAUMATURGY, 0},	187	{WAND, "wand", "wands", SK_THAUMATURGY, 0},
193	{SCROLL, "scroll", "scrolls", SK_LITERACY, 0},	188	{SCROLL, "scroll", "scrolls", SK_LITERACY, 0},
194	{DIRECTOR, "director", "directors", 0, 0},	189	{DIRECTOR, "director", "directors", 0, 0},
195	{GIRDLE, "girdle", "girdles", SK_SMITHERY, 0},	190	{GIRDLE, "girdle", "girdles", SK_SMITHERY, 0},
196	{FORCE, "force", "forces", 0, 0},	191	{FORCE, "force", "forces", 0, 0},
…		…
258	};	253	};
259		254
260	int	255	int
261	get_power_from_ench (int ench)	256	get_power_from_ench (int ench)
262	{	257	{
263	if (ench < 0)	258	if (ench < 0) ench = 0;
264	ench = 0;	259	if (ench > 20) ench = 20;
265	if (ench > 20)	260
266	ench = 20;
267	return enc_to_item_power[ench];	261	return enc_to_item_power[ench];
268	}	262	}
269		263
270	/* This takes an object 'op' and figures out what its item_power	264	/* This takes an object 'op' and figures out what its item_power
271	* rating should be. This should only really be used by the treasure	265	* rating should be. This should only really be used by the treasure
…		…
279	{	273	{
280	int i, tmp, enc;	274	int i, tmp, enc;
281		275
282	enc = 0;	276	enc = 0;
283	for (i = 0; i < NUM_STATS; i++)	277	for (i = 0; i < NUM_STATS; i++)
284	enc += get_attr_value (&op->stats, i);	278	enc += op->stats.stat (i);
285		279
286	/* This protection logic is pretty flawed. 20% fire resistance	280	/* This protection logic is pretty flawed. 20% fire resistance
287	* is much more valuable than 20% confusion, or 20% slow, or	281	* is much more valuable than 20% confusion, or 20% slow, or
288	* several others. Start at 1 - ignore physical - all that normal	282	* several others. Start at 1 - ignore physical - all that normal
289	* armour shouldn't be counted against	283	* armour shouldn't be counted against
…		…
350	enc += 1;	344	enc += 1;
351	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	345	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
352	enc += 1;	346	enc += 1;
353		347
354	return get_power_from_ench (enc);	348	return get_power_from_ench (enc);
355
356	}	349	}
357		350
358	/* returns the typedata that has a number equal to itemtype, if there	351	/* returns the typedata that has a number equal to itemtype, if there
359	* isn't one, returns NULL */	352	* isn't one, returns NULL */
360
361	const typedata *	353	const typedata *
362	get_typedata (int itemtype)	354	get_typedata (int itemtype)
363	{	355	{
364	int i;	356	int i;
365		357
…		…
370	}	362	}
371		363
372	/* returns the typedata that has a name equal to itemtype, if there	364	/* returns the typedata that has a name equal to itemtype, if there
373	* isn't one, return the plural name that matches, if there still isn't	365	* isn't one, return the plural name that matches, if there still isn't
374	* one return NULL */	366	* one return NULL */
375
376	const typedata *	367	const typedata *
377	get_typedata_by_name (const char *name)	368	get_typedata_by_name (const char *name)
378	{	369	{
379	int i;	370	int i;
380		371
…		…
395	* returns a static array of the description. This can return	386	* returns a static array of the description. This can return
396	* a big buffer.	387	* a big buffer.
397	* if newline is true, we don't put parens around the description	388	* if newline is true, we don't put parens around the description
398	* but do put a newline at the end. Useful when dumping to files	389	* but do put a newline at the end. Useful when dumping to files
399	*/	390	*/
400	char *	391	const char *
401	describe_resistance (const object *op, int newline)	392	describe_resistance (const object *op, int newline)
402	{	393	{
403	static char buf[VERY_BIG_BUF];	394	static char buf[VERY_BIG_BUF];
404	char buf1[VERY_BIG_BUF];	395	char buf1[VERY_BIG_BUF];
405	int tmpvar;	396	int tmpvar;
…		…
424	/*	415	/*
425	* query_weight(object) returns a character pointer to a static buffer	416	* query_weight(object) returns a character pointer to a static buffer
426	* containing the text-representation of the weight of the given object.	417	* containing the text-representation of the weight of the given object.
427	* The buffer will be overwritten by the next call to query_weight().	418	* The buffer will be overwritten by the next call to query_weight().
428	*/	419	*/
429		420	const char *
430	char *
431	query_weight (const object *op)	421	query_weight (const object *op)
432	{	422	{
433	static char buf[10];	423	static char buf[10];
434	sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;	424	sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
435		425
436	if (op->weight < 0)	426	if (op->weight < 0)
437	return " ";	427	return " ";
		428
438	if (i % 1000)	429	if (i % 1000)
439	sprintf (buf, "%6.1f", i / 1000.0);	430	sprintf (buf, "%6.1f", i / 1000.0);
440	else	431	else
441	sprintf (buf, "%4d ", i / 1000);	432	sprintf (buf, "%4d ", i / 1000);
		433
442	return buf;	434	return buf;
443	}	435	}
444		436
445	/*	437	/*
446	* Returns the pointer to a static buffer containing	438	* Returns the pointer to a static buffer containing
447	* the number requested (of the form first, second, third...)	439	* the number requested (of the form first, second, third...)
448	*/	440	*/
449		441	const char *
450	char *
451	get_levelnumber (int i)	442	get_levelnumber (int i)
452	{	443	{
453	static char buf[MAX_BUF];	444	static char buf[MAX_BUF];
454		445
455	if (i > 99)	446	if (i > 99)
456	{	447	{
457	sprintf (buf, "%d.", i);	448	sprintf (buf, "%d.", i);
458	return buf;	449	return buf;
459	}	450	}
		451
460	if (i < 21)	452	if (i < 21)
461	return levelnumbers[i];	453	return levelnumbers[i];
462	if (!(i % 10))	454	if (!(i % 10))
463	return levelnumbers_10[i / 10];	455	return levelnumbers_10[i / 10];
		456
464	strcpy (buf, numbers_10[i / 10]);	457	strcpy (buf, numbers_10[i / 10]);
465	strcat (buf, levelnumbers[i % 10]);	458	strcat (buf, levelnumbers[i % 10]);
466	return buf;	459	return buf;
467	}	460	}
468
469		461
470	/*	462	/*
471	* get_number(integer) returns the text-representation of the given number	463	* get_number(integer) returns the text-representation of the given number
472	* in a static buffer. The buffer might be overwritten at the next	464	* in a static buffer. The buffer might be overwritten at the next
473	* call to get_number().	465	* call to get_number().
474	* It is currently only used by the query_name() function.	466	* It is currently only used by the query_name() function.
475	*/	467	*/
476		468	const char *
477	char *
478	get_number (int i)	469	get_number (int i)
479	{	470	{
480	if (i <= 20)	471	if (i <= 20)
481	return numbers[i];	472	return numbers[i];
482	else	473	else
…		…
499	*/	490	*/
500		491
501	/* Aug 95 modified this slightly so that Skill tools don't have magic bonus	492	/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
502	* from stats.sp - b.t.	493	* from stats.sp - b.t.
503	*/	494	*/
504	char *	495	const char *
505	ring_desc (const object *op)	496	ring_desc (const object *op)
506	{	497	{
507	static char buf[VERY_BIG_BUF];	498	static dynbuf_text buf; buf.clear ();
508	int attr, val, len;	499	int attr, val, len;
509		500
510	buf[0] = 0;
511
512	if (!QUERY_FLAG (op, FLAG_IDENTIFIED))	501	if (QUERY_FLAG (op, FLAG_IDENTIFIED))
513	return buf;	502	{
514
515	for (attr = 0; attr < NUM_STATS; attr++)	503	for (attr = 0; attr < NUM_STATS; attr++)
516	{	504	if ((val = op->stats.stat (attr)))
517	if ((val = get_attr_value (&(op->stats), attr)) != 0)
518	{
519	sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val);	505	buf.printf ("(%s%+d)", short_stat_name[attr], val);
520	}
521	}
522	if (op->stats.exp)
523	sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
524	if (op->stats.wc)
525	sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc);
526	if (op->stats.dam)
527	sprintf (buf + strlen (buf), "(dam%+d)", op->stats.dam);
528	if (op->stats.ac)
529	sprintf (buf + strlen (buf), "(ac%+d)", op->stats.ac);
530		506
		507	if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp);
		508	if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
		509	if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
		510	if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
		511
531	strcat (buf, describe_resistance (op, 0));	512	buf << describe_resistance (op, 0);
532		513
533	if (op->stats.food != 0)	514	if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
534	sprintf (buf + strlen (buf), "(sustenance%+d)", op->stats.food);	515	if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
535	/* else if (op->stats.food < 0)	516	if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
536	sprintf(buf+strlen(buf), "(hunger%+d)", op->stats.food); */	517	if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
537	if (op->stats.grace)	518	if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
538	sprintf (buf + strlen (buf), "(grace%+d)", op->stats.grace);
539	if (op->stats.sp && op->type != SKILL)
540	sprintf (buf + strlen (buf), "(magic%+d)", op->stats.sp);
541	if (op->stats.hp)
542	sprintf (buf + strlen (buf), "(regeneration%+d)", op->stats.hp);
543	if (op->stats.luck)
544	sprintf (buf + strlen (buf), "(luck%+d)", op->stats.luck);
545	if (QUERY_FLAG (op, FLAG_LIFESAVE))
546	strcat (buf, "(lifesaving)");
547	if (QUERY_FLAG (op, FLAG_REFL_SPELL))
548	strcat (buf, "(reflect spells)");
549	if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
550	strcat (buf, "(reflect missiles)");
551	if (QUERY_FLAG (op, FLAG_STEALTH))
552	strcat (buf, "(stealth)");
553	/* Shorten some of the names, so they appear better in the windows */
554	len = strlen (buf);
555	DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);
556	DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF);
557	DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
558		519
559	/* if(op->item_power)	520	if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
560	sprintf(buf+strlen(buf), "(item_power %+d)",op->item_power);	521	if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
561	*/	522	if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
562	if (buf[0] == 0 && op->type != SKILL)	523	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
563	strcpy (buf, "of adornment");
564		524
		525	buf.add_paths ("Attuned" , op->path_attuned);
		526	buf.add_paths ("Repelled", op->path_repelled);
		527	buf.add_paths ("Denied" , op->path_denied);
		528
		529	if (buf.empty ())
		530	buf << "of adornment";
		531	}
565		532
566	return buf;	533	return buf;
567	}	534	}
568		535
569	/*	536	/*
…		…
571	* contain any information about object status (worn/cursed/etc.)	538	* contain any information about object status (worn/cursed/etc.)
572	*/	539	*/
573	const char *	540	const char *
574	query_short_name (const object *op)	541	query_short_name (const object *op)
575	{	542	{
576	static char buf[HUGE_BUF];
577	char buf2[HUGE_BUF];
578	int len = 0;
579
580	if (op->name == NULL)	543	if (op->name == 0)
581	return "(null)";	544	return "(null)";
582		545
583	if (!op->nrof && !op->weight && !op->title && !is_magical (op))	546	if (!op->nrof
		547	&& !op->weight
		548	&& !op->title
		549	&& !is_magical (op)
		550	&& op->slaying != shstr_money)
584	return op->name; /* To speed things up (or make things slower?) */	551	return op->name; /* To speed things up (or make things slower?) */
585		552
586	if (op->nrof <= 1)	553	static dynbuf_text buf; buf.clear ();
587	safe_strcat (buf, op->name, &len, HUGE_BUF);	554
588	else	555	buf << (op->nrof <= 1 ? op->name : op->name_pl);
589	safe_strcat (buf, op->name_pl, &len, HUGE_BUF);
590		556
591	if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))	557	if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
592	{	558	buf << ' ' << op->title;
593	safe_strcat (buf, " ", &len, HUGE_BUF);
594	safe_strcat (buf, op->title, &len, HUGE_BUF);
595	}
596		559
597	switch (op->type)	560	switch (op->type)
598	{	561	{
599	case SPELLBOOK:	562	case SPELLBOOK:
600	case SCROLL:	563	case SCROLL:
601	case WAND:	564	case WAND:
602	case ROD:	565	case ROD:
603	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	566	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))
		567	{
		568	if (!op->title)
		569	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
		570
		571	if (op->type != SPELLBOOK)
		572	buf.printf (" (lvl %d)", op->level);
		573	}
		574	break;
		575
		576	case ALTAR:
		577	case TRIGGER_ALTAR:
		578	case IDENTIFY_ALTAR:
		579	if (op->slaying == shstr_money)
604	{	580	{
605	if (!op->title)	581	bool wrap = !!buf.size ();
606	{	582
607	safe_strcat (buf, " of ", &len, HUGE_BUF);	583	if (wrap) buf << " [";
608	if (op->inv)	584
609	safe_strcat (buf, op->inv->name, &len, HUGE_BUF);	585	archetype *coin = 0;
		586
		587	for (char const const c = coins; *coins; ++c)
		588	if ((coin = archetype::find (*c)))
		589	if (op->stats.food % coin->value == 0)
610	else	590	break;
611	LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);	591
612	}	592	sint32 coins = op->stats.food / coin->value;
613	if (op->type != SPELLBOOK)	593
614	{	594	buf.printf ("drop %d %s", coins, coins == 1 ? &coin->name : &coin->name_pl);
615	sprintf (buf2, " (lvl %d)", op->level);	595
616	safe_strcat (buf, buf2, &len, HUGE_BUF);	596	if (wrap) buf << ']';
617	}
618	}	597	}
619	break;	598	break;
620		599
621	case SKILL:	600	case SKILL:
622	case AMULET:	601	case AMULET:
623	case RING:	602	case RING:
624	if (!op->title)	603	if (!op->title)
625	{	604	{
626	/* If ring has a title, full description isn't so useful */	605	/* If ring has a title, full description isn't so useful */
627	char *s = ring_desc (op);	606	const char *s = ring_desc (op);
628		607
629	if (s[0])	608	if (s && *s)
630	{	609	buf << " " << s;
631	safe_strcat (buf, " ", &len, HUGE_BUF);
632	safe_strcat (buf, s, &len, HUGE_BUF);
633	}
634	}	610	}
635	break;	611	break;
		612
636	default:	613	default:
637	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))	614	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))
638	{
639	sprintf (buf2, " %+d", op->magic);	615	buf.printf (" %+d", op->magic);
640	safe_strcat (buf, buf2, &len, HUGE_BUF);
641	}
642	}	616	}
		617
643	return buf;	618	return buf;
644	}	619	}
645		620
646	/*	621	/*
647	* query_name(object) returns a character pointer pointing to a static	622	* query_name(object) returns a character pointer pointing to a static
…		…
652	* overwritten. This may be a bad thing (it may be easier to assume the value	627	* overwritten. This may be a bad thing (it may be easier to assume the value
653	* returned is good forever.) However, it makes printing statements that	628	* returned is good forever.) However, it makes printing statements that
654	* use several names much easier (don't need to store them to temp variables.)	629	* use several names much easier (don't need to store them to temp variables.)
655	*	630	*
656	*/	631	*/
657	char *	632	const char *
658	query_name (const object *op)	633	query_name (const object *op)
659	{	634	{
660	static char buf[5][HUGE_BUF];	635	int len = 0;
		636	static dynbuf_text bufs[5];
661	static int use_buf = 0;	637	static int use_buf = 0;
662	int len = 0;
663
664	#ifdef NEW_MATERIAL_CODE
665	materialtype_t *mt;
666	#endif
667		638
668	use_buf++;	639	use_buf++;
669	use_buf %= 5;	640	use_buf %= 5;
670		641
671	#ifdef NEW_MATERIAL_CODE	642	dynbuf_text &buf = bufs [use_buf];
		643	buf.clear ();
		644
672	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname)	645	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname)
673	{
674	mt = name_to_material (op->materialname);	646	if (materialtype_t *mt = name_to_material (op->materialname))
675	if (mt)	647	buf << mt->description << ' ';
676	{
677	safe_strcat (buf[use_buf], mt->description, &len, HUGE_BUF);
678	safe_strcat (buf[use_buf], " ", &len, HUGE_BUF);
679	}
680	}
681	#endif
682		648
683	safe_strcat (buf[use_buf], query_short_name (op), &len, HUGE_BUF);	649	buf << query_short_name (op);
684		650
685	if (QUERY_FLAG (op, FLAG_INV_LOCKED))	651	if (QUERY_FLAG (op, FLAG_INV_LOCKED))
686	safe_strcat (buf[use_buf], " *", &len, HUGE_BUF);	652	buf << " *";
687	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))	653	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
688	safe_strcat (buf[use_buf], " (open)", &len, HUGE_BUF);	654	buf << " (open)";
689		655
690	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	656	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
691	{	657	{
692	if (QUERY_FLAG (op, FLAG_DAMNED))	658	if (QUERY_FLAG (op, FLAG_DAMNED))
693	safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);	659	buf << " (damned)";
694	else if (QUERY_FLAG (op, FLAG_CURSED))	660	else if (QUERY_FLAG (op, FLAG_CURSED))
695	safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);	661	buf << " (cursed)";
696	}	662	}
		663
697	/* Basically, if the object is known magical (detect magic spell on it),	664	/* Basically, if the object is known magical (detect magic spell on it),
698	* and it isn't identified, print out the fact that	665	* and it isn't identified, print out the fact that
699	* it is magical. Assume that the detect magical spell will only set	666	* it is magical. Assume that the detect magical spell will only set
700	* KNOWN_MAGICAL if the item actually is magical.	667	* KNOWN_MAGICAL if the item actually is magical.
701	*	668	*
702	* Changed in V 0.91.4 - still print that the object is magical even	669	* Changed in V 0.91.4 - still print that the object is magical even
703	* if it has been applied. Equipping an item does not tell full	670	* if it has been applied. Equipping an item does not tell full
704	* abilities, especially for artifact items.	671	* abilities, especially for artifact items.
705	*/	672	*/
706	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))	673	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
707	safe_strcat (buf[use_buf], " (magic)", &len, HUGE_BUF);	674	buf << " (magic)";
708		675
709	#if 0	676	#if 0
710	/* item_power will be returned in desribe_item - it shouldn't really	677	/* item_power will be returned in desribe_item - it shouldn't really
711	* be returned in the name.	678	* be returned in the name.
712	*/	679	*/
…		…
717		684
718	if (QUERY_FLAG (op, FLAG_APPLIED))	685	if (QUERY_FLAG (op, FLAG_APPLIED))
719	{	686	{
720	switch (op->type)	687	switch (op->type)
721	{	688	{
722	case BOW:	689	case BOW:
723	case WAND:	690	case WAND:
724	case ROD:	691	case ROD:
725	case HORN:	692	case HORN:
726	safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF);	693	buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
727	break;	694	break;
728	case WEAPON:	695	case WEAPON:
729	safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF);	696	buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");
730	break;	697	break;
731	case ARMOUR:	698	case ARMOUR:
732	case HELMET:	699	case HELMET:
733	case SHIELD:	700	case SHIELD:
734	case RING:	701	case RING:
735	case BOOTS:	702	case BOOTS:
736	case GLOVES:	703	case GLOVES:
737	case AMULET:	704	case AMULET:
738	case GIRDLE:	705	case GIRDLE:
739	case BRACERS:	706	case BRACERS:
740	case CLOAK:	707	case CLOAK:
741	safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);	708	buf << " (worn)";
742	break;	709	break;
743	case CONTAINER:	710	case CONTAINER:
744	safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);	711	buf << " (active)";
745	break;	712	break;
746	case SKILL:	713	case SKILL:
747	default:	714	default:
748	safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);	715	buf << " (applied)";
749	}	716	}
750	}	717	}
		718
751	if (QUERY_FLAG (op, FLAG_UNPAID))	719	if (QUERY_FLAG (op, FLAG_UNPAID))
752	safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);	720	buf << " (unpaid)";
753		721
754	return buf[use_buf];	722	return buf;
755	}	723	}
756		724
757	/*	725	/*
758	* query_base_name(object) returns a character pointer pointing to a static	726	* query_base_name(object) returns a character pointer pointing to a static
759	* buffer which contains a verbose textual representation of the name	727	* buffer which contains a verbose textual representation of the name
…		…
764	* If plural is set, we generate the plural name of this.	732	* If plural is set, we generate the plural name of this.
765	*/	733	*/
766	const char *	734	const char *
767	query_base_name (const object *op, int plural)	735	query_base_name (const object *op, int plural)
768	{	736	{
769	static char buf[MAX_BUF], buf2[MAX_BUF];
770	int len;
771	materialtype_t *mt;
772
773	if ((!plural && !op->name) \|\| (plural && !op->name_pl))	737	if ((!plural && !op->name) \|\| (plural && !op->name_pl))
774	return "(null)";	738	return "(null)";
775		739
776	if (!op->nrof && !op->weight && !op->title && !is_magical (op))	740	if (!op->nrof && !op->weight && !op->title && !is_magical (op))
777	return op->name; /* To speed things up (or make things slower?) */	741	return op->name; /* To speed things up (or make things slower?) */
778		742
		743	static dynbuf_text buf; buf.clear ();
		744
779	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname)	745	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname)
780	mt = name_to_material (op->materialname);	746	if (materialtype_t *mt = name_to_material (op->materialname))
		747	if (op->arch->materialname != mt->name)
		748	buf << mt->description << ' ';
781		749
782	#ifdef NEW_MATERIAL_CODE	750	buf << (plural ? op->name_pl : op->name);
783	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname && mt &&
784	op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))
785	{
786	strcpy (buf, mt->description);
787	len = strlen (buf);
788	safe_strcat (buf, " ", &len, MAX_BUF);
789	if (!plural)
790	safe_strcat (buf, op->name, &len, MAX_BUF);
791	else
792	safe_strcat (buf, op->name_pl, &len, MAX_BUF);
793	}
794	else
795	{
796	#endif
797	if (!plural)
798	strcpy (buf, op->name);
799	else
800	strcpy (buf, op->name_pl);
801	len = strlen (buf);
802	#ifdef NEW_MATERIAL_CODE
803	}
804	#endif
805		751
806	if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))	752	if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
807	{	753	buf << ' ' << op->title;
808	safe_strcat (buf, " ", &len, MAX_BUF);
809	safe_strcat (buf, op->title, &len, MAX_BUF);
810	}
811		754
812	switch (op->type)	755	switch (op->type)
813	{	756	{
814	case SPELLBOOK:	757	case SPELLBOOK:
815	case SCROLL:	758	case SCROLL:
816	case WAND:	759	case WAND:
817	case ROD:	760	case ROD:
818	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	761	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))
819	{	762	{
820	if (!op->title)	763	if (!op->title)
821	{	764	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
822	safe_strcat (buf, " of ", &len, MAX_BUF);	765
823	if (op->inv)
824	safe_strcat (buf, op->inv->name, &len, MAX_BUF);
825	else
826	LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
827	}
828	if (op->type != SPELLBOOK)	766	if (op->type != SPELLBOOK)
829	{
830	sprintf (buf2, " (lvl %d)", op->level);	767	buf.printf (" (lvl %d)", op->level);
831	safe_strcat (buf, buf2, &len, MAX_BUF);
832	}
833	}	768	}
834	break;	769	break;
835		770
836		771
837	case SKILL:	772	case SKILL:
838	case AMULET:	773	case AMULET:
839	case RING:	774	case RING:
840	if (!op->title)	775	if (!op->title)
841	{	776	{
842	/* If ring has a title, full description isn't so useful */	777	/* If ring has a title, full description isn't so useful */
843	char *s = ring_desc (op);	778	const char *s = ring_desc (op);
844		779
845	if (s[0])	780	if (s && *s)
846	{	781	buf << ' ' << s;
847	safe_strcat (buf, " ", &len, MAX_BUF);
848	safe_strcat (buf, s, &len, MAX_BUF);
849	}
850	}	782	}
851	break;	783	break;
		784
852	default:	785	default:
853	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))	786	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))
854	{	787	buf.printf (" %+d", op->magic);
855	sprintf (buf + strlen (buf), " %+d", op->magic);
856	}
857	}	788	}
		789
858	return buf;	790	return buf;
859	}	791	}
860		792
861	/* Break this off from describe_item - that function was way	793	/* Break this off from describe_item - that function was way
862	* too long, making it difficult to read. This function deals	794	* too long, making it difficult to read. This function deals
863	* with describing the monsters & players abilities. It should only	795	* with describing the monsters & players abilities. It should only
864	* be called with monster & player objects. Returns a description	796	* be called with monster & player objects. Returns a description
865	* in a static buffer.	797	* in a static buffer.
866	*/	798	*/
867
868	static char *	799	static const char *
869	describe_monster (const object *op)	800	describe_monster (const object *op)
870	{	801	{
871	char buf[MAX_BUF];	802	static dynbuf_text buf; buf.clear ();
872	static char retbuf[VERY_BIG_BUF];
873	int i;
874
875	retbuf[0] = '\0';
876		803
877	/* Note that the resolution this provides for players really isn't	804	/* Note that the resolution this provides for players really isn't
878	* very good. Any player with a speed greater than .67 will	805	* very good. Any player with a speed greater than .67 will
879	* fall into the 'lightning fast movement' category.	806	* fall into the 'lightning fast movement' category.
880	*/	807	*/
881	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	808	if (op->has_active_speed ())
882	{
883	switch ((int) ((FABS (op->speed)) * 15))	809	switch ((int) ((FABS (op->speed)) * 15))
884	{	810	{
885	case 0:	811	case 0:
886	strcat (retbuf, "(very slow movement)");	812	buf << "(very slow movement";
887	break;	813	break;
888	case 1:	814	case 1:
889	strcat (retbuf, "(slow movement)");	815	buf << "(slow movement)";
890	break;	816	break;
891	case 2:	817	case 2:
892	strcat (retbuf, "(normal movement)");	818	buf << "(normal movement)";
893	break;	819	break;
894	case 3:	820	case 3:
895	case 4:	821	case 4:
896	strcat (retbuf, "(fast movement)");	822	buf << "(fast movement)";
897	break;	823	break;
898	case 5:	824	case 5:
899	case 6:	825	case 6:
900	strcat (retbuf, "(very fast movement)");	826	buf << "(very fast movement)";
901	break;	827	break;
902	case 7:	828	case 7:
903	case 8:	829	case 8:
904	case 9:	830	case 9:
905	case 10:	831	case 10:
906	strcat (retbuf, "(extremely fast movement)");	832	buf << "(extremely fast movement)";
907	break;	833	break;
908	default:	834	default:
909	strcat (retbuf, "(lightning fast movement)");	835	buf << "(lightning fast movement)";
910	break;	836	break;
911	}	837	}
912	}	838
913	if (QUERY_FLAG (op, FLAG_UNDEAD))	839	if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)";
914	strcat (retbuf, "(undead)");
915	if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE))	840	if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)";
916	strcat (retbuf, "(see invisible)");	841	if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)";
917	if (QUERY_FLAG (op, FLAG_USE_WEAPON))	842	if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)";
918	strcat (retbuf, "(wield weapon)");	843	if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)";
919	if (QUERY_FLAG (op, FLAG_USE_BOW))	844	if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)";
920	strcat (retbuf, "(archer)");	845	if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)";
921	if (QUERY_FLAG (op, FLAG_USE_ARMOUR))	846	if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)";
922	strcat (retbuf, "(wear armour)");
923	if (QUERY_FLAG (op, FLAG_USE_RING))
924	strcat (retbuf, "(wear ring)");
925	if (QUERY_FLAG (op, FLAG_USE_SCROLL))
926	strcat (retbuf, "(read scroll)");
927	if (QUERY_FLAG (op, FLAG_USE_RANGE))
928	strcat (retbuf, "(fires wand/rod/horn)");
929	if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL))	847	if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)";
930	strcat (retbuf, "(skill user)");	848	if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)";
931	if (QUERY_FLAG (op, FLAG_CAST_SPELL))	849	if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)";
932	strcat (retbuf, "(spellcaster)");
933	if (QUERY_FLAG (op, FLAG_FRIENDLY))
934	strcat (retbuf, "(friendly)");
935	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE))	850	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)";
936	strcat (retbuf, "(unaggressive)");	851	if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)";
937	if (QUERY_FLAG (op, FLAG_HITBACK))	852	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)";
938	strcat (retbuf, "(hitback)");	853
939	if (QUERY_FLAG (op, FLAG_STEALTH))
940	strcat (retbuf, "(stealthy)");
941	if (op->randomitems != NULL)	854	if (op->randomitems)
942	{	855	{
943	treasure *t;
944	int first = 1;	856	bool first = 1;
945		857
946	for (t = op->randomitems->items; t != NULL; t = t->next)	858	for (treasure *t = op->randomitems->items; t; t = t->next)
947	if (t->item && (t->item->clone.type == SPELL))	859	if (t->item && t->item->type == SPELL)
948	{	860	{
949	if (first)	861	if (first)
950	{	862	buf << "(Spell abilities:)";
		863
951	first = 0;	864	first = 0;
952	strcat (retbuf, "(Spell abilities:)");	865
953	}	866	buf << '(' << t->item->object::name << ')';
954	strcat (retbuf, "(");
955	strcat (retbuf, t->item->clone.name);
956	strcat (retbuf, ")");
957	}	867	}
958	}	868	}
		869
959	if (op->type == PLAYER)	870	if (op->type == PLAYER)
960	{	871	{
961	if (op->contr->digestion)	872	if (op->contr->digestion)
962	{
963	if (op->contr->digestion != 0)
964	sprintf (buf, "(sustenance%+d)", op->contr->digestion);	873	buf.printf ("(sustenance%+d)", op->contr->digestion);
965	strcat (retbuf, buf);	874
966	}
967	if (op->contr->gen_grace)	875	if (op->contr->gen_grace)
968	{
969	sprintf (buf, "(grace%+d)", op->contr->gen_grace);	876	buf.printf ("(grace%+d)", op->contr->gen_grace);
970	strcat (retbuf, buf);	877
971	}
972	if (op->contr->gen_sp)	878	if (op->contr->gen_sp)
973	{
974	sprintf (buf, "(magic%+d)", op->contr->gen_sp);	879	buf.printf ("(magic%+d)", op->contr->gen_sp);
975	strcat (retbuf, buf);	880
976	}
977	if (op->contr->gen_hp)	881	if (op->contr->gen_hp)
978	{
979	sprintf (buf, "(regeneration%+d)", op->contr->gen_hp);	882	buf.printf ("(regeneration%+d)", op->contr->gen_hp);
980	strcat (retbuf, buf);	883
981	}
982	if (op->stats.luck)	884	if (op->stats.luck)
983	{
984	sprintf (buf, "(luck%+d)", op->stats.luck);	885	buf.printf ("(luck%+d)", op->stats.luck);
985	strcat (retbuf, buf);
986	}
987	}	886	}
988		887
989	/* describe attacktypes */	888	/* describe attacktypes */
990	if (is_dragon_pl (op))	889	if (is_dragon_pl (op))
991	{	890	{
…		…
993	* Break apart the for loop - move the comparison checking down -	892	* Break apart the for loop - move the comparison checking down -
994	* this makes it more readable.	893	* this makes it more readable.
995	*/	894	*/
996	object *tmp;	895	object *tmp;
997		896
998	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	897	for (tmp = op->inv; tmp; tmp = tmp->below)
999	if (tmp->type == SKILL && !strcmp (tmp->name, "clawing"))	898	if (tmp->type == SKILL && tmp->name == shstr_clawing)
1000	break;	899	break;
1001		900
1002	if (tmp && tmp->attacktype != 0)	901	if (tmp && tmp->attacktype)
1003	{	902	buf.add_abilities ("Claws", tmp->attacktype);
1004	DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws");
1005	}
1006	else	903	else
1007	{	904	buf.add_abilities ("Attacks", op->attacktype);
1008	DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1009	}
1010	}	905	}
1011	else	906	else
1012	{	907	buf.add_abilities ("Attacks", op->attacktype);
1013	DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");	908
1014	}	909	buf.add_paths ("Attuned" , op->path_attuned);
1015	DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");	910	buf.add_paths ("Repelled", op->path_repelled);
1016	DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");	911	buf.add_paths ("Denied" , op->path_denied);
1017	DESCRIBE_PATH (retbuf, op->path_denied, "Denied");	912
1018	for (i = 0; i < NROFATTACKS; i++)	913	for (int i = 0; i < NROFATTACKS; i++)
1019	{
1020	if (op->resist[i])	914	if (op->resist[i])
1021	{
1022	sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);	915	buf.printf ("(%s %+d)", resist_plus[i], op->resist[i]);
1023	strcat (retbuf, buf);	916
1024	}
1025	}
1026	return retbuf;	917	return buf;
1027	}	918	}
1028
1029		919
1030	/*	920	/*
1031	* Returns a pointer to a static buffer which contains a	921	* Returns a pointer to a static buffer which contains a
1032	* description of the given object.	922	* description of the given object.
1033	* If it is a monster, lots of information about its abilities	923	* If it is a monster, lots of information about its abilities
…		…
1051	*	941	*
1052	* Add 'owner' who is the person examining this object.	942	* Add 'owner' who is the person examining this object.
1053	* owner can be null if no one is being associated with this	943	* owner can be null if no one is being associated with this
1054	* item (eg, debug dump or the like)	944	* item (eg, debug dump or the like)
1055	*/	945	*/
1056		946	const char *
1057	char *
1058	describe_item (const object op, object owner)	947	describe_item (const object op, object owner)
1059	{	948	{
1060	char buf[MAX_BUF];	949	if (QUERY_FLAG (op, FLAG_MONSTER) \|\| op->type == PLAYER)
1061	static char retbuf[VERY_BIG_BUF];	950	return describe_monster (op);
		951
		952	static dynbuf_text buf; buf.clear ();
1062	int identified, i;	953	int identified, i;
1063		954
1064	retbuf[0] = '\0';
1065	if (QUERY_FLAG (op, FLAG_MONSTER) \|\| op->type == PLAYER)
1066	{
1067	return describe_monster (op);
1068	}
1069	/* figure this out once, instead of making multiple calls to need_identify.	955	/* figure this out once, instead of making multiple calls to need_identify.
1070	* also makes the code easier to read.	956	* also makes the code easier to read.
1071	*/	957	*/
1072	if (!need_identify (op) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED))	958	identified = !need_identify (op) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED);
1073	identified = 1;	959	if (!identified)
1074	else	960	buf << "(unidentified)";
1075	{	961
1076	strcpy (retbuf, "(unidentified)");
1077	identified = 0;
1078	}
1079	switch (op->type)	962	switch (op->type)
1080	{	963	{
1081	case BOW:	964	case BOW:
1082	case ARROW:	965	case ARROW:
1083	case WAND:	966	case WAND:
1084	case ROD:	967	case ROD:
1085	case HORN:	968	case HORN:
1086	case WEAPON:	969	case WEAPON:
1087	case ARMOUR:	970	case ARMOUR:
1088	case HELMET:	971	case HELMET:
1089	case SHIELD:	972	case SHIELD:
1090	case BOOTS:	973	case BOOTS:
1091	case GLOVES:	974	case GLOVES:
1092	case GIRDLE:	975	case GIRDLE:
1093	case BRACERS:	976	case BRACERS:
1094	case CLOAK:	977	case CLOAK:
1095	case SKILL_TOOL:	978	case SKILL_TOOL:
1096	break; /* We have more information to do below this switch */	979	break; /* We have more information to do below this switch */
1097		980
1098	case POWER_CRYSTAL:	981	case POWER_CRYSTAL:
1099	if (op->stats.maxsp > 1000)	982	if (op->stats.maxsp > 1000)
1100	{ /higher capacity crystals /	983	{ /higher capacity crystals /
1101	i = (op->stats.maxsp % 100) / 10;	984	i = (op->stats.maxsp % 1000) / 100;
		985
1102	if (i)	986	if (i)
1103	snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 100, i);	987	buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);
1104	else	988	else
1105	snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 100);	989	buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000);
1106	}	990	}
1107	else	991	else
1108	snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp);	992	buf.printf ("(capacity %d). It is ", op->stats.maxsp);
1109	strcat (retbuf, buf);	993
1110	i = (op->stats.sp * 10) / op->stats.maxsp;	994	i = (op->stats.sp * 10) / op->stats.maxsp;
1111	if (op->stats.sp == 0)	995	if (op->stats.sp == 0)
1112	strcat (retbuf, "empty.");	996	buf << "empty.";
1113	else if (i == 0)	997	else if (i == 0)
1114	strcat (retbuf, "almost empty.");	998	buf << "almost empty.";
1115	else if (i < 3)	999	else if (i < 3)
1116	strcat (retbuf, "partially filled.");	1000	buf << "partially filled.";
1117	else if (i < 6)	1001	else if (i < 6)
1118	strcat (retbuf, "half full.");	1002	buf << "half full.";
1119	else if (i < 9)	1003	else if (i < 9)
1120	strcat (retbuf, "well charged.");	1004	buf << "well charged.";
1121	else if (op->stats.sp == op->stats.maxsp)	1005	else if (op->stats.sp == op->stats.maxsp)
1122	strcat (retbuf, "fully charged.");	1006	buf << "fully charged.";
1123	else	1007	else
1124	strcat (retbuf, "almost full.");	1008	buf << "almost full.";
1125	break;	1009	break;
		1010
1126	case FOOD:	1011	case FOOD:
1127	case FLESH:	1012	case FLESH:
1128	case DRINK:	1013	case DRINK:
1129	if (identified \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	1014	if (identified \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1130	{	1015	{
1131	sprintf (buf, "(food+%d)", op->stats.food);	1016	buf.printf ("(food+%d)", op->stats.food);
1132	strcat (retbuf, buf);
1133		1017
1134	if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))	1018	if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1135	{
1136	sprintf (buf, "(%s metabolism)", change_resist_msg[op->last_eat]);	1019	buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1137	strcat (retbuf, buf);
1138	}
1139		1020
1140	if (!QUERY_FLAG (op, FLAG_CURSED))	1021	if (!QUERY_FLAG (op, FLAG_CURSED))
1141	{	1022	{
1142	if (op->stats.hp)	1023	if (op->stats.hp) buf << "(heals)";
1143	strcat (retbuf, "(heals)");
1144	if (op->stats.sp)
1145	strcat (retbuf, "(spellpoint regen)");	1024	if (op->stats.sp) buf << "(spellpoint regen)";
1146	}	1025	}
1147	else	1026	else
1148	{	1027	{
1149	if (op->stats.hp)	1028	if (op->stats.hp) buf << "(damages)";
1150	strcat (retbuf, "(damages)");
1151	if (op->stats.sp)
1152	strcat (retbuf, "(spellpoint depletion)");	1029	if (op->stats.sp) buf << "(spellpoint depletion)";
1153	}	1030	}
1154	}	1031	}
1155	break;	1032	break;
1156		1033
1157
1158	case SKILL:	1034	case SKILL:
1159	case RING:	1035	case RING:
1160	case AMULET:	1036	case AMULET:
1161	if (op->item_power)	1037	if (op->item_power)
1162	{
1163	sprintf (buf, "(item_power %+d)", op->item_power);	1038	buf.printf ("(item_power %+d)", op->item_power);
1164	strcat (retbuf, buf);	1039
1165	}
1166	if (op->title)	1040	if (op->title)
1167	strcat (retbuf, ring_desc (op));	1041	buf << ring_desc (op);
		1042
1168	return retbuf;	1043	return buf;
1169		1044
1170	default:	1045	default:
1171	return retbuf;	1046	return buf;
1172	}	1047	}
1173		1048
1174	/* Down here, we more further describe equipment type items.	1049	/* Down here, we more further describe equipment type items.
1175	* only describe them if they have been identified or the like.	1050	* only describe them if they have been identified or the like.
1176	*/	1051	*/
1177	if (identified \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	1052	if (identified \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1178	{	1053	{
1179	int attr, val;	1054	int attr, val;
1180		1055
1181	for (attr = 0; attr < NUM_STATS; attr++)	1056	for (attr = 0; attr < NUM_STATS; attr++)
1182	{	1057	if ((val = op->stats.stat (attr)))
1183	if ((val = get_attr_value (&(op->stats), attr)) != 0)
1184	{
1185	sprintf (buf, "(%s%+d)", short_stat_name[attr], val);	1058	buf.printf ("(%s%+d)", short_stat_name[attr], val);
1186	strcat (retbuf, buf);
1187	}
1188	}
1189		1059
1190	if (op->stats.exp)	1060	if (op->stats.exp)
1191	{
1192	sprintf (buf, "(speed %+lld)", (long long) op->stats.exp);	1061	buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1193	strcat (retbuf, buf);
1194	}
1195
1196		1062
1197	switch (op->type)	1063	switch (op->type)
1198	{	1064	{
1199	case BOW:	1065	case BOW:
1200	case ARROW:	1066	case ARROW:
1201	case GIRDLE:	1067	case GIRDLE:
1202	case HELMET:	1068	case HELMET:
1203	case SHIELD:	1069	case SHIELD:
1204	case BOOTS:	1070	case BOOTS:
1205	case GLOVES:	1071	case GLOVES:
1206	case WEAPON:	1072	case WEAPON:
1207	case SKILL:	1073	case SKILL:
1208	case RING:	1074	case RING:
1209	case AMULET:	1075	case AMULET:
1210	case ARMOUR:	1076	case ARMOUR:
1211	case BRACERS:	1077	case BRACERS:
1212	case FORCE:	1078	case FORCE:
1213	case CLOAK:	1079	case CLOAK:
1214	if (op->stats.wc)	1080	if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
1215	{	1081	if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
1216	sprintf (buf, "(wc%+d)", op->stats.wc);	1082	if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
1217	strcat (retbuf, buf);	1083
1218	}
1219	if (op->stats.dam)
1220	{
1221	sprintf (buf, "(dam%+d)", op->stats.dam);
1222	strcat (retbuf, buf);
1223	}
1224	if (op->stats.ac)
1225	{
1226	sprintf (buf, "(ac%+d)", op->stats.ac);
1227	strcat (retbuf, buf);
1228	}
1229	if ((op->type == WEAPON \|\| op->type == BOW) && op->level > 0)	1084	if ((op->type == WEAPON \|\| op->type == BOW) && op->level > 0)
1230	{
1231	sprintf (buf, "(improved %d/%d)", op->last_eat, op->level);	1085	buf.printf ("(improved %d/%d)", op->last_eat, op->level);
1232	strcat (retbuf, buf);	1086
1233	}
1234	break;	1087	break;
1235		1088
1236	default:	1089	default:
1237	break;	1090	break;
1238	}	1091	}
1239	if (QUERY_FLAG (op, FLAG_XRAYS))	1092
1240	strcat (retbuf, "(xray-vision)");	1093	if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)";
1241	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))	1094	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)";
1242	strcat (retbuf, "(infravision)");
1243		1095
1244	/* levitate was what is was before, so we'll keep it */	1096	/* levitate was what is was before, so we'll keep it */
1245	if (op->move_type & MOVE_FLY_LOW)	1097	if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1246	strcat (retbuf, "(levitate)");
1247
1248	if (op->move_type & MOVE_FLY_HIGH)	1098	if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1249	strcat (retbuf, "(fly)");
1250
1251	if (op->move_type & MOVE_SWIM)	1099	if (op->move_type & MOVE_SWIM) buf << "(swim)";
1252	strcat (retbuf, "(swim)");
1253		1100
1254	/* walking is presumed as 'normal', so doesn't need mentioning */	1101	/* walking is presumed as 'normal', so doesn't need mentioning */
1255		1102
1256	if (op->item_power)	1103	if (op->item_power)
1257	{
1258	sprintf (buf, "(item_power %+d)", op->item_power);	1104	buf.printf ("(item_power %+d)", op->item_power);
1259	strcat (retbuf, buf);
1260	}
1261	} /* End if identified or applied */	1105	} /* End if identified or applied */
1262		1106
1263	/* This blocks only deals with fully identified object.	1107	/* This blocks only deals with fully identified object.
1264	* it is intentional that this is not an 'else' from a above -	1108	* it is intentional that this is not an 'else' from a above -
1265	* in this way, information is added.	1109	* in this way, information is added.
…		…
1268	{	1112	{
1269	int more_info = 0;	1113	int more_info = 0;
1270		1114
1271	switch (op->type)	1115	switch (op->type)
1272	{	1116	{
1273	case ROD: /* These use stats.sp for spell selection and stats.food */	1117	case ROD: /* These use stats.sp for spell selection and stats.food */
1274	case HORN: /* and stats.hp for spell-point regeneration... */	1118	case HORN: /* and stats.hp for spell-point regeneration... */
1275	case BOW:	1119	case BOW:
1276	case ARROW:	1120	case ARROW:
1277	case WAND:	1121	case WAND:
1278	case FOOD:	1122	case FOOD:
1279	case FLESH:	1123	case FLESH:
1280	case DRINK:	1124	case DRINK:
1281	more_info = 0;	1125	more_info = 0;
1282	break;	1126	break;
1283		1127
1284	/* Armor type objects */	1128	/* Armor type objects */
1285	case ARMOUR:	1129	case ARMOUR:
1286	case HELMET:	1130	case HELMET:
1287	case SHIELD:	1131	case SHIELD:
1288	case BOOTS:	1132	case BOOTS:
1289	case GLOVES:	1133	case GLOVES:
1290	case GIRDLE:	1134	case GIRDLE:
1291	case BRACERS:	1135	case BRACERS:
1292	case CLOAK:	1136	case CLOAK:
1293	if (ARMOUR_SPEED (op))	1137	if (ARMOUR_SPEED (op)) buf.printf ("(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1294	{	1138	if (ARMOUR_SPELLS (op)) buf.printf ("(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1295	sprintf (buf, "(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1296	strcat (retbuf, buf);
1297	}
1298	if (ARMOUR_SPELLS (op))
1299	{
1300	sprintf (buf, "(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1301	strcat (retbuf, buf);
1302	}
1303	more_info = 1;	1139	more_info = 1;
1304	break;	1140	break;
1305		1141
1306	case WEAPON:	1142	case WEAPON:
1307	/* Calculate it the same way fix_player does so the results	1143	/* Calculate it the same way fix_player does so the results
1308	* make sense.	1144	* make sense.
1309	*/	1145	*/
1310	i = (WEAPON_SPEED (op) * 2 - op->magic) / 2;	1146	i = (WEAPON_SPEED (op) * 2 - op->magic) / 2;
1311	if (i < 0)	1147	if (i < 0)
1312	i = 0;	1148	i = 0;
1313		1149
1314	sprintf (buf, "(weapon speed %d)", i);	1150	buf.printf ("(weapon speed %d)", i);
1315	strcat (retbuf, buf);
1316	more_info = 1;	1151	more_info = 1;
1317	break;	1152	break;
1318
1319	}	1153	}
		1154
1320	if (more_info)	1155	if (more_info)
1321	{	1156	{
1322	if (op->stats.food)
1323	{
1324	if (op->stats.food != 0)
1325	sprintf (buf, "(sustenance%+d)", op->stats.food);	1157	if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
1326	strcat (retbuf, buf);
1327	}
1328	if (op->stats.grace)
1329	{
1330	sprintf (buf, "(grace%+d)", op->stats.grace);	1158	if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
1331	strcat (retbuf, buf);	1159	if (op->stats.sp) buf.printf ("(magic%+d)", op->stats.sp);
1332	}
1333	if (op->stats.sp)
1334	{
1335	sprintf (buf, "(magic%+d)", op->stats.sp);
1336	strcat (retbuf, buf);
1337	}
1338	if (op->stats.hp)
1339	{
1340	sprintf (buf, "(regeneration%+d)", op->stats.hp);	1160	if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
1341	strcat (retbuf, buf);
1342	}
1343	}	1161	}
1344		1162
1345	if (op->stats.luck)	1163	if (op->stats.luck)
1346	{
1347	sprintf (buf, "(luck%+d)", op->stats.luck);	1164	buf.printf ("(luck%+d)", op->stats.luck);
1348	strcat (retbuf, buf);	1165
1349	}
1350	if (QUERY_FLAG (op, FLAG_LIFESAVE))	1166	if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
1351	strcat (retbuf, "(lifesaving)");	1167	if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
1352	if (QUERY_FLAG (op, FLAG_REFL_SPELL))
1353	strcat (retbuf, "(reflect spells)");
1354	if (QUERY_FLAG (op, FLAG_REFL_MISSILE))	1168	if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
1355	strcat (retbuf, "(reflect missiles)");
1356	if (QUERY_FLAG (op, FLAG_STEALTH))	1169	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1357	strcat (retbuf, "(stealth)");	1170
1358	if (op->slaying != NULL && op->type != FOOD)	1171	if (op->slaying && op->type != FOOD)
1359	{
1360	sprintf (buf, "(slay %s)", &op->slaying);	1172	buf.printf ("(slay %s)", &op->slaying);
1361	strcat (retbuf, buf);	1173
1362	}	1174	buf.add_abilities ("Attacks", op->attacktype);
1363	DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1364	/* resistance on flesh is only visible for quetzals. If	1175	/* resistance on flesh is only visible for quetzals. If
1365	* non flesh, everyone can see its resistances	1176	* non flesh, everyone can see its resistances
1366	*/	1177	*/
1367	if (op->type != FLESH \|\| (owner && is_dragon_pl (owner)))	1178	if (op->type != FLESH \|\| (owner && is_dragon_pl (owner)))
1368	strcat (retbuf, describe_resistance (op, 0));	1179	buf << describe_resistance (op, 0);
1369	DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1370	DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1371	DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1372	}
1373		1180
		1181	buf.add_paths ("Attuned", op->path_attuned);
		1182	buf.add_paths ("Repelled", op->path_repelled);
		1183	buf.add_paths ("Denied", op->path_denied);
		1184	}
		1185
1374	return retbuf;	1186	return buf;
		1187	}
		1188
		1189	std::string
		1190	object::describe_item (object *who)
		1191	{
		1192	return std::string (::describe_item (this, who));
		1193	}
		1194
		1195	void
		1196	examine (object op, object tmp)
		1197	{
		1198	std::string s = tmp->describe (op);
		1199
		1200	new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
		1201	}
		1202
		1203	/*
		1204	* inventory prints object's inventory. If inv==NULL then print player's
		1205	* inventory.
		1206	* [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
		1207	*/
		1208	const char *
		1209	object::query_inventory (object who, const char indent)
		1210	{
		1211	static dynbuf_text buf; buf.clear ();
		1212
		1213	for (object *tmp = inv; tmp; tmp = tmp->below)
		1214	if (who && QUERY_FLAG (who, FLAG_WIZ))
		1215	buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp));
		1216	else if (!tmp->invisible && (type == CONTAINER \|\| QUERY_FLAG (tmp, FLAG_APPLIED)))
		1217	buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp));
		1218
		1219	if (buf.size ())
		1220	buf.printf ("%s(total weight: %s)\n", indent, query_weight (this));
		1221	else
		1222	buf.printf ("%s(empty)\n", indent);
		1223
		1224	return buf;
1375	}	1225	}
1376		1226
1377	/* Return true if the item is magical. A magical item is one that	1227	/* Return true if the item is magical. A magical item is one that
1378	* increases/decreases any abilities, provides a resistance,	1228	* increases/decreases any abilities, provides a resistance,
1379	* has a generic magical bonus, or is an artifact.	1229	* has a generic magical bonus, or is an artifact.
1380	* This function is used by detect_magic to determine if an item	1230	* This function is used by detect_magic to determine if an item
1381	* should be marked as magical.	1231	* should be marked as magical.
1382	*/	1232	*/
1383
1384	int	1233	int
1385	is_magical (const object *op)	1234	is_magical (const object *op)
1386	{	1235	{
1387	int i;	1236	int i;
1388		1237
…		…
1439	if (op->magic \|\| op->type == POWER_CRYSTAL \|\| op->type == SPELLBOOK \|\| op->type == SCROLL \|\| op->type == GIRDLE)	1288	if (op->magic \|\| op->type == POWER_CRYSTAL \|\| op->type == SPELLBOOK \|\| op->type == SCROLL \|\| op->type == GIRDLE)
1440	return 1;	1289	return 1;
1441		1290
1442	/* Check to see if it increases/decreases any stats */	1291	/* Check to see if it increases/decreases any stats */
1443	for (i = 0; i < NUM_STATS; i++)	1292	for (i = 0; i < NUM_STATS; i++)
1444	if (get_attr_value (&(op->stats), i) != 0)	1293	if (op->stats.stat (i))
1445	return 1;	1294	return 1;
1446		1295
1447	/* If it doesn't fall into any of the above categories, must	1296	/* If it doesn't fall into any of the above categories, must
1448	* be non magical.	1297	* be non magical.
1449	*/	1298	*/
…		…
1458	int	1307	int
1459	need_identify (const object *op)	1308	need_identify (const object *op)
1460	{	1309	{
1461	switch (op->type)	1310	switch (op->type)
1462	{	1311	{
1463	case RING:	1312	case RING:
1464	case WAND:	1313	case WAND:
1465	case ROD:	1314	case ROD:
1466	case HORN:	1315	case HORN:
1467	case SCROLL:	1316	case SCROLL:
1468	case SKILL:	1317	case SKILL:
1469	case SKILLSCROLL:	1318	case SKILLSCROLL:
1470	case SPELLBOOK:	1319	case SPELLBOOK:
1471	case FOOD:	1320	case FOOD:
1472	case POTION:	1321	case POTION:
1473	case BOW:	1322	case BOW:
1474	case ARROW:	1323	case ARROW:
1475	case WEAPON:	1324	case WEAPON:
1476	case ARMOUR:	1325	case ARMOUR:
1477	case SHIELD:	1326	case SHIELD:
1478	case HELMET:	1327	case HELMET:
1479	case AMULET:	1328	case AMULET:
1480	case BOOTS:	1329	case BOOTS:
1481	case GLOVES:	1330	case GLOVES:
1482	case BRACERS:	1331	case BRACERS:
1483	case GIRDLE:	1332	case GIRDLE:
1484	case CONTAINER:	1333	case CONTAINER:
1485	case DRINK:	1334	case DRINK:
1486	case FLESH:	1335	case FLESH:
1487	case INORGANIC:	1336	case INORGANIC:
1488	case CLOSE_CON:	1337	case CLOSE_CON:
1489	case CLOAK:	1338	case CLOAK:
1490	case GEM:	1339	case GEM:
1491	case POWER_CRYSTAL:	1340	case POWER_CRYSTAL:
1492	case POISON:	1341	case POISON:
1493	case BOOK:	1342	case BOOK:
1494	case SKILL_TOOL:	1343	case SKILL_TOOL:
1495	return 1;	1344	return 1;
1496	}	1345	}
		1346
1497	/* Try to track down some stuff that may show up here. Thus, the	1347	/* Try to track down some stuff that may show up here. Thus, the
1498	* archetype file can be updated, and this function removed.	1348	* archetype file can be updated, and this function removed.
1499	*/	1349	*/
1500	#if 0	1350	#if 0
1501	LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);	1351	LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
…		…
1525	{	1375	{
1526	if (op->inv && op->randomitems)	1376	if (op->inv && op->randomitems)
1527	op->title = op->inv->name;	1377	op->title = op->inv->name;
1528	else if (op->arch)	1378	else if (op->arch)
1529	{	1379	{
1530	op->name = op->arch->clone.name;	1380	op->name = op->arch->object::name;
1531	op->name_pl = op->arch->clone.name_pl;	1381	op->name_pl = op->arch->object::name_pl;
1532	}	1382	}
1533	}	1383	}
1534		1384
1535	/* If the object is on a map, make sure we update its face */	1385	/* If the object is on a map, make sure we update its face */
1536	if (op->map)	1386	if (op->map)
1537	update_object (op, UP_OBJ_FACE);	1387	update_object (op, UP_OBJ_CHANGE);
1538	else	1388	else
1539	{	1389	{
1540	pl = op->in_player ();	1390	pl = op->in_player ();
1541	if (pl)	1391	if (pl)
1542	/* A lot of the values can change from an update - might as well send	1392	/* A lot of the values can change from an update - might as well send

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/item.C (file contents): Revision 1.10 by elmex, Wed Dec 20 10:31:00 2006 UTC vs. Revision 1.42 by root, Wed Apr 9 14:36:47 2008 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.10 by elmex, Wed Dec 20 10:31:00 2006 UTC vs.
Revision 1.42 by root, Wed Apr 9 14:36:47 2008 UTC