ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/treasure.C

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.59 by root, Sun Apr 29 00:19:16 2007 UTC vs.
Revision 1.121 by root, Sat Nov 17 23:40:00 2018 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
		5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* This program is free software; you can redistribute it and/or modify	9	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	10	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation; either version 2 of the License, or	11	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	12	* option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	17	* GNU General Public License for more details.
17	*
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
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	18	*
		19	* You should have received a copy of the Affero GNU General Public License
		20	* and the GNU General Public License along with this program. If not, see
		21	* <http://www.gnu.org/licenses/>.
		22	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	23	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	24	*/
24		25
25	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	26	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26	* It is useful for finding bugs in the treasures file. Since it only	27	* It is useful for finding bugs in the treasures file. Since it only
27	* slows the startup some (and not actual game play), it is by default	28	* slows the startup some (and not actual game play), it is by default
…		…
33		34
34	//#define TREASURE_VERBOSE	35	//#define TREASURE_VERBOSE
35		36
36	#include <global.h>	37	#include <global.h>
37	#include <treasure.h>	38	#include <treasure.h>
38	#include <funcpoint.h>	39
39	#include <loader.h>	40	#include <flat_hash_map.hpp>
40		41
41	extern char *spell_mapping[];	42	extern char *spell_mapping[];
42		43
43	static treasurelist *first_treasurelist;	44	static treasurelist *first_treasurelist;
44		45
45	static void change_treasure (treasure *t, object *op); /* overrule default values */	46	static void change_treasure (treasure *t, object *op); /* overrule default values */
46		47
47	typedef std::tr1::unordered_map<	48	typedef ska::flat_hash_map<
48	const char *,	49	const char *,
49	treasurelist *,	50	treasurelist *,
50	str_hash,	51	str_hash,
51	str_equal,	52	str_equal,
52	slice_allocator< std::pair<const char *const, treasurelist *> >,	53	slice_allocator< std::pair<const char *const, treasurelist *> >
53	true
54	> tl_map_t;	54	> tl_map_t;
55		55
56	static tl_map_t tl_map;	56	static tl_map_t tl_map;
		57
		58	//TODO: class method
		59	static void free_treasurestruct (treasure *t); // bleh desu
		60	static void
		61	clear (treasurelist *tl)
		62	{
		63	if (tl->items)
		64	{
		65	free_treasurestruct (tl->items);
		66	tl->items = 0;
		67	}
		68
		69	tl->total_chance = 0;
		70	}
57		71
58	/*	72	/*
59	* Searches for the given treasurelist	73	* Searches for the given treasurelist
60	*/	74	*/
61	treasurelist *	75	treasurelist *
…		…
93	}	107	}
94		108
95	return tl;	109	return tl;
96	}	110	}
97		111
98	//TODO: class method
99	void
100	clear (treasurelist *tl)
101	{
102	if (tl->items)
103	{
104	free_treasurestruct (tl->items);
105	tl->items = 0;
106	}
107
108	tl->total_chance = 0;
109	}
110
111	#ifdef TREASURE_DEBUG	112	#ifdef TREASURE_DEBUG
112	/* recursived checks the linked list. Treasurelist is passed only	113	/* recursived checks the linked list. Treasurelist is passed only
113	* so that the treasure name can be printed out	114	* so that the treasure name can be printed out
114	*/	115	*/
115	static void	116	static void
…		…
140		141
141	f.next ();	142	f.next ();
142		143
143	for (;;)	144	for (;;)
144	{	145	{
145	coroapi::cede_to_tick_every (10);	146	coroapi::cede_to_tick ();
146		147
147	switch (f.kw)	148	switch (f.kw)
148	{	149	{
149	case KW_arch:	150	case KW_arch:
150	t->item = archetype::get (f.get_str ());	151	t->item = archetype::find (f.get_str ());
		152
		153	if (!t->item)
		154	{
		155	f.parse_warn ("treasure references unknown archetype");
		156	t->item = archetype::empty;
		157	}
		158
151	break;	159	break;
152		160
153	case KW_list: f.get (t->name); break;	161	case KW_list: f.get (t->name); break;
154	case KW_change_name: f.get (t->change_arch.name); break;	162	case KW_change_name: f.get (t->change_arch.name); break;
155	case KW_change_title: f.get (t->change_arch.title); break;	163	case KW_change_title: f.get (t->change_arch.title); break;
…		…
169	t->next = read_treasure (f);	177	t->next = read_treasure (f);
170	return t;	178	return t;
171		179
172	default:	180	default:
173	if (!f.parse_error ("treasurelist", t->name))	181	if (!f.parse_error ("treasurelist", t->name))
174	return 0;	182	goto error;
175		183
176	return t;	184	return t;
177	}	185	}
178		186
179	f.next ();	187	f.next ();
180	}	188	}
		189
		190	// not reached
		191
		192	error:
		193	delete t;
		194	return 0;
181	}	195	}
182		196
183	/*	197	/*
184	* Each treasure is parsed with the help of load_treasure().	198	* Each treasure is parsed with the help of load_treasure().
185	*/	199	*/
…		…
203	{	217	{
204	for (treasure *t = tl->items; t; t = t->next)	218	for (treasure *t = tl->items; t; t = t->next)
205	{	219	{
206	if (t->next_yes || t->next_no)	220	if (t->next_yes || t->next_no)
207	{	221	{
208	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);	222	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
209	LOG (llevError, " the next_yes or next_no field is set\n");	223	LOG (llevError, " the next_yes or next_no field is set\n");
210	}	224	}
211		225
212	tl->total_chance += t->chance;	226	tl->total_chance += t->chance;
213	}	227	}
…		…
244	return;	258	return;
245	}	259	}
246		260
247	op->expand_tail ();	261	op->expand_tail ();
248		262
		263	if (!creator->is_on_map ()
249	if (ob_blocked (op, creator->map, creator->x, creator->y))	264	|| (op->weight && op->blocked (creator->map, creator->x, creator->y)))
250	op->destroy ();	265	op->destroy ();
251	else	266	else
252	{	267	{
253	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	268	op->flag [FLAG_OBJ_ORIGINAL] = true;
254	op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);	269	op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
255	}	270	}
256	}	271	}
257	else	272	else
258	{	273	{
259	op = creator->insert (op);	274	op = creator->insert (op);
260		275
261	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	276	if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
262	monster_check_apply (creator, op);	277	monster_check_apply (creator, op);
263
264	if (flags & GT_UPDATE_INV)
265	if (object *tmp = creator->in_player ())
266	esrv_send_item (tmp, op);
267	}	278	}
268	}	279	}
269		280
270	/* if there are change_xxx commands in the treasure, we include the changes	281	/* if there are change_xxx commands in the treasure, we include the changes
271	* in the generated object	282	* in the generated object
…		…
300	else	311	else
301	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);	312	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
302	}	313	}
303	else	314	else
304	{	315	{
305	if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))	316	if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
306	{	317	{
307	object *tmp = arch_to_object (t->item);	318	object *tmp = t->item->instance ();
308		319
309	if (t->nrof && tmp->nrof <= 1)	320	if (t->nrof && tmp->nrof <= 1)
310	tmp->nrof = rndm (t->nrof) + 1;	321	tmp->nrof = rndm (t->nrof) + 1;
311		322
312	fix_generated_item (tmp, op, difficulty, t->magic, flag);	323	fix_generated_item (tmp, op, difficulty, t->magic, flag);
…		…
357	create_treasure (tl, op, flag, difficulty, tries);	368	create_treasure (tl, op, flag, difficulty, tries);
358	}	369	}
359	else if (t->nrof)	370	else if (t->nrof)
360	create_one_treasure (tl, op, flag, difficulty, tries);	371	create_one_treasure (tl, op, flag, difficulty, tries);
361	}	372	}
362	else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))	373	else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
363	{	374	{
364	if (object *tmp = arch_to_object (t->item))	375	if (object *tmp = t->item->instance ())
365	{	376	{
366	if (t->nrof && tmp->nrof <= 1)	377	if (t->nrof && tmp->nrof <= 1)
367	tmp->nrof = rndm (t->nrof) + 1;	378	tmp->nrof = rndm (t->nrof) + 1;
368		379
369	fix_generated_item (tmp, op, difficulty, t->magic, flag);	380	fix_generated_item (tmp, op, difficulty, t->magic, flag);
…		…
435		446
436	if (ob->inv)	447	if (ob->inv)
437	LOG (llevError, "In generate treasure, created multiple objects.\n");	448	LOG (llevError, "In generate treasure, created multiple objects.\n");
438		449
439	ob->destroy ();	450	ob->destroy ();
		451
440	return tmp;	452	return tmp;
441	}	453	}
442		454
443	/*	455	/*
444	* This is a new way of calculating the chance for an item to have	456	* This is a new way of calculating the chance for an item to have
…		…
481	{ 0, 0, 0, 3, 97}, // 29	493	{ 0, 0, 0, 3, 97}, // 29
482	{ 0, 0, 0, 0, 100}, // 30	494	{ 0, 0, 0, 0, 100}, // 30
483	{ 0, 0, 0, 0, 100}, // 31	495	{ 0, 0, 0, 0, 100}, // 31
484	};	496	};
485		497
486	/* calculate the appropriate level for wands staves and scrolls.	498	/* calculate the appropriate level for wands staves and scrolls.
487	* This code presumes that op has had its spell object created (in op->inv)	499	* This code presumes that op has had its spell object created (in op->inv)
488	*	500	*
489	* elmex Wed Aug 9 17:44:59 CEST 2006:	501	* elmex Wed Aug 9 17:44:59 CEST 2006:
490	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.	502	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.
491	*/	503	*/
492	int	504	static int
493	level_for_item (const object *op, int difficulty)	505	level_for_item (const object *op, int difficulty)
494	{	506	{
495	int olevel = 0;
496
497	if (!op->inv)	507	if (!op->inv)
498	{	508	{
499	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);	509	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
500	return 0;	510	return 0;
501	}	511	}
502		512
503	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	513	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
504		514
505	if (olevel <= 0)	515	if (olevel <= 0)
506	olevel = rndm (1, MIN (op->inv->level, 1));	516	olevel = rndm (1, op->inv->level);
507		517
508	if (olevel > MAXLEVEL)	518	return min (olevel, MAXLEVEL_TREASURE);
509	olevel = MAXLEVEL;
510
511	return olevel;
512	}	519	}
513		520
514	/*	521	/*
515	* Based upon the specified difficulty and upon the difftomagic_list array,	522	* Based upon the specified difficulty and upon the difftomagic_list array,
516	* a random magical bonus is returned. This is used when determine	523	* a random magical bonus is returned. This is used when determine
…		…
519	* elmex Thu Aug 10 18:45:44 CEST 2006:	526	* elmex Thu Aug 10 18:45:44 CEST 2006:
520	* Scaling difficulty by max_level, as difficulty is a level and not some	527	* Scaling difficulty by max_level, as difficulty is a level and not some
521	* weird integer between 1-31.	528	* weird integer between 1-31.
522	*	529	*
523	*/	530	*/
524	int	531	static int
525	magic_from_difficulty (int difficulty)	532	magic_from_difficulty (int difficulty)
526	{	533	{
527	int percent = 0, magic = 0;
528	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	534	int scaled_diff = lerp (difficulty, 0, settings.max_level, 0, DIFFLEVELS - 1);
		535	scaled_diff = clamp (scaled_diff, 0, DIFFLEVELS - 1);
529		536
530	scaled_diff--;
531
532	if (scaled_diff < 0)
533	scaled_diff = 0;
534
535	if (scaled_diff >= DIFFLEVELS)
536	scaled_diff = DIFFLEVELS - 1;
537
538	percent = rndm (100);	537	int percent = rndm (100);
		538	int magic;
539		539
540	for (magic = 0; magic < (MAXMAGIC + 1); magic++)	540	for (magic = 0; magic <= MAXMAGIC; magic++)
541	{	541	{
542	percent -= difftomagic_list[scaled_diff][magic];	542	percent -= difftomagic_list[scaled_diff][magic];
543		543
544	if (percent < 0)	544	if (percent < 0)
545	break;	545	break;
546	}	546	}
547		547
548	if (magic == (MAXMAGIC + 1))	548	if (magic > MAXMAGIC)
549	{	549	{
550	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);	550	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
551	magic = 0;	551	magic = 0;
552	}	552	}
553		553
…		…
561	* Sets magical bonus in an object, and recalculates the effect on	561	* Sets magical bonus in an object, and recalculates the effect on
562	* the armour variable, and the effect on speed of armour.	562	* the armour variable, and the effect on speed of armour.
563	* This function doesn't work properly, should add use of archetypes	563	* This function doesn't work properly, should add use of archetypes
564	* to make it truly absolute.	564	* to make it truly absolute.
565	*/	565	*/
566
567	void	566	void
568	set_abs_magic (object *op, int magic)	567	set_abs_magic (object *op, int magic)
569	{	568	{
570	if (!magic)	569	if (!magic)
571	return;	570	return;
572		571
573	op->magic = magic;	572	op->magic = magic;
574	if (op->arch)	573	if (op->arch)
575	{	574	{
576	if (op->type == ARMOUR)	575	if (op->type == ARMOUR)
577	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	576	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
578		577
579	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	578	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
580	magic = (-magic);	579	magic = (-magic);
		580
581	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	581	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
582	}	582	}
583	else	583	else
584	{	584	{
585	if (op->type == ARMOUR)	585	if (op->type == ARMOUR)
586	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	586	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
		587
587	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	588	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
588	magic = (-magic);	589	magic = (-magic);
		590
589	op->weight = (op->weight * (100 - magic * 10)) / 100;	591	op->weight = (op->weight * (100 - magic * 10)) / 100;
590	}	592	}
591	}	593	}
592		594
593	/*	595	/*
…		…
596	*/	598	*/
597		599
598	static void	600	static void
599	set_magic (int difficulty, object *op, int max_magic, int flags)	601	set_magic (int difficulty, object *op, int max_magic, int flags)
600	{	602	{
601	int i;
602
603	i = magic_from_difficulty (difficulty);	603	int i = magic_from_difficulty (difficulty);
		604
604	if ((flags & GT_ONLY_GOOD) && i < 0)	605	if ((flags & GT_ONLY_GOOD) && i < 0)
605	i = -i;	606	i = -i;
		607
606	if (i > max_magic)	608	i = min (i, max_magic);
607	i = max_magic;	609
608	set_abs_magic (op, i);	610	set_abs_magic (op, i);
609	if (i < 0)	611	if (i < 0)
610	SET_FLAG (op, FLAG_CURSED);	612	op->set_flag (FLAG_CURSED);
611	}	613	}
612		614
613	/*	615	/*
614	* Randomly adds one magical ability to the given object.	616	* Randomly adds one magical ability to the given object.
615	* Modified for Partial Resistance in many ways:	617	* Modified for Partial Resistance in many ways:
616	* 1) Since rings can have multiple bonuses, if the same bonus	618	* 1) Since rings can have multiple bonuses, if the same bonus
617	* is rolled again, increase it - the bonuses now stack with	619	* is rolled again, increase it - the bonuses now stack with
618	* other bonuses previously rolled and ones the item might natively have.	620	* other bonuses previously rolled and ones the item might natively have.
619	* 2) Add code to deal with new PR method.	621	* 2) Add code to deal with new PR method.
620	*/	622	*/
621	void	623	static void
622	set_ring_bonus (object *op, int bonus)	624	set_ring_bonus (object *op, int bonus)
623	{	625	{
624
625	int r = rndm (bonus > 0 ? 25 : 11);	626	int r = rndm (bonus > 0 ? 25 : 11);
626		627
627	if (op->type == AMULET)	628	if (op->type == AMULET)
628	{
629	if (!(rndm (21)))	629	if (!rndm (21))
630	r = 20 + rndm (2);	630	r = 20 + rndm (2);
		631	else if (rndm (2))
		632	r = 10;
631	else	633	else
632	{
633	if (rndm (2))
634	r = 10;
635	else
636	r = 11 + rndm (9);	634	r = 11 + rndm (9);
637	}
638	}
639		635
640	switch (r)	636	switch (r)
641	{	637	{
642	/* Redone by MSW 2000-11-26 to have much less code. Also,	638	/* Redone by MSW 2000-11-26 to have much less code. Also,
643	* bonuses and penalties will stack and add to existing values.	639	* bonuses and penalties will stack and add to existing values.
644	* of the item.	640	* of the item.
645	*/	641	*/
646	case 0:	642	case 0:
647	case 1:	643	case 1:
648	case 2:	644	case 2:
649	case 3:	645	case 3:
650	case 4:	646	case 4:
651	case 5:	647	case 5:
652	case 6:	648	case 6:
653	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	649	op->stats.stat (r) += bonus;
654	break;	650	break;
655		651
656	case 7:	652	case 7:
657	op->stats.dam += bonus;	653	op->stats.dam += bonus;
658	break;	654	break;
…		…
690	* little random element in since that they don't always end up with	686	* little random element in since that they don't always end up with
691	* even values.	687	* even values.
692	*/	688	*/
693	if (bonus < 0)	689	if (bonus < 0)
694	val = 2 * -val - rndm (b);	690	val = 2 * -val - rndm (b);
695	if (val > 35)	691
696	val = 35; /* Upper limit */	692	val = min (35, val); /* Upper limit */
		693
697	b = 0;	694	b = 0;
698		695
699	while (op->resist[resist_table[resist]] != 0 && b < 4)	696	while (op->resist[resist_table[resist]] != 0 && b < 4)
700	resist = rndm (num_resist_table);	697	resist = rndm (num_resist_table);
701		698
…		…
709	break;	706	break;
710	}	707	}
711	case 20:	708	case 20:
712	if (op->type == AMULET)	709	if (op->type == AMULET)
713	{	710	{
714	SET_FLAG (op, FLAG_REFL_SPELL);	711	op->set_flag (FLAG_REFL_SPELL);
715	op->value *= 11;	712	op->value *= 11;
716	}	713	}
717	else	714	else
718	{	715	{
719	op->stats.hp = 1; /* regenerate hit points */	716	op->stats.hp = 1; /* regenerate hit points */
…		…
722	break;	719	break;
723		720
724	case 21:	721	case 21:
725	if (op->type == AMULET)	722	if (op->type == AMULET)
726	{	723	{
727	SET_FLAG (op, FLAG_REFL_MISSILE);	724	op->set_flag (FLAG_REFL_MISSILE);
728	op->value *= 9;	725	op->value *= 9;
729	}	726	}
730	else	727	else
731	{	728	{
732	op->stats.sp = 1; /* regenerate spell points */	729	op->stats.sp = 1; /* regenerate spell points */
…		…
734	}	731	}
735	break;	732	break;
736		733
737	case 22:	734	case 22:
738	op->stats.exp += bonus; /* Speed! */	735	op->stats.exp += bonus; /* Speed! */
739	op->value = (op->value * 2) / 3;	736	op->value = op->value * 2 / 3;
740	break;	737	break;
741	}	738	}
742		739
743	if (bonus > 0)	740	if (bonus > 0)
744	op->value *= 2 * bonus;	741	op->value = 2 * op->value * bonus;
745	else	742	else
746	op->value = -(op->value * 2 * bonus) / 3;	743	op->value = -2 * op->value * bonus / 3;
747	}	744	}
748		745
749	/*	746	/*
750	* get_magic(diff) will return a random number between 0 and 4.	747	* get_magic(diff) will return a random number between 0 and 4.
751	* diff can be any value above 2. The higher the diff-variable, the	748	* diff can be any value above 2. The higher the diff-variable, the
752	* higher is the chance of returning a low number.	749	* higher is the chance of returning a low number.
753	* It is only used in fix_generated_treasure() to set bonuses on	750	* It is only used in fix_generated_treasure() to set bonuses on
754	* rings and amulets.	751	* rings and amulets.
755	* Another scheme is used to calculate the magic of weapons and armours.	752	* Another scheme is used to calculate the magic of weapons and armours.
756	*/	753	*/
757	int	754	static int
758	get_magic (int diff)	755	get_magic (int diff)
759	{	756	{
760	int i;	757	diff = min (3, diff);
761		758
762	if (diff < 3)
763	diff = 3;
764
765	for (i = 0; i < 4; i++)	759	for (int i = 0; i < 4; i++)
766	if (rndm (diff))	760	if (rndm (diff))
767	return i;	761	return i;
768		762
769	return 4;	763	return 4;
770	}	764	}
771		765
		766	/* special_potion() - so that old potion code is still done right. */
		767	static int
		768	special_potion (object *op)
		769	{
		770	if (op->attacktype)
		771	return 1;
		772
		773	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
		774	return 1;
		775
		776	for (int i = 0; i < NROFATTACKS; i++)
		777	if (op->resist[i])
		778	return 1;
		779
		780	return 0;
		781	}
		782
		783	static double
		784	value_factor_from_spell_item (object *spell, object *item)
		785	{
		786	double factor =
		787	pow ((spell->value > 0 ? spell->value : 1)
		788	* spell->level, 1.5);
		789
		790	if (item) // this if for: wands/staffs/rods:
		791	{
		792	/* Old crossfire comment ahead:
		793	* Add 50 to both level an divisor to keep prices a little more
		794	* reasonable. Otherwise, a high level version of a low level
		795	* spell can be worth tons a money (eg, level 20 rod, level 2 spell =
		796	* 10 time multiplier). This way, the value are a bit more reasonable.
		797	*/
		798
		799	factor *= item->level + 50;
		800	factor /= item->inv->level + 50;
		801	}
		802
		803	return factor;
		804	}
		805
772	#define DICE2 (get_magic(2)==2?2:1)	806	#define DICE2 (get_magic(2) == 2 ? 2 : 1)
773	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))	807	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
774		808
775	/*	809	/*
776	* fix_generated_item(): This is called after an item is generated, in	810	* fix_generated_item(): This is called after an item is generated, in
777	* order to set it up right. This produced magical bonuses, puts spells	811	* order to set it up right. This produced magical bonuses, puts spells
778	* into scrolls/books/wands, makes it unidentified, hides the value, etc.	812	* into scrolls/books/wands, makes it unidentified, hides the value, etc.
779	*/	813	*/
780		814
781	/* 4/28/96 added creator object from which op may now inherit properties based on	815	/* 4/28/96 added creator object from which op may now inherit properties based on
782	* op->type. Right now, which stuff the creator passes on is object type	816	* op->type. Right now, which stuff the creator passes on is object type
783	* dependant. I know this is a spagetti manuever, but is there a cleaner	817	* dependant. I know this is a spagetti manuever, but is there a cleaner
784	* way to do this? b.t. */	818	* way to do this? b.t. */
785		819
786	/*	820	/*
787	* ! (flags & GT_ENVIRONMENT):	821	* ! (flags & GT_ENVIRONMENT):
788	* Automatically calls fix_flesh_item().	822	* Automatically calls fix_flesh_item().
…		…
811	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);	845	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
812	/* So the treasure doesn't get created again */	846	/* So the treasure doesn't get created again */
813	op->randomitems = 0;	847	op->randomitems = 0;
814	}	848	}
815		849
816	if (difficulty < 1)	850	max_it (difficulty, 1);
817	difficulty = 1;
818		851
819	if (INVOKE_OBJECT (ADD_BONUS, op,	852	if (INVOKE_OBJECT (ADD_BONUS, op,
820	ARG_OBJECT (creator != op ? creator : 0),	853	ARG_OBJECT (creator != op ? creator : 0),
821	ARG_INT (difficulty), ARG_INT (max_magic),	854	ARG_INT (difficulty), ARG_INT (max_magic),
822	ARG_INT (flags)))	855	ARG_INT (flags)))
823	return;	856	return;
824		857
825	if (!(flags & GT_MINIMAL))	858	if (!(flags & GT_MINIMAL))
826	{	859	{
827	if (op->arch == crown_arch)	860	if (IS_ARCH (op->arch, crown))
828	{	861	{
829	set_magic (difficulty, op, max_magic, flags);	862	set_magic (difficulty, op, max_magic, flags);
830	num_enchantments = calc_item_power (op, 1);	863	num_enchantments = calc_item_power (op, 1);
831	generate_artifact (op, difficulty);	864	generate_artifact (op, difficulty);
832	}	865	}
…		…
837		870
838	num_enchantments = calc_item_power (op, 1);	871	num_enchantments = calc_item_power (op, 1);
839		872
840	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	873	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
841	|| op->type == HORN	874	|| op->type == HORN
842	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	875	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
843	* used for shop_floors or treasures */
844	generate_artifact (op, difficulty);	876	generate_artifact (op, difficulty);
845	}	877	}
846		878
847	/* Object was made an artifact. Calculate its item_power rating.	879	/* Object was made an artifact. Calculate its item_power rating.
848	* the item_power in the object is what the artfiact adds.	880	* the item_power in the object is what the artfiact adds.
…		…
882	* again below */	914	* again below */
883	}	915	}
884	}	916	}
885		917
886	/* materialtype modifications. Note we allow this on artifacts. */	918	/* materialtype modifications. Note we allow this on artifacts. */
887	set_materialname (op, difficulty, NULL);	919	select_material (op, difficulty);
888		920
889	if (flags & GT_MINIMAL)	921	if (flags & GT_MINIMAL)
890	{	922	{
891	if (op->type == POTION)	923	if (op->type == POTION)
892	/* Handle healing and magic power potions */	924	/* Handle healing and magic power potions */
893	if (op->stats.sp && !op->randomitems)	925	if (op->stats.sp && !op->randomitems)
894	{	926	{
895	object *tmp;
896
897	tmp = get_archetype (spell_mapping[op->stats.sp]);	927	object *tmp = archetype::get (spell_mapping [op->stats.sp]);
898	insert_ob_in_ob (tmp, op);	928	insert_ob_in_ob (tmp, op);
899	op->stats.sp = 0;	929	op->stats.sp = 0;
900	}	930	}
901	}	931	}
902	else if (!op->title) /* Only modify object if not special */	932	else if (!op->title) /* Only modify object if not special */
…		…
905	case WEAPON:	935	case WEAPON:
906	case ARMOUR:	936	case ARMOUR:
907	case SHIELD:	937	case SHIELD:
908	case HELMET:	938	case HELMET:
909	case CLOAK:	939	case CLOAK:
910	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))	940	if (op->flag [FLAG_CURSED] && !(rndm (4)))
911	set_ring_bonus (op, -DICE2);	941	set_ring_bonus (op, -DICE2);
912	break;	942	break;
913		943
914	case BRACERS:	944	case BRACERS:
915	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))	945	if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
916	{	946	{
917	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	947	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
918	if (!QUERY_FLAG (op, FLAG_CURSED))	948	if (!op->flag [FLAG_CURSED])
919	op->value *= 3;	949	op->value *= 3;
920	}	950	}
921	break;	951	break;
922		952
923	case POTION:	953	case POTION:
924	{	954	{
925	int too_many_tries = 0, is_special = 0;	955	int too_many_tries = 0;
926		956
927	/* Handle healing and magic power potions */	957	/* Handle healing and magic power potions */
928	if (op->stats.sp && !op->randomitems)	958	if (op->stats.sp && !op->randomitems)
929	{	959	{
930	object *tmp;
931
932	tmp = get_archetype (spell_mapping[op->stats.sp]);	960	object *tmp = archetype::get (spell_mapping[op->stats.sp]);
933	insert_ob_in_ob (tmp, op);	961	insert_ob_in_ob (tmp, op);
934	op->stats.sp = 0;	962	op->stats.sp = 0;
935	}	963	}
936		964
937	while (!(is_special = special_potion (op)) && !op->inv)	965	while (!special_potion (op) && !op->inv)
938	{	966	{
939	generate_artifact (op, difficulty);	967	generate_artifact (op, difficulty);
940	if (too_many_tries++ > 10)	968	if (too_many_tries++ > 10)
941	break;	969	break;
942	}	970	}
…		…
945	* since the value set on those is already correct.	973	* since the value set on those is already correct.
946	*/	974	*/
947	if (op->inv && op->randomitems)	975	if (op->inv && op->randomitems)
948	{	976	{
949	/* value multiplier is same as for scrolls */	977	/* value multiplier is same as for scrolls */
950	op->value = (op->value * op->inv->value);	978	op->value *= op->inv->value;
951	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);	979	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
952	}	980	}
953	else	981	else
954	{	982	{
955	op->name = "potion";	983	op->name = shstr_potion;
956	op->name_pl = "potions";	984	op->name_pl = shstr_potions;
957	}	985	}
958		986
959	if (!(flags & GT_ONLY_GOOD) && rndm (2))	987	if (!(flags & GT_ONLY_GOOD) && rndm (2))
960	SET_FLAG (op, FLAG_CURSED);	988	op->set_flag (FLAG_CURSED);
		989
961	break;	990	break;
962	}	991	}
963		992
964	case AMULET:	993	case AMULET:
965	if (op->arch == amulet_arch)	994	if (IS_ARCH (op->arch, amulet))
966	op->value *= 5; /* Since it's not just decoration */	995	op->value *= 5; /* Since it's not just decoration */
967		996
968	case RING:	997	case RING:
969	if (op->arch == NULL)
970	{
971	op->destroy ();
972	op = 0;
973	break;
974	}
975
976	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	998	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
977	break;	999	break;
978		1000
979	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	1001	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
980	SET_FLAG (op, FLAG_CURSED);	1002	op->set_flag (FLAG_CURSED);
981		1003
982	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	1004	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
983		1005
984	if (op->type != RING) /* Amulets have only one ability */	1006	if (op->type != RING) /* Amulets have only one ability */
985	break;	1007	break;
986		1008
987	if (!(rndm (4)))	1009	if (!rndm (4))
988	{	1010	{
989	int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1011	int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
990		1012
991	if (d > 0)	1013	if (d > 0)
992	op->value *= 3;	1014	op->value *= 3;
993		1015
994	set_ring_bonus (op, d);	1016	set_ring_bonus (op, d);
995		1017
996	if (!(rndm (4)))	1018	if (!rndm (4))
997	{	1019	{
998	int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1020	int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
999		1021
1000	if (d > 0)	1022	if (d > 0)
1001	op->value *= 5;	1023	op->value *= 5;
		1024
1002	set_ring_bonus (op, d);	1025	set_ring_bonus (op, d);
1003	}	1026	}
1004	}	1027	}
1005		1028
1006	if (GET_ANIM_ID (op))	1029	if (op->animation_id)
1007	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));	1030	op->set_anim_frame (rndm (op->anim_frames ()));
1008		1031
1009	break;	1032	break;
1010		1033
1011	case BOOK:	1034	case BOOK:
1012	/* Is it an empty book?, if yes lets make a special·	1035	/* Is it an empty book?, if yes lets make a special·
…		…
1014	* creator and/or map level we found it on.	1037	* creator and/or map level we found it on.
1015	*/	1038	*/
1016	if (!op->msg && rndm (10))	1039	if (!op->msg && rndm (10))
1017	{	1040	{
1018	/* set the book level properly */	1041	/* set the book level properly */
1019	if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))	1042	if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1020	{	1043	{
1021	if (op->map && op->map->difficulty)	1044	if (op->map && op->map->difficulty)
1022	op->level = rndm (op->map->difficulty) + rndm (10) + 1;	1045	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1023	else	1046	else
1024	op->level = rndm (20) + 1;	1047	op->level = rndm (20) + 1;
…		…
1027	op->level = rndm (creator->level);	1050	op->level = rndm (creator->level);
1028		1051
1029	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1052	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1030	/* books w/ info are worth more! */	1053	/* books w/ info are worth more! */
1031	op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));	1054	op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1032	/* creator related stuff */
1033
1034	/* for library, chained books. Note that some monsters have no_pick
1035	* set - we don't want to set no pick in that case.
1036	*/
1037	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1038	SET_FLAG (op, FLAG_NO_PICK);
1039	if (creator->slaying && !op->slaying) /* for check_inv floors */
1040	op->slaying = creator->slaying;
1041		1055
1042	/* add exp so reading it gives xp (once) */	1056	/* add exp so reading it gives xp (once) */
1043	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;	1057	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1044	}	1058	}
		1059
		1060	/* creator related stuff */
		1061
		1062	/* for library, chained books. Note that some monsters have no_pick
		1063	* set - we don't want to set no pick in that case.
		1064	*/
		1065	if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
		1066	op->set_flag (FLAG_NO_PICK);
		1067	if (creator->slaying && !op->slaying) /* for check_inv floors */
		1068	op->slaying = creator->slaying;
1045	break;	1069	break;
1046		1070
1047	case SPELLBOOK:	1071	case SPELLBOOK:
1048	op->value = op->value * op->inv->value;	1072	op->value *= value_factor_from_spell_item (op->inv, 0);
		1073
1049	/* add exp so learning gives xp */	1074	/* add exp so learning gives xp */
1050	op->level = op->inv->level;	1075	op->level = op->inv->level;
1051	op->stats.exp = op->value;	1076	op->stats.exp = op->value;
1052	break;	1077	break;
1053		1078
…		…
1057	* and reset nrof.	1082	* and reset nrof.
1058	*/	1083	*/
1059	op->stats.food = op->inv->nrof;	1084	op->stats.food = op->inv->nrof;
1060	op->nrof = 1;	1085	op->nrof = 1;
1061	/* If the spell changes by level, choose a random level	1086	/* If the spell changes by level, choose a random level
1062	* for it, and adjust price. If the spell doesn't	1087	* for it.
1063	* change by level, just set the wand to the level of
1064	* the spell, and value calculation is simpler.
1065	*/	1088	*/
1066	if (op->inv->duration_modifier || op->inv->dam_modifier || op->inv->range_modifier)	1089	if (op->inv->duration_modifier
1067	{	1090	|| op->inv->dam_modifier
		1091	|| op->inv->range_modifier)
1068	op->level = level_for_item (op, difficulty);	1092	op->level = level_for_item (op, difficulty);
1069	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1070	}
1071	else	1093	else
1072	{
1073	op->level = op->inv->level;	1094	op->level = op->inv->level;
1074	op->value = op->value * op->inv->value;	1095
1075	}	1096	op->value *= value_factor_from_spell_item (op->inv, op);
1076	break;	1097	break;
1077		1098
1078	case ROD:	1099	case ROD:
1079	op->level = level_for_item (op, difficulty);	1100	op->level = level_for_item (op, difficulty);
1080	/* Add 50 to both level an divisor to keep prices a little more	1101	op->value *= value_factor_from_spell_item (op->inv, op);
1081	* reasonable. Otherwise, a high level version of a low level	1102
1082	* spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1083	* 10 time multiplier). This way, the value are a bit more reasonable.
1084	*/
1085	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1086	/* maxhp is used to denote how many 'charges' the rod holds before */	1103	/* maxhp is used to denote how many 'charges' the rod holds before */
1087	if (op->stats.maxhp)	1104	if (op->stats.maxhp)
1088	op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace);	1105	op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1089	else	1106	else
1090	op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace);	1107	op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1091		1108
1092	op->stats.hp = op->stats.maxhp;	1109	op->stats.hp = op->stats.maxhp;
1093	break;	1110	break;
1094		1111
1095	case SCROLL:	1112	case SCROLL:
1096	op->level = level_for_item (op, difficulty);	1113	op->level = level_for_item (op, difficulty);
1097	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);	1114	op->value *= value_factor_from_spell_item (op->inv, op);
1098		1115
1099	/* add exp so reading them properly gives xp */	1116	/* add exp so reading them properly gives xp */
1100	op->stats.exp = op->value / 5;	1117	op->stats.exp = op->value / 5;
1101	op->nrof = op->inv->nrof;	1118	op->nrof = op->inv->nrof;
1102	break;	1119	break;
…		…
1110	break;	1127	break;
1111	} /* switch type */	1128	} /* switch type */
1112		1129
1113	if (flags & GT_STARTEQUIP)	1130	if (flags & GT_STARTEQUIP)
1114	{	1131	{
1115	if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN))	1132	if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1116	SET_FLAG (op, FLAG_STARTEQUIP);	1133	op->set_flag (FLAG_STARTEQUIP);
1117	else if (op->type != MONEY)	1134	else if (op->type != MONEY)
1118	op->value = 0;	1135	op->value = 0;
1119	}	1136	}
1120		1137
1121	if (!(flags & GT_ENVIRONMENT))	1138	if (!(flags & GT_ENVIRONMENT))
…		…
1132		1149
1133	/*	1150	/*
1134	* Allocate and return the pointer to an empty artifactlist structure.	1151	* Allocate and return the pointer to an empty artifactlist structure.
1135	*/	1152	*/
1136	static artifactlist *	1153	static artifactlist *
1137	get_empty_artifactlist (void)	1154	get_empty_artifactlist ()
1138	{	1155	{
1139	return salloc0 <artifactlist> ();	1156	return salloc0<artifactlist> ();
1140	}	1157	}
1141		1158
1142	/*	1159	/*
1143	* Allocate and return the pointer to an empty artifact structure.	1160	* Allocate and return the pointer to an empty artifact structure.
1144	*/	1161	*/
1145	static artifact *	1162	static artifact *
1146	get_empty_artifact (void)	1163	get_empty_artifact ()
1147	{	1164	{
1148	return salloc0 <artifact> ();	1165	return salloc0<artifact> ();
1149	}	1166	}
1150		1167
1151	/*	1168	/*
1152	* Searches the artifact lists and returns one that has the same type	1169	* Searches the artifact lists and returns one that has the same type
1153	* of objects on it.	1170	* of objects on it.
…		…
1161		1178
1162	return 0;	1179	return 0;
1163	}	1180	}
1164		1181
1165	/*	1182	/*
1166	* For debugging purposes. Dumps all tables.	1183	* Builds up the lists of artifacts from the file in the libdir.
1167	*/	1184	*/
1168	void	1185	void
1169	dump_artifacts (void)
1170	{
1171	artifactlist *al;
1172	artifact *art;
1173	linked_char *next;
1174
1175	fprintf (logfile, "\n");
1176	for (al = first_artifactlist; al != NULL; al = al->next)
1177	{
1178	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1179	for (art = al->items; art != NULL; art = art->next)
1180	{
1181	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1182	if (art->allowed != NULL)
1183	{
1184	fprintf (logfile, "\tallowed combinations:");
1185	for (next = art->allowed; next != NULL; next = next->next)
1186	fprintf (logfile, "%s,", &next->name);
1187	fprintf (logfile, "\n");
1188	}
1189	}
1190	}
1191	fprintf (logfile, "\n");
1192	}
1193
1194	/*
1195	* For debugging purposes. Dumps all treasures recursively (see below).
1196	*/
1197	void
1198	dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1199	{
1200	treasurelist *tl;
1201	int i;
1202
1203	if (depth > 100)
1204	return;
1205
1206	while (t)
1207	{
1208	if (t->name)
1209	{
1210	for (i = 0; i < depth; i++)
1211	fprintf (logfile, " ");
1212
1213	fprintf (logfile, "{ (list: %s)\n", &t->name);
1214
1215	tl = treasurelist::find (t->name);
1216	if (tl)
1217	dump_monster_treasure_rec (name, tl->items, depth + 2);
1218
1219	for (i = 0; i < depth; i++)
1220	fprintf (logfile, " ");
1221
1222	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1223	}
1224	else
1225	{
1226	for (i = 0; i < depth; i++)
1227	fprintf (logfile, " ");
1228
1229	if (t->item && t->item->clone.type == FLESH)
1230	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1231	else
1232	fprintf (logfile, "%s\n", &t->item->clone.name);
1233	}
1234
1235	if (t->next_yes)
1236	{
1237	for (i = 0; i < depth; i++)
1238	fprintf (logfile, " ");
1239
1240	fprintf (logfile, " (if yes)\n");
1241	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1242	}
1243
1244	if (t->next_no)
1245	{
1246	for (i = 0; i < depth; i++)
1247	fprintf (logfile, " ");
1248
1249	fprintf (logfile, " (if no)\n");
1250	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1251	}
1252
1253	t = t->next;
1254	}
1255	}
1256
1257	/*
1258	* For debugging purposes. Dumps all treasures for a given monster.
1259	* Created originally by Raphael Quinet for debugging the alchemy code.
1260	*/
1261	void
1262	dump_monster_treasure (const char *name)
1263	{
1264	archetype *at;
1265	int found;
1266
1267	found = 0;
1268	fprintf (logfile, "\n");
1269
1270	for (at = first_archetype; at != NULL; at = at->next)
1271	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1272	{
1273	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1274	if (at->clone.randomitems != NULL)
1275	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1276	else
1277	fprintf (logfile, "(nothing)\n");
1278
1279	fprintf (logfile, "\n");
1280	found++;
1281	}
1282
1283	if (found == 0)
1284	fprintf (logfile, "No objects have the name %s!\n\n", name);
1285	}
1286
1287	/*
1288	* Builds up the lists of artifacts from the file in the libdir.
1289	*/
1290	void
1291	init_artifacts (void)	1186	init_artifacts ()
1292	{	1187	{
1293	static int has_been_inited = 0;	1188	static int has_been_inited = 0;
1294	char filename[MAX_BUF];
1295	artifact *art = NULL;	1189	artifact *art = NULL;
1296	artifactlist *al;	1190	artifactlist *al;
1297		1191
1298	if (has_been_inited)	1192	if (has_been_inited)
1299	return;	1193	return;
1300	else	1194	else
1301	has_been_inited = 1;	1195	has_been_inited = 1;
1302		1196
1303	sprintf (filename, "%s/artifacts", settings.datadir);	1197	object_thawer f (settings.datadir, "artifacts");
1304	object_thawer f (filename);
1305		1198
1306	if (!f)	1199	if (!f)
1307	return;	1200	return;
1308
1309	f.next ();
1310		1201
1311	for (;;)	1202	for (;;)
1312	{	1203	{
1313	switch (f.kw)	1204	switch (f.kw)
1314	{	1205	{
…		…
1318		1209
1319	{	1210	{
1320	if (!strcmp (f.get_str (), "all"))	1211	if (!strcmp (f.get_str (), "all"))
1321	break;	1212	break;
1322		1213
1323	char *next, *cp = f.get_str ();	1214	const char *cp = f.get_str ();
1324		1215	char *next;
1325	do	1216	do
1326	{	1217	{
1327	if ((next = strchr (cp, ',')))	1218	if ((next = (char *)strchr (cp, ',')))
1328	*next++ = '\0';	1219	*next++ = '\0';
1329		1220
1330	linked_char *tmp = new linked_char;	1221	linked_char *tmp = new linked_char;
1331		1222
1332	tmp->name = cp;	1223	tmp->name = cp;
…		…
1396	}	1287	}
1397	#if 0	1288	#if 0
1398	LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance);	1289	LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance);
1399	#endif	1290	#endif
1400	}	1291	}
1401
1402	LOG (llevDebug, "done.\n");
1403	}	1292	}
1404		1293
1405	/*	1294	/*
1406	* Used in artifact generation. The bonuses of the first object	1295	* Used in artifact generation. The bonuses of the first object
1407	* is modified by the bonuses of the second object.	1296	* is modified by the bonuses of the second object.
1408	*/	1297	*/
1409	void	1298	void
1410	add_abilities (object *op, object *change)	1299	add_abilities (object *op, object *change)
1411	{	1300	{
1412	int i, tmp;
1413
1414	if (change->face != blank_face)	1301	if (change->face != blank_face)
1415	{
1416	#ifdef TREASURE_VERBOSE
1417	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1418	#endif
1419	op->face = change->face;	1302	op->face = change->face;
1420	}
1421		1303
1422	for (i = 0; i < NUM_STATS; i++)	1304	for (int i = 0; i < NUM_STATS; i++)
1423	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1305	change_attr_value (&(op->stats), i, change->stats.stat (i));
1424		1306
1425	op->attacktype |= change->attacktype;	1307	op->attacktype |= change->attacktype;
1426	op->path_attuned |= change->path_attuned;	1308	op->path_attuned |= change->path_attuned;
1427	op->path_repelled |= change->path_repelled;	1309	op->path_repelled |= change->path_repelled;
1428	op->path_denied |= change->path_denied;	1310	op->path_denied |= change->path_denied;
1429	op->move_type |= change->move_type;	1311	op->move_type |= change->move_type;
1430	op->stats.luck += change->stats.luck;	1312	op->stats.luck += change->stats.luck;
1431		1313
1432	if (QUERY_FLAG (change, FLAG_CURSED))	1314	static const struct copyflags : object::flags_t
1433	SET_FLAG (op, FLAG_CURSED);	1315	{
1434	if (QUERY_FLAG (change, FLAG_DAMNED))	1316	copyflags ()
1435	SET_FLAG (op, FLAG_DAMNED);	1317	{
1436	if ((QUERY_FLAG (change, FLAG_CURSED) || QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0)	1318	set (FLAG_CURSED);
		1319	set (FLAG_DAMNED);
		1320	set (FLAG_LIFESAVE);
		1321	set (FLAG_REFL_SPELL);
		1322	set (FLAG_STEALTH);
		1323	set (FLAG_XRAYS);
		1324	set (FLAG_BLIND);
		1325	set (FLAG_SEE_IN_DARK);
		1326	set (FLAG_REFL_MISSILE);
		1327	set (FLAG_MAKE_INVIS);
		1328	}
		1329	} copyflags;
		1330
		1331	// we might want to just copy, but or'ing is what the original code did
		1332	op->flag |= change->flag & copyflags;
		1333
		1334	if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1437	set_abs_magic (op, -op->magic);	1335	set_abs_magic (op, -op->magic);
1438		1336
1439	if (QUERY_FLAG (change, FLAG_LIFESAVE))	1337	if (change->flag [FLAG_STAND_STILL])
1440	SET_FLAG (op, FLAG_LIFESAVE);
1441	if (QUERY_FLAG (change, FLAG_REFL_SPELL))
1442	SET_FLAG (op, FLAG_REFL_SPELL);
1443	if (QUERY_FLAG (change, FLAG_STEALTH))
1444	SET_FLAG (op, FLAG_STEALTH);
1445	if (QUERY_FLAG (change, FLAG_XRAYS))
1446	SET_FLAG (op, FLAG_XRAYS);
1447	if (QUERY_FLAG (change, FLAG_BLIND))
1448	SET_FLAG (op, FLAG_BLIND);
1449	if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))
1450	SET_FLAG (op, FLAG_SEE_IN_DARK);
1451	if (QUERY_FLAG (change, FLAG_REFL_MISSILE))
1452	SET_FLAG (op, FLAG_REFL_MISSILE);
1453	if (QUERY_FLAG (change, FLAG_MAKE_INVIS))
1454	SET_FLAG (op, FLAG_MAKE_INVIS);
1455
1456	if (QUERY_FLAG (change, FLAG_STAND_STILL))
1457	{	1338	{
1458	CLEAR_FLAG (op, FLAG_ANIMATE);	1339	op->clr_flag (FLAG_ANIMATE);
		1340
1459	/* so artifacts will join */	1341	/* so artifacts will join */
1460	if (!QUERY_FLAG (op, FLAG_ALIVE))	1342	if (!op->flag [FLAG_ALIVE])
1461	op->speed = 0.0;	1343	op->speed = 0.;
1462		1344
1463	op->set_speed (op->speed);	1345	op->set_speed (op->speed);
1464	}	1346	}
1465		1347
1466	if (change->nrof)	1348	if (change->nrof)
1467	op->nrof = rndm (change->nrof) + 1;	1349	op->nrof = rndm (change->nrof) + 1;
1468		1350
1469	op->stats.exp += change->stats.exp; /* Speed modifier */	1351	op->stats.exp += change->stats.exp; /* Speed modifier */
1470	op->stats.wc += change->stats.wc;	1352	op->stats.wc += change->stats.wc;
1471	op->stats.ac += change->stats.ac;	1353	op->stats.ac += change->stats.ac;
1472		1354
1473	if (change->other_arch)	1355	if (change->other_arch)
1474	{	1356	{
1475	/* Basically, for horns & potions, the other_arch field is the spell	1357	/* Basically, for horns & potions, the other_arch field is the spell
1476	* to cast. So convert that to into a spell and put it into	1358	* to cast. So convert that to into a spell and put it into
1477	* this object.	1359	* this object.
1478	*/	1360	*/
1479	if (op->type == HORN || op->type == POTION)	1361	if (op->type == HORN || op->type == POTION)
1480	{	1362	{
1481	object *tmp_obj;
1482
1483	/* Remove any spells this object currently has in it */	1363	/* Remove any spells this object currently has in it */
1484	while (op->inv)
1485	op->inv->destroy ();	1364	op->destroy_inv (false);
1486		1365
1487	tmp_obj = arch_to_object (change->other_arch);	1366	object *tmp = change->other_arch->instance ();
1488	insert_ob_in_ob (tmp_obj, op);	1367	insert_ob_in_ob (tmp, op);
1489	}	1368	}
		1369
1490	/* No harm setting this for potions/horns */	1370	/* No harm setting this for potions/horns */
1491	op->other_arch = change->other_arch;	1371	op->other_arch = change->other_arch;
1492	}	1372	}
1493		1373
1494	if (change->stats.hp < 0)	1374	if (change->stats.hp < 0)
…		…
1510	op->stats.maxsp = -change->stats.maxsp;	1390	op->stats.maxsp = -change->stats.maxsp;
1511	else	1391	else
1512	op->stats.maxsp += change->stats.maxsp;	1392	op->stats.maxsp += change->stats.maxsp;
1513		1393
1514	if (change->stats.food < 0)	1394	if (change->stats.food < 0)
1515	op->stats.food = -(change->stats.food);	1395	op->stats.food = -change->stats.food;
1516	else	1396	else
1517	op->stats.food += change->stats.food;	1397	op->stats.food += change->stats.food;
1518		1398
1519	if (change->level < 0)	1399	if (change->level < 0)
1520	op->level = -(change->level);	1400	op->level = -change->level;
1521	else	1401	else
1522	op->level += change->level;	1402	op->level += change->level;
1523		1403
1524	if (change->gen_sp_armour < 0)	1404	if (change->gen_sp_armour < 0)
1525	op->gen_sp_armour = -(change->gen_sp_armour);	1405	op->gen_sp_armour = -change->gen_sp_armour;
1526	else	1406	else
1527	op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100;	1407	op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1528		1408
1529	op->item_power = change->item_power;	1409	op->item_power = change->item_power;
1530		1410
1531	for (i = 0; i < NROFATTACKS; i++)	1411	for (int i = 0; i < NROFATTACKS; i++)
1532	if (change->resist[i])
1533	op->resist[i] += change->resist[i];	1412	op->resist[i] += change->resist[i];
1534		1413
1535	if (change->stats.dam)	1414	if (change->stats.dam)
1536	{	1415	{
1537	if (change->stats.dam < 0)	1416	if (change->stats.dam < 0)
1538	op->stats.dam = (-change->stats.dam);	1417	op->stats.dam = -change->stats.dam;
1539	else if (op->stats.dam)	1418	else if (op->stats.dam)
1540	{	1419	{
1541	tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10);	1420	int tmp = op->stats.dam * change->stats.dam / 10;
		1421
1542	if (tmp == op->stats.dam)	1422	if (tmp == op->stats.dam)
1543	{	1423	{
1544	if (change->stats.dam < 10)	1424	if (change->stats.dam < 10)
1545	op->stats.dam--;	1425	op->stats.dam--;
1546	else	1426	else
…		…
1552	}	1432	}
1553		1433
1554	if (change->weight)	1434	if (change->weight)
1555	{	1435	{
1556	if (change->weight < 0)	1436	if (change->weight < 0)
1557	op->weight = (-change->weight);	1437	op->weight = -change->weight;
1558	else	1438	else
1559	op->weight = (op->weight * (change->weight)) / 100;	1439	op->weight = op->weight * change->weight / 100;
1560	}	1440	}
1561		1441
1562	if (change->last_sp)	1442	if (change->last_sp)
1563	{	1443	{
1564	if (change->last_sp < 0)	1444	if (change->last_sp < 0)
1565	op->last_sp = (-change->last_sp);	1445	op->last_sp = -change->last_sp;
1566	else	1446	else
1567	op->last_sp = (signed char) (((int) op->last_sp * (int) change->last_sp) / (int) 100);	1447	op->last_sp = op->last_sp * (int)change->last_sp / 100;
1568	}	1448	}
1569		1449
1570	if (change->gen_sp_armour)	1450	if (change->gen_sp_armour)
1571	{	1451	{
1572	if (change->gen_sp_armour < 0)	1452	if (change->gen_sp_armour < 0)
1573	op->gen_sp_armour = (-change->gen_sp_armour);	1453	op->gen_sp_armour = -change->gen_sp_armour;
1574	else	1454	else
1575	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);	1455	op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1576	}	1456	}
1577		1457
1578	op->value *= change->value;	1458	op->value *= change->value;
1579		1459
1580	if (change->materials)	1460	if (change->materials)
1581	op->materials = change->materials;	1461	op->materials = change->materials;
1582		1462
1583	if (change->materialname)	1463	if (change->material != MATERIAL_NULL)
1584	op->materialname = change->materialname;	1464	op->material = change->material;
1585		1465
1586	if (change->slaying)	1466	if (change->slaying)
1587	op->slaying = change->slaying;	1467	op->slaying = change->slaying;
1588		1468
1589	if (change->race)	1469	if (change->race)
…		…
1612	name = tmp->name + 1, neg = 1;	1492	name = tmp->name + 1, neg = 1;
1613	else	1493	else
1614	name = tmp->name, neg = 0;	1494	name = tmp->name, neg = 0;
1615		1495
1616	/* If we match name, then return the opposite of 'neg' */	1496	/* If we match name, then return the opposite of 'neg' */
1617	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name)))	1497	if (!strcmp (name, op->arch->archname))
1618	return !neg;	1498	return !neg;
1619		1499
1620	/* Set success as true, since if the match was an inverse, it means	1500	/* Set success as true, since if the match was an inverse, it means
1621	* everything is allowed except what we match	1501	* everything is allowed except what we match
1622	*/	1502	*/
…		…
1633	*/	1513	*/
1634		1514
1635	void	1515	void
1636	give_artifact_abilities (object *op, object *artifct)	1516	give_artifact_abilities (object *op, object *artifct)
1637	{	1517	{
1638	char new_name[MAX_BUF];	1518	op->title = format ("of %s", &artifct->name);
1639		1519
1640	sprintf (new_name, "of %s", &artifct->name);
1641	op->title = new_name;
1642	add_abilities (op, artifct); /* Give out the bonuses */	1520	add_abilities (op, artifct); /* Give out the bonuses */
1643		1521
1644	#if 0 /* Bit verbose, but keep it here until next time I need it... */	1522	#if 0 /* Bit verbose, but keep it here until next time I need it... */
1645	{	1523	{
1646	char identified = QUERY_FLAG (op, FLAG_IDENTIFIED);	1524	char identified = op->flag [FLAG_IDENTIFIED];
1647		1525
1648	SET_FLAG (op, FLAG_IDENTIFIED);	1526	op->set_flag (FLAG_IDENTIFIED);
1649	LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));	1527	LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1650	if (!identified)	1528	if (!identified)
1651	CLEAR_FLAG (op, FLAG_IDENTIFIED);	1529	op->clr_flag (FLAG_IDENTIFIED);
1652	}	1530	}
1653	#endif	1531	#endif
1654	return;	1532	return;
1655	}	1533	}
1656		1534
…		…
1666	#define ARTIFACT_TRIES 2	1544	#define ARTIFACT_TRIES 2
1667		1545
1668	void	1546	void
1669	generate_artifact (object *op, int difficulty)	1547	generate_artifact (object *op, int difficulty)
1670	{	1548	{
1671	artifactlist *al;
1672	artifact *art;	1549	artifact *art;
1673	int i;
1674		1550
1675	al = find_artifactlist (op->type);	1551	artifactlist *al = find_artifactlist (op->type);
1676		1552
1677	if (al == NULL)	1553	if (al == NULL)
1678	{	1554	{
1679	#if 0 /* This is too verbose, usually */	1555	#if 0 /* This is too verbose, usually */
1680	LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);	1556	LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);
1681	#endif	1557	#endif
1682	return;	1558	return;
1683	}	1559	}
1684		1560
1685	for (i = 0; i < ARTIFACT_TRIES; i++)	1561	for (int i = 0; i < ARTIFACT_TRIES; i++)
1686	{	1562	{
1687	int roll = rndm (al->total_chance);	1563	int roll = rndm (al->total_chance);
1688		1564
1689	for (art = al->items; art; art = art->next)	1565	for (art = al->items; art; art = art->next)
1690	{	1566	{
…		…
1698	#if 1	1574	#if 1
1699	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);	1575	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1700	#endif	1576	#endif
1701	return;	1577	return;
1702	}	1578	}
1703	if (!strcmp (art->item->name, "NONE"))	1579
		1580	if (art->item->name == shstr_NONE)
1704	return;	1581	return;
		1582
1705	if (FABS (op->magic) < art->item->magic)	1583	if (fabs (op->magic) < art->item->magic)
1706	continue; /* Not magic enough to be this item */	1584	continue; /* Not magic enough to be this item */
1707		1585
1708	/* Map difficulty not high enough */	1586	/* Map difficulty not high enough */
1709	if (difficulty < art->difficulty)	1587	if (difficulty < art->difficulty)
1710	continue;	1588	continue;
…		…
1728	*/	1606	*/
1729		1607
1730	void	1608	void
1731	fix_flesh_item (object *item, object *donor)	1609	fix_flesh_item (object *item, object *donor)
1732	{	1610	{
1733	char tmpbuf[MAX_BUF];
1734	int i;
1735
1736	if (item->type == FLESH && donor)	1611	if (item->type == FLESH && donor)
1737	{	1612	{
1738	/* change the name */	1613	/* change the name */
1739	sprintf (tmpbuf, "%s's %s", &donor->name, &item->name);	1614	item->name = format ("%s's %s", &donor->name, &item->name);
1740	item->name = tmpbuf;
1741	sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl);	1615	item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1742	item->name_pl = tmpbuf;
1743		1616
1744	/* weight is FLESH weight/100 * donor */	1617	/* weight is FLESH weight/100 * donor */
1745	if ((item->weight = (signed long) (((double) item->weight / (double) 100.0) * (double) donor->weight)) == 0)	1618	item->weight = max (1, item->weight * donor->weight / 100);
1746	item->weight = 1;
1747		1619
1748	/* value is multiplied by level of donor */	1620	/* value is multiplied by level of donor */
1749	item->value *= isqrt (donor->level * 2);	1621	item->value *= isqrt (donor->level * 2);
1750		1622
1751	/* food value */	1623	/* food value */
1752	item->stats.food += (donor->stats.hp / 100) + donor->stats.Con;	1624	item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1753		1625
1754	/* flesh items inherit some abilities of donor, but not	1626	/* flesh items inherit some abilities of donor, but not
1755	* full effect.	1627	* full effect.
1756	*/	1628	*/
1757	for (i = 0; i < NROFATTACKS; i++)	1629	for (int i = 0; i < NROFATTACKS; i++)
1758	item->resist[i] = donor->resist[i] / 2;	1630	item->resist[i] = donor->resist[i] / 2;
1759		1631
1760	/* item inherits donor's level (important for quezals) */	1632	/* item inherits donor's level (important for quezals) */
1761	item->level = donor->level;	1633	item->level = donor->level;
1762		1634
1763	/* if donor has some attacktypes, the flesh is poisonous */	1635	/* if donor has some attacktypes, the flesh is poisonous */
1764	if (donor->attacktype & AT_POISON)	1636	if (donor->attacktype & AT_POISON)
1765	item->type = POISON;	1637	item->type = POISON;
		1638
1766	if (donor->attacktype & AT_ACID)	1639	if (donor->attacktype & AT_ACID)
1767	item->stats.hp = -1 * item->stats.food;	1640	item->stats.hp = -item->stats.food;
1768	SET_FLAG (item, FLAG_NO_STEAL);
1769	}
1770	}
1771		1641
1772	/* special_potion() - so that old potion code is still done right. */	1642	item->set_flag (FLAG_NO_STEAL);
1773	int	1643	}
1774	special_potion (object *op)
1775	{
1776	if (op->attacktype)
1777	return 1;
1778
1779	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1780	return 1;
1781
1782	for (int i = 0; i < NROFATTACKS; i++)
1783	if (op->resist[i])
1784	return 1;
1785
1786	return 0;
1787	}	1644	}
1788		1645
1789	void	1646	static void
1790	free_treasurestruct (treasure *t)	1647	free_treasurestruct (treasure *t)
1791	{	1648	{
1792	if (t->next) free_treasurestruct (t->next);	1649	if (t->next) free_treasurestruct (t->next);
1793	if (t->next_yes) free_treasurestruct (t->next_yes);	1650	if (t->next_yes) free_treasurestruct (t->next_yes);
1794	if (t->next_no) free_treasurestruct (t->next_no);	1651	if (t->next_no) free_treasurestruct (t->next_no);
1795		1652
1796	delete t;	1653	delete t;
1797	}	1654	}
1798		1655
1799	void	1656	static void
1800	free_charlinks (linked_char *lc)	1657	free_charlinks (linked_char *lc)
1801	{	1658	{
1802	if (lc->next)	1659	if (lc->next)
1803	free_charlinks (lc->next);	1660	free_charlinks (lc->next);
1804		1661
1805	delete lc;	1662	delete lc;
1806	}	1663	}
1807		1664
1808	void	1665	static void
1809	free_artifact (artifact *at)	1666	free_artifact (artifact *at)
1810	{	1667	{
1811	if (at->next) free_artifact (at->next);	1668	if (at->next) free_artifact (at->next);
1812	if (at->allowed) free_charlinks (at->allowed);	1669	if (at->allowed) free_charlinks (at->allowed);
1813		1670
1814	at->item->destroy (1);	1671	at->item->destroy ();
1815		1672
1816	sfree (at);	1673	sfree (at);
1817	}	1674	}
1818		1675
1819	void
1820	free_artifactlist (artifactlist *al)
1821	{
1822	artifactlist *nextal;
1823
1824	for (al = first_artifactlist; al; al = nextal)
1825	{
1826	nextal = al->next;
1827
1828	if (al->items)
1829	free_artifact (al->items);
1830
1831	sfree (al);
1832	}
1833	}
1834
1835	void
1836	free_all_treasures (void)
1837	{
1838	treasurelist *tl, *next;
1839
1840	for (tl = first_treasurelist; tl; tl = next)
1841	{
1842	clear (tl);
1843
1844	next = tl->next;
1845	delete tl;
1846	}
1847
1848	free_artifactlist (first_artifactlist);
1849	}

Diff Legend

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