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