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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.5 by root, Tue Sep 12 18:15:34 2006 UTC vs.
Revision 1.41 by root, Thu Nov 8 19:43:23 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/common/item.C (file contents): Revision 1.5 by root, Tue Sep 12 18:15:34 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.5 by root, Tue Sep 12 18:15:34 2006 UTC vs.
Revision 1.41 by root, Thu Nov 8 19:43:23 2007 UTC