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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.75 by root, Fri Mar 26 14:00:28 2010 UTC vs.
Revision 1.88 by root, Wed May 12 20:40:50 2010 UTC

…		…
47	* Note that using the term 'human' may not be very accurate, humanoid	47	* Note that using the term 'human' may not be very accurate, humanoid
48	* may be better.	48	* may be better.
49	* Basically, for the use/nonuse, the code does something like:	49	* Basically, for the use/nonuse, the code does something like:
50	* "This item goes %s\n", with the use/nonuse values filling in the %s	50	* "This item goes %s\n", with the use/nonuse values filling in the %s
51	*/	51	*/
		52	// see include/object.h
52	Body_Locations body_locations[NUM_BODY_LOCATIONS] = {	53	Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
53	{KW_body_skill , "You can use it as your skill" , "It is used as a skill"},	54	{KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
54	{KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},	55	{KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
55	{KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},	56	{KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
56	{KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},	57	{KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
…		…
70	static char numbers_10[10][20] = {	71	static char numbers_10[10][20] = {
71	"zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",	72	"zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
72	"eighty", "ninety"	73	"eighty", "ninety"
73	};	74	};
74		75
75	static char levelnumbers[21][20] = {	76	static char ordnumbers[21][20] = {
76	"zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",	77	"zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
77	"eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",	78	"eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
78	"fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen",	79	"fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
79	"nineteen", "twentieth"	80	"nineteenth", "twentieth"
80	};	81	};
81		82
82	static char levelnumbers_10[11][20] = {	83	static char ordnumbers_10[11][20] = {
83	"zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",	84	"zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
84	"seventieth", "eightieth", "ninetieth"	85	"seventieth", "eightieth", "ninetieth"
85	};	86	};
86		87
87	/* The following is a large table of item types, the fields are:	88	/* The following is a large table of item types, the fields are:
…		…
150	{EXIT, "exit", "exits", 0, 0},	151	{EXIT, "exit", "exits", 0, 0},
151	{ENCOUNTER, "encounter", "encounters", 0, 0},	152	{ENCOUNTER, "encounter", "encounters", 0, 0},
152	{SHOP_FLOOR, "shop floor", "shop floors", 0, 0},	153	{SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
153	{SHOP_MAT, "shop mat", "shop mats", 0, 0},	154	{SHOP_MAT, "shop mat", "shop mats", 0, 0},
154	{RING, "ring", "rings", SK_JEWELER, 0},	155	{RING, "ring", "rings", SK_JEWELER, 0},
155	{FLOOR, "floor", "floors", 0, 0},	156	// {FLOOR, "floor", "floors", 0, 0},
156	{FLESH, "flesh", "flesh", SK_WOODSMAN, 0},	157	{FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
157	{INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},	158	{INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
158	{SKILL_TOOL, "skill tool", "skill tools", 0, 0},	159	{SKILL_TOOL, "skill tool", "skill tools", 0, 0},
159	{LIGHTER, "lighter", "lighters", 0, 0},	160	{LIGHTER, "lighter", "lighters", 0, 0},
160	{BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},	161	{BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
…		…
201	{BUILDER, "item builder", "item builders", 0, 0},	202	{BUILDER, "item builder", "item builders", 0, 0},
202	{MATERIAL, "building material", "building materials", 0, 0},	203	{MATERIAL, "building material", "building materials", 0, 0},
203	{ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},	204	{ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
204	};	205	};
205		206
206	static const int item_types_size = sizeof (item_types) / sizeof (*item_types);	207	static const int item_types_size = array_length (item_types);
207		208
208	/* This curve may be too steep. But the point is that there should	209	/* This curve may be too steep. But the point is that there should
209	* be tough choices - there is no real point to this if everyone can	210	* be tough choices - there is no real point to this if everyone can
210	* wear whatever they want with no worries. Perhaps having the steep	211	* wear whatever they want with no worries. Perhaps having the steep
211	* curve is good (maybe even steeper), but allowing players to	212	* curve is good (maybe even steeper), but allowing players to
…		…
213	* able to use 2-3 of the most powerful items.	214	* able to use 2-3 of the most powerful items.
214	* note that this table is only really used for program generated items -	215	* note that this table is only really used for program generated items -
215	* custom objects can use whatever they want.	216	* custom objects can use whatever they want.
216	*/	217	*/
217	static int enc_to_item_power[21] = {	218	static int enc_to_item_power[21] = {
		219	0,
218	0, 0, 1, 2, 3, 4, /* 5 */	220	0, 1, 2, 3, 4, // 5
219	5, 7, 9, 11, 13, /* 10 */	221	5, 7, 9, 11, 13, // 10
220	15, 18, 21, 24, 27, /* 15 */	222	15, 18, 21, 24, 27, // 15
221	30, 35, 40, 45, 50 /* 20 */	223	30, 35, 40, 45, 50 // 20
222	};	224	};
223		225
224	int	226	int
225	get_power_from_ench (int ench)	227	get_power_from_ench (int ench)
226	{	228	{
227	return enc_to_item_power [clamp (ench, 0, 20)];	229	return enc_to_item_power [clamp (ench, 0, 20)];
		230	}
		231
		232	static const struct need_identify_types : typeset
		233	{
		234	need_identify_types ()
		235	{
		236	set (RING);
		237	set (WAND);
		238	set (ROD);
		239	set (HORN);
		240	set (SCROLL);
		241	set (SKILL);
		242	set (SKILLSCROLL);
		243	set (SPELLBOOK);
		244	set (FOOD);
		245	set (POTION);
		246	set (BOW);
		247	set (ARROW);
		248	set (WEAPON);
		249	set (ARMOUR);
		250	set (SHIELD);
		251	set (HELMET);
		252	set (AMULET);
		253	set (BOOTS);
		254	set (GLOVES);
		255	set (BRACERS);
		256	set (GIRDLE);
		257	set (CONTAINER);
		258	set (DRINK);
		259	set (FLESH);
		260	set (INORGANIC);
		261	set (CLOSE_CON);
		262	set (CLOAK);
		263	set (GEM);
		264	set (POWER_CRYSTAL);
		265	set (POISON);
		266	set (BOOK);
		267	set (SKILL_TOOL);
		268	}
		269	} need_identify_types;
		270
		271	bool
		272	object::need_identify () const
		273	{
		274	return need_identify_types [type];
228	}	275	}
229		276
230	/* This takes an object 'op' and figures out what its item_power	277	/* This takes an object 'op' and figures out what its item_power
231	* rating should be. This should only really be used by the treasure	278	* rating should be. This should only really be used by the treasure
232	* generation code, and when loading legacy objects. It returns	279	* generation code, and when loading legacy objects. It returns
…		…
306	if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;	353	if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
307		354
308	return get_power_from_ench (enc);	355	return get_power_from_ench (enc);
309	}	356	}
310		357
		358	static const struct get_typedata
		359	{
		360	const typedata *data [NUM_TYPES];
		361
		362	get_typedata ()
		363	{
		364	for (int i = 0; i < item_types_size; i++)
		365	data [item_types[i].number] = &item_types [i];
		366	}
		367
		368	const typedata *operator ()(int itemtype) const
		369	{
		370	return data [itemtype];
		371	}
		372	} get_typedata_;
		373
311	/* returns the typedata that has a number equal to itemtype, if there	374	/* returns the typedata that has a number equal to itemtype, if there
312	* isn't one, returns NULL */	375	* isn't one, returns NULL */
313	const typedata *	376	const typedata *
314	get_typedata (int itemtype)	377	get_typedata (int itemtype)
315	{	378	{
316	for (int i = 0; i < item_types_size; i++)	379	return get_typedata_ (itemtype);
317	if (item_types[i].number == itemtype)
318	return &item_types[i];
319
320	return NULL;
321	}	380	}
322		381
323	/* returns the typedata that has a name equal to itemtype, if there	382	/* returns the typedata that has a name equal to itemtype, if there
324	* isn't one, return the plural name that matches, if there still isn't	383	* isn't one, return the plural name that matches, if there still isn't
325	* one return NULL */	384	* one return NULL */
…		…
386	/*	445	/*
387	* Returns the pointer to a static buffer containing	446	* Returns the pointer to a static buffer containing
388	* the number requested (of the form first, second, third...)	447	* the number requested (of the form first, second, third...)
389	*/	448	*/
390	const char *	449	const char *
391	get_levelnumber (int i)	450	ordinal (int i)
392	{	451	{
393	static char buf[MAX_BUF];	452	if (i < 0)
394		453	return format ("minus %s", ordinal (-i));
395	if (i > 99)
396	{
397	sprintf (buf, "%d.", i);
398	return buf;
399	}
400		454
401	if (i < 21)	455	if (i < 21)
402	return levelnumbers[i];	456	return ordnumbers[i];
403		457
		458	int digit = i % 10;
		459
404	if (!(i % 10))	460	if (i >= 100)
		461	return format (
		462	digit == 1 ? "%dst"
		463	: digit == 2 ? "%dnd"
		464	: digit == 3 ? "%drd"
		465	: "%dth",
		466	i
		467	);
		468
		469	if (digit == 0)
405	return levelnumbers_10[i / 10];	470	return ordnumbers_10[i / 10];
406		471	else
407	strcpy (buf, numbers_10[i / 10]);	472	return format ("%s%s", numbers_10[i / 10], ordnumbers[i % 10]);
408	strcat (buf, levelnumbers[i % 10]);
409	return buf;
410	}	473	}
411		474
412	/*	475	/*
413	* Returns pointer to static buffer containing ring's or amulet's	476	* Returns pointer to static buffer containing ring's or amulet's
414	* abilities	477	* abilities
…		…
426	ring_desc (const object *op)	489	ring_desc (const object *op)
427	{	490	{
428	static dynbuf_text buf; buf.clear ();	491	static dynbuf_text buf; buf.clear ();
429	int attr, val, len;	492	int attr, val, len;
430		493
431	if (QUERY_FLAG (op, FLAG_IDENTIFIED))	494	if (op->flag [FLAG_IDENTIFIED])
432	{	495	{
433	for (attr = 0; attr < NUM_STATS; attr++)	496	for (attr = 0; attr < NUM_STATS; attr++)
434	if ((val = op->stats.stat (attr)))	497	if ((val = op->stats.stat (attr)))
435	buf.printf ("(%s%+d)", short_stat_name[attr], val);	498	buf.printf ("(%s%+d)", short_stat_name[attr], val);
436		499
437	if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp);	500	if (op->stats.exp) buf.printf ("(speed %+d)", (int)op->stats.exp);
438	if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);	501	if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
439	if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);	502	if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
440	if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);	503	if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
441		504
442	buf << describe_resistance (op, 0);	505	buf << describe_resistance (op, 0);
…		…
445	if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);	508	if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
446	if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);	509	if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
447	if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);	510	if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
448	if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);	511	if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
449		512
450	if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";	513	if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
451	if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";	514	if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
452	if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";	515	if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
453	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";	516	if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
454		517
455	buf.add_paths ("Attuned" , op->path_attuned);	518	buf.add_paths ("Attuned" , op->path_attuned);
456	buf.add_paths ("Repelled", op->path_repelled);	519	buf.add_paths ("Repelled", op->path_repelled);
457	buf.add_paths ("Denied" , op->path_denied);	520	buf.add_paths ("Denied" , op->path_denied);
458		521
…		…
484		547
485	static dynbuf_text buf; buf.clear ();	548	static dynbuf_text buf; buf.clear ();
486		549
487	buf << (op->nrof <= 1 ? op->name : op->name_pl);	550	buf << (op->nrof <= 1 ? op->name : op->name_pl);
488		551
489	if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))	552	if (op->title && op->flag [FLAG_IDENTIFIED])
490	buf << ' ' << op->title;	553	buf << ' ' << op->title;
491		554
492	switch (op->type)	555	switch (op->type)
493	{	556	{
494	case SPELLBOOK:	557	case SPELLBOOK:
495	case SCROLL:	558	case SCROLL:
496	case WAND:	559	case WAND:
497	case ROD:	560	case ROD:
498	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	561	if (op->flag [FLAG_IDENTIFIED] \|\| op->flag [FLAG_BEEN_APPLIED])
499	{	562	{
500	if (!op->title)	563	if (!op->title)
501	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");	564	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
502		565
503	if (op->type != SPELLBOOK)	566	if (op->type != SPELLBOOK)
…		…
542	buf << " " << s;	605	buf << " " << s;
543	}	606	}
544	break;	607	break;
545		608
546	default:	609	default:
547	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))	610	if (op->magic
		611	&& ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
		612	\|\| op->flag [FLAG_IDENTIFIED]))
548	buf.printf (" %+d", op->magic);	613	buf.printf (" %+d", op->magic);
549	}	614	}
550		615
551	return buf;	616	return buf;
552	}	617	}
…		…
583	buf << op->material->description << ' ';	648	buf << op->material->description << ' ';
584	#endif	649	#endif
585		650
586	buf << query_short_name (op);	651	buf << query_short_name (op);
587		652
588	if (QUERY_FLAG (op, FLAG_INV_LOCKED))	653	if (op->flag [FLAG_INV_LOCKED])
589	buf << " *";	654	buf << " *";
590	if (op->is_open_container ())	655	if (op->is_open_container ())
591	buf << " (open)";	656	buf << " (open)";
592		657
593	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	658	if (op->flag [FLAG_KNOWN_CURSED])
594	{	659	{
595	if (QUERY_FLAG (op, FLAG_DAMNED))	660	if (op->flag [FLAG_DAMNED])
596	buf << " (damned)";	661	buf << " (damned)";
597	else if (QUERY_FLAG (op, FLAG_CURSED))	662	else if (op->flag [FLAG_CURSED])
598	buf << " (cursed)";	663	buf << " (cursed)";
599	}	664	}
600		665
601	/* Basically, if the object is known magical (detect magic spell on it),	666	/* Basically, if the object is known magical (detect magic spell on it),
602	* and it isn't identified, print out the fact that	667	* and it isn't identified, print out the fact that
…		…
605	*	670	*
606	* Changed in V 0.91.4 - still print that the object is magical even	671	* Changed in V 0.91.4 - still print that the object is magical even
607	* if it has been applied. Equipping an item does not tell full	672	* if it has been applied. Equipping an item does not tell full
608	* abilities, especially for artifact items.	673	* abilities, especially for artifact items.
609	*/	674	*/
610	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))	675	if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
611	buf << " (magic)";	676	buf << " (magic)";
612		677
613	#if 0	678	#if 0
614	/* item_power will be returned in describe_item - it shouldn't really	679	/* item_power will be returned in describe_item - it shouldn't really
615	* be returned in the name.	680	* be returned in the name.
…		…
617	if (op->item_power)	682	if (op->item_power)
618	sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);	683	sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
619		684
620	#endif	685	#endif
621		686
622	if (QUERY_FLAG (op, FLAG_APPLIED))	687	if (op->flag [FLAG_APPLIED])
623	{	688	{
624	switch (op->type)	689	switch (op->type)
625	{	690	{
626	case BOW:	691	case BOW:
627	case WAND:	692	case WAND:
628	case ROD:	693	case ROD:
629	case HORN:	694	case HORN:
630	buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");	695	buf << " (applied)";
631	break;	696	break;
632	case WEAPON:	697	case WEAPON:
633	buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");	698	buf << " (applied)";
634	break;	699	break;
635	case ARMOUR:	700	case ARMOUR:
636	case HELMET:	701	case HELMET:
637	case SHIELD:	702	case SHIELD:
638	case RING:	703	case RING:
…		…
670	else if (op->stats.food <= 0)	735	else if (op->stats.food <= 0)
671	buf << " (burned out)";	736	buf << " (burned out)";
672	break;	737	break;
673	}	738	}
674		739
675	if (QUERY_FLAG (op, FLAG_UNPAID))	740	if (op->flag [FLAG_UNPAID])
676	buf << " (unpaid)";	741	buf << " (unpaid)";
677		742
678	return buf;	743	return buf;
679	}	744	}
680		745
…		…
709	buf << op->material->description << ' ';	774	buf << op->material->description << ' ';
710	#endif	775	#endif
711		776
712	buf << (plural ? op->name_pl : op->name);	777	buf << (plural ? op->name_pl : op->name);
713		778
714	if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))	779	if (op->title && op->flag [FLAG_IDENTIFIED])
715	buf << ' ' << op->title;	780	buf << ' ' << op->title;
716		781
717	switch (op->type)	782	switch (op->type)
718	{	783	{
719	case SPELLBOOK:	784	case SPELLBOOK:
720	case SCROLL:	785	case SCROLL:
721	case WAND:	786	case WAND:
722	case ROD:	787	case ROD:
723	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	788	if (op->flag [FLAG_IDENTIFIED] \|\| op->flag [FLAG_BEEN_APPLIED])
724	{	789	{
725	if (!op->title)	790	if (!op->title)
726	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");	791	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
727		792
728	if (op->type != SPELLBOOK)	793	if (op->type != SPELLBOOK)
…		…
744	}	809	}
745	break;	810	break;
746		811
747	case EXIT:	812	case EXIT:
748	// random map exits "unfortunately" get patched, so this only works before entering	813	// random map exits "unfortunately" get patched, so this only works before entering
		814	if (EXIT_PATH (op) == shstr_random_map_exit)
		815	buf << " (random map)";
749	if (EXIT_PATH (op))	816	else if (!EXIT_PATH (op))
750	buf << (EXIT_PATH (op) == shstr_random_map_exit ? " (random map)" : " (entry)");	817	buf << " (closed)";
751	break;	818	break;
752		819
753	default:	820	default:
754	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))	821	if (op->magic
		822	&& ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
		823	\|\| op->flag [FLAG_IDENTIFIED]))
755	buf.printf (" %+d", op->magic);	824	buf.printf (" %+d", op->magic);
756	}	825	}
757		826
758	return buf;	827	return buf;
759	}	828	}
…		…
802	default:	871	default:
803	buf << "(lightning fast movement)";	872	buf << "(lightning fast movement)";
804	break;	873	break;
805	}	874	}
806		875
807	if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)";	876	if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
808	if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)";	877	if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
809	if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)";	878	if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
810	if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)";	879	if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
811	if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)";	880	if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
812	if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)";	881	if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
813	if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)";	882	if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
814	if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)";	883	if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
815	if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)";	884	if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
816	if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)";	885	if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
817	if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)";	886	if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
818	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)";	887	if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
819	if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)";	888	if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
820	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)";	889	if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
821		890
822	if (op->randomitems)	891	if (op->randomitems)
823	{	892	{
824	bool first = 1;	893	bool first = 1;
825		894
…		…
907	* item (eg, debug dump or the like)	976	* item (eg, debug dump or the like)
908	*/	977	*/
909	const char *	978	const char *
910	describe_item (const object op, object owner)	979	describe_item (const object op, object owner)
911	{	980	{
912	if (QUERY_FLAG (op, FLAG_MONSTER) \|\| op->type == PLAYER)	981	if (op->flag [FLAG_MONSTER] \|\| op->type == PLAYER)
913	return describe_monster (op);	982	return describe_monster (op);
914		983
915	static dynbuf_text buf; buf.clear ();	984	static dynbuf_text buf; buf.clear ();
916	int identified, i;	985	int identified, i;
917		986
918	/* figure this out once, instead of making multiple calls to need_identify.	987	/* figure this out once, instead of making multiple calls to need_identify.
919	* also makes the code easier to read.	988	* also makes the code easier to read.
920	*/	989	*/
921	identified = !need_identify (op) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED);	990	identified = !op->need_identify () \|\| op->flag [FLAG_IDENTIFIED];
922	if (!identified)	991	if (!identified)
923	buf << "(unidentified)";	992	buf << "(unidentified)";
924		993
925	switch (op->type)	994	switch (op->type)
926	{	995	{
…		…
945	if (op->stats.maxsp > 1000)	1014	if (op->stats.maxsp > 1000)
946	{ /higher capacity crystals /	1015	{ /higher capacity crystals /
947	i = (op->stats.maxsp % 1000) / 100;	1016	i = (op->stats.maxsp % 1000) / 100;
948		1017
949	if (i)	1018	if (i)
950	buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);	1019	buf.printf ("(capacity %d.%dk; it is ", op->stats.maxsp / 1000, i);
951	else	1020	else
952	buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000);	1021	buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
953	}	1022	}
954	else	1023	else
955	buf.printf ("(capacity %d). It is ", op->stats.maxsp);	1024	buf.printf ("(capacity %d; it is ", op->stats.maxsp);
956		1025
957	i = (op->stats.sp * 10) / op->stats.maxsp;	1026	i = (op->stats.sp * 10) / op->stats.maxsp;
958	if (op->stats.sp == 0)	1027	if (op->stats.sp == 0)
959	buf << "empty.";	1028	buf << "empty";
960	else if (i == 0)	1029	else if (i == 0)
961	buf << "almost empty.";	1030	buf << "almost empty";
962	else if (i < 3)	1031	else if (i < 3)
963	buf << "partially filled.";	1032	buf << "partially filled";
964	else if (i < 6)	1033	else if (i < 6)
965	buf << "half full.";	1034	buf << "half full";
966	else if (i < 9)	1035	else if (i < 9)
967	buf << "well charged.";	1036	buf << "well charged";
968	else if (op->stats.sp == op->stats.maxsp)	1037	else if (op->stats.sp == op->stats.maxsp)
969	buf << "fully charged.";	1038	buf << "fully charged";
970	else	1039	else
971	buf << "almost full.";	1040	buf << "almost full";
		1041
		1042	buf << ')';
972	break;	1043	break;
973		1044
974	case LAMP:	1045	case LAMP:
975	{	1046	{
976	int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;	1047	int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
…		…
994	break;	1065	break;
995		1066
996	case FOOD:	1067	case FOOD:
997	case FLESH:	1068	case FLESH:
998	case DRINK:	1069	case DRINK:
999	if (identified \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	1070	if (identified \|\| op->flag [FLAG_BEEN_APPLIED])
1000	{	1071	{
1001	buf.printf ("(food+%d)", op->stats.food);	1072	buf.printf ("(food+%d)", op->stats.food);
1002		1073
1003	if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))	1074	if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1004	buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);	1075	buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1005		1076
1006	if (!QUERY_FLAG (op, FLAG_CURSED))	1077	if (!op->flag [FLAG_CURSED])
1007	{	1078	{
1008	if (op->stats.hp) buf << "(heals)";	1079	if (op->stats.hp) buf << "(heals)";
1009	if (op->stats.sp) buf << "(spellpoint regen)";	1080	if (op->stats.sp) buf << "(spellpoint regen)";
1010	}	1081	}
1011	else	1082	else
…		…
1032	}	1103	}
1033		1104
1034	/* Down here, we more further describe equipment type items.	1105	/* Down here, we more further describe equipment type items.
1035	* only describe them if they have been identified or the like.	1106	* only describe them if they have been identified or the like.
1036	*/	1107	*/
1037	if (identified \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	1108	if (identified \|\| op->flag [FLAG_BEEN_APPLIED])
1038	{	1109	{
1039	int attr, val;	1110	int attr, val;
1040		1111
1041	for (attr = 0; attr < NUM_STATS; attr++)	1112	for (attr = 0; attr < NUM_STATS; attr++)
1042	if ((val = op->stats.stat (attr)))	1113	if ((val = op->stats.stat (attr)))
…		…
1073		1144
1074	default:	1145	default:
1075	break;	1146	break;
1076	}	1147	}
1077		1148
1078	if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)";	1149	if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1079	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)";	1150	if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1080		1151
1081	/* levitate was what is was before, so we'll keep it */	1152	/* levitate was what is was before, so we'll keep it */
1082	if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";	1153	if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1083	if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";	1154	if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1084	if (op->move_type & MOVE_SWIM) buf << "(swim)";	1155	if (op->move_type & MOVE_SWIM) buf << "(swim)";
…		…
1146	}	1217	}
1147		1218
1148	if (op->stats.luck)	1219	if (op->stats.luck)
1149	buf.printf ("(luck%+d)", op->stats.luck);	1220	buf.printf ("(luck%+d)", op->stats.luck);
1150		1221
1151	if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";	1222	if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1152	if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";	1223	if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1153	if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";	1224	if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1154	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";	1225	if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1155		1226
1156	if (op->slaying && op->type != FOOD)	1227	if (op->slaying && op->type != FOOD)
1157	buf.printf ("(slay %s)", &op->slaying);	1228	buf.printf ("(slay %s)", &op->slaying);
1158		1229
1159	if (op->type == SKILL_TOOL && op->skill)	1230	if (op->type == SKILL_TOOL && op->skill)
…		…
1178	object::describe_item (object *who)	1249	object::describe_item (object *who)
1179	{	1250	{
1180	return std::string (::describe_item (this, who));	1251	return std::string (::describe_item (this, who));
1181	}	1252	}
1182		1253
		1254	static void
		1255	describe_dump_object (dynbuf &buf, object *ob)
		1256	{
		1257	char *txt = dump_object (ob);
		1258	for (char p = txt; p; ++p) if (p == '\n') p = '\r';
		1259	buf << "\n" << txt << "\n";
		1260
		1261	if (!ob->is_arch ())
		1262	describe_dump_object (buf, ob->arch);
		1263	}
		1264
		1265	std::string
		1266	object::describe (object *who)
		1267	{
		1268	dynbuf_text buf (1024, 1024);
		1269
		1270	buf.printf ("That is: %s.\r", long_desc (who).c_str ());
		1271
		1272	if (custom_name)
		1273	buf.printf ("You call it %s.\r", &custom_name);
		1274
		1275	switch (type)
		1276	{
		1277	case SPELLBOOK:
		1278	if (flag [FLAG_IDENTIFIED] && inv)
		1279	buf.printf ("%s is a %s level %s spell.\r", &inv->name, ordinal (inv->level), &inv->skill);
		1280	break;
		1281
		1282	case BOOK:
		1283	if (msg)
		1284	buf << "Something is written in it.\r";
		1285	break;
		1286
		1287	case CONTAINER:
		1288	if (race)
		1289	{
		1290	if (weight_limit && stats.Str < 100)
		1291	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
		1292	&race, weight_limit / (10.0 * (100 - stats.Str)));
		1293	else
		1294	buf.printf ("It can hold only %s.\r", &race);
		1295	}
		1296	else if (weight_limit && stats.Str < 100)
		1297	buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
		1298	break;
		1299
		1300	case WAND:
		1301	if (flag [FLAG_IDENTIFIED])
		1302	buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges");
		1303	break;
		1304	}
		1305
		1306	if (material != MATERIAL_NULL && !msg)
		1307	buf << (nrof > 1 ? "They are made of " : "It is made of ")
		1308	<< material->description
		1309	<< ".\r";
		1310
		1311	if (who)
		1312	/* Where to wear this item */
		1313	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
		1314	if (slot[i].info)
		1315	{
		1316	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
		1317
		1318	if (slot[i].info < -1 && who->slot[i].info)
		1319	buf.printf ("(%d)", -slot[i].info);
		1320
		1321	buf << ".\r";
		1322	}
		1323
		1324	if (weight)
		1325	buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
		1326
		1327	if (flag [FLAG_STARTEQUIP])
		1328	buf << (nrof > 1 ? "They were" : "It was")
		1329	<< " given by a god and will vanish when dropped.\r";
		1330
		1331	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
		1332	{
		1333	buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));
		1334
		1335	if (who->is_in_shop ())
		1336	{
		1337	if (flag [FLAG_UNPAID])
		1338	buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));
		1339	else
		1340	buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
		1341	}
		1342	}
		1343
		1344	if (flag [FLAG_MONSTER])
		1345	buf << describe_monster (who);
		1346
		1347	/* Is this item buildable? */
		1348	if (flag [FLAG_IS_BUILDABLE])
		1349	buf << "This is a buildable item.\r";
		1350
		1351	/* Does the object have a message? Don't show message for all object
		1352	* types - especially if the first entry is a match
		1353	*/
		1354	if (msg)
		1355	{
		1356	if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
		1357	{
		1358	if (!need_identify ())
		1359	buf << '\r' << msg << '\n';
		1360	else if (flag [FLAG_IDENTIFIED])
		1361	buf << '\r' << "The object has a story:\r" << msg;
		1362	}
		1363	}
		1364	else if (inv
		1365	&& inv->msg
		1366	&& inv->type == SPELL
		1367	&& flag [FLAG_IDENTIFIED]
		1368	&& (type == SPELLBOOK \|\| type == ROD \|\| type == WAND
		1369	\|\| type == ROD \|\| type == POTION \|\| type == SCROLL))
		1370	// for spellbooks and other stuff that contains spells, print the spell message,
		1371	// unless the object has a custom message handled above.
		1372	buf << '\r' << inv->msg << '\n';
		1373
		1374	// try to display the duration for some potions and scrolls
		1375	// this includes change ability potions and group spells,
		1376	// but does not handle protection potions
		1377	if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
		1378	&& (type == POTION \|\| type == SCROLL))
		1379	{
		1380	object *spell = inv;
		1381
		1382	if (spell->subtype == SP_PARTY_SPELL)
		1383	spell = spell->other_arch;
		1384
		1385	if (spell->subtype == SP_CHANGE_ABILITY)
		1386	buf.printf ("\nH<The effect will last about %.10g seconds.>",
		1387	TICK2TIME (change_ability_duration (spell, this)));
		1388	}
		1389
		1390	// some help text for skill tools
		1391	if (type == SKILL_TOOL)
		1392	buf << "\nH<This item is a skill tool: as long as you have this item applied "
		1393	"you can use the " << &skill << " skill as if you had learned it.>";
		1394
		1395	// Display a hint about inscribable items [empty books]
		1396	// This includes the amount of text they can hold.
		1397	if (type == INSCRIBABLE)
		1398	{
		1399	if (other_arch && other_arch->type == SCROLL)
		1400	buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
		1401	else
		1402	buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
		1403	weight_limit);
		1404	}
		1405
		1406	buf << '\n';
		1407
		1408	// the dungeon master additionally gets a complete dump
		1409	if (who && who->flag [FLAG_WIZLOOK])
		1410	{
		1411	buf << "\nT<Object>\n";
		1412	describe_dump_object (buf, this);
		1413
		1414	if (inv)
		1415	{
		1416	buf << "\nT<Top Inventory>\n";
		1417	describe_dump_object (buf, inv);
		1418	}
		1419	}
		1420
		1421	return std::string (buf.linearise (), buf.size ());
		1422	}
		1423
1183	void	1424	void
1184	examine (object op, object tmp)	1425	examine (object op, object tmp)
1185	{	1426	{
1186	std::string info = tmp->describe (op);	1427	std::string info = tmp->describe (op);
1187		1428
…		…
1197	object::query_inventory (object who, const char indent)	1438	object::query_inventory (object who, const char indent)
1198	{	1439	{
1199	static dynbuf_text buf; buf.clear ();	1440	static dynbuf_text buf; buf.clear ();
1200		1441
1201	for (object *tmp = inv; tmp; tmp = tmp->below)	1442	for (object *tmp = inv; tmp; tmp = tmp->below)
1202	if (who && QUERY_FLAG (who, FLAG_WIZ))	1443	if (who && who->flag [FLAG_WIZ])
1203	buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());	1444	buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1204	else if (!tmp->invisible && (type == CONTAINER \|\| QUERY_FLAG (tmp, FLAG_APPLIED)))	1445	else if (!tmp->invisible && (type == CONTAINER \|\| tmp->flag [FLAG_APPLIED]))
1205	buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());	1446	buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1206		1447
1207	if (buf.size ())	1448	if (buf.size ())
1208	buf.printf ("%s(total weight: %s)\n", indent, query_weight ());	1449	buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1209	else	1450	else
…		…
1222	is_magical (const object *op)	1463	is_magical (const object *op)
1223	{	1464	{
1224	int i;	1465	int i;
1225		1466
1226	/* living creatures are considered non magical */	1467	/* living creatures are considered non magical */
1227	if (QUERY_FLAG (op, FLAG_ALIVE))	1468	if (op->flag [FLAG_ALIVE])
1228	return 0;	1469	return 0;
1229		1470
1230	/* This is a test for it being an artifact, as artifacts have titles */	1471	/* This is a test for it being an artifact, as artifacts have titles */
1231	if (op->title != NULL)	1472	if (op->title != NULL)
1232	return 1;	1473	return 1;
…		…
1238	(op->stats.ac \|\| op->stats.food \|\| op->stats.exp \|\| op->stats.dam \|\| op->stats.wc \|\| op->stats.sp \|\| op->stats.hp \|\| op->stats.luck))	1479	(op->stats.ac \|\| op->stats.food \|\| op->stats.exp \|\| op->stats.dam \|\| op->stats.wc \|\| op->stats.sp \|\| op->stats.hp \|\| op->stats.luck))
1239	return 1;	1480	return 1;
1240		1481
1241	/* Check for stealty, speed, flying, or just plain magic in the boots */	1482	/* Check for stealty, speed, flying, or just plain magic in the boots */
1242	/* Presume any boots that hvae a move_type are special. */	1483	/* Presume any boots that hvae a move_type are special. */
1243	if (op->type == BOOTS && ((QUERY_FLAG (op, FLAG_STEALTH) \|\| op->move_type \|\| op->stats.exp)))	1484	if (op->type == BOOTS && ((op->flag [FLAG_STEALTH] \|\| op->move_type \|\| op->stats.exp)))
1244	return 1;	1485	return 1;
1245		1486
1246	/* Take care of amulet/shield that reflects spells/missiles */	1487	/* Take care of amulet/shield that reflects spells/missiles */
1247	if ((op->type == AMULET \|\| op->type == SHIELD) && (QUERY_FLAG (op, FLAG_REFL_SPELL) \|\| QUERY_FLAG (op, FLAG_REFL_MISSILE)))	1488	if ((op->type == AMULET \|\| op->type == SHIELD) && (op->flag [FLAG_REFL_SPELL] \|\| op->flag [FLAG_REFL_MISSILE]))
1248	return 1;	1489	return 1;
1249		1490
1250	/* Take care of helmet of xrays */	1491	/* Take care of helmet of xrays */
1251	if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS))	1492	if (op->type == HELMET && op->flag [FLAG_XRAYS])
1252	return 1;	1493	return 1;
1253		1494
1254	/* Potions & rods are always magical. Wands/staves are also magical,	1495	/* Potions & rods are always magical. Wands/staves are also magical,
1255	* assuming they still have any charges left.	1496	* assuming they still have any charges left.
1256	*/	1497	*/
…		…
1285	* be non magical.	1526	* be non magical.
1286	*/	1527	*/
1287	return 0;	1528	return 0;
1288	}	1529	}
1289		1530
1290	/* need_identify returns true if the item should be identified. This
1291	* function really should not exist - by default, any item not identified
1292	* should need it.
1293	*/
1294
1295	int
1296	need_identify (const object *op)
1297	{
1298	switch (op->type)
1299	{
1300	case RING:
1301	case WAND:
1302	case ROD:
1303	case HORN:
1304	case SCROLL:
1305	case SKILL:
1306	case SKILLSCROLL:
1307	case SPELLBOOK:
1308	case FOOD:
1309	case POTION:
1310	case BOW:
1311	case ARROW:
1312	case WEAPON:
1313	case ARMOUR:
1314	case SHIELD:
1315	case HELMET:
1316	case AMULET:
1317	case BOOTS:
1318	case GLOVES:
1319	case BRACERS:
1320	case GIRDLE:
1321	case CONTAINER:
1322	case DRINK:
1323	case FLESH:
1324	case INORGANIC:
1325	case CLOSE_CON:
1326	case CLOAK:
1327	case GEM:
1328	case POWER_CRYSTAL:
1329	case POISON:
1330	case BOOK:
1331	case SKILL_TOOL:
1332	return 1;
1333	}
1334
1335	/* Try to track down some stuff that may show up here. Thus, the
1336	* archetype file can be updated, and this function removed.
1337	*/
1338	#if 0
1339	LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1340	#endif
1341	return 0;
1342	}
1343
1344	/*	1531	/*
1345	* Supposed to fix face-values as well here, but later.	1532	* Supposed to fix face-values as well here, but later.
1346	*/	1533	*/
1347	void	1534	void
1348	identify (object *op)	1535	identify (object *op)
1349	{	1536	{
1350	SET_FLAG (op, FLAG_IDENTIFIED);	1537	op->set_flag (FLAG_IDENTIFIED);
1351	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);	1538	op->clr_flag (FLAG_KNOWN_MAGICAL);
1352	CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);	1539	op->clr_flag (FLAG_NO_SKILL_IDENT);
1353		1540
1354	/*	1541	/*
1355	* We want autojoining of equal objects:	1542	* We want autojoining of equal objects:
1356	*/	1543	*/
1357	if (QUERY_FLAG (op, FLAG_CURSED) \|\| QUERY_FLAG (op, FLAG_DAMNED))	1544	if (op->flag [FLAG_CURSED] \|\| op->flag [FLAG_DAMNED])
1358	SET_FLAG (op, FLAG_KNOWN_CURSED);	1545	op->set_flag (FLAG_KNOWN_CURSED);
1359		1546
1360	if (op->type == POTION)	1547	if (op->type == POTION)
1361	{	1548	{
1362	if (op->inv && op->randomitems)	1549	if (op->inv && op->randomitems)
1363	op->title = op->inv->name;	1550	op->title = op->inv->name;

Diff Legend

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

Comparing deliantra/server/common/item.C (file contents): Revision 1.75 by root, Fri Mar 26 14:00:28 2010 UTC vs. Revision 1.88 by root, Wed May 12 20:40:50 2010 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.75 by root, Fri Mar 26 14:00:28 2010 UTC vs.
Revision 1.88 by root, Wed May 12 20:40:50 2010 UTC