ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/item.C

Comparing deliantra/server/common/item.C (file contents):
Revision 1.14 by elmex, Wed Dec 20 14:11:42 2006 UTC vs.
Revision 1.54 by elmex, Mon Jan 12 00:17:22 2009 UTC

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

Diff Legend

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