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

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

Diff Legend

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

Comparing deliantra/server/common/item.C (file contents): Revision 1.19 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs. Revision 1.54 by elmex, Mon Jan 12 00:17:22 2009 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.19 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.54 by elmex, Mon Jan 12 00:17:22 2009 UTC