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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.11 by elmex, Wed Dec 20 11:20:50 2006 UTC vs.
Revision 1.40 by root, Sun Sep 30 20:22:12 2007 UTC

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

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.11 by elmex, Wed Dec 20 11:20:50 2006 UTC vs.
Revision 1.40 by root, Sun Sep 30 20:22:12 2007 UTC