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.30 by elmex, Wed Jan 3 02:30:51 2007 UTC vs.
Revision 1.64 by root, Sun Jul 1 05:00:18 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23
24	#define ALLOWED_COMBINATION
25		23
26	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	24	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
27	* It is useful for finding bugs in the treasures file. Since it only	25	* It is useful for finding bugs in the treasures file. Since it only
28	* slows the startup some (and not actual game play), it is by default	26	* slows the startup some (and not actual game play), it is by default
29	* left on	27	* left on
30	*/	28	*/
31	#define TREASURE_DEBUG	29	#define TREASURE_DEBUG
32		30
33	/* TREASURE_VERBOSE enables copious output concerning artifact generation */	31	/* TREASURE_VERBOSE enables copious output concerning artifact generation */
34		32
35	/* #define TREASURE_VERBOSE */	33	//#define TREASURE_VERBOSE
36		34
37	#include <global.h>	35	#include <global.h>
38	#include <treasure.h>	36	#include <treasure.h>
39	#include <funcpoint.h>	37	#include <funcpoint.h>
40	#include <loader.h>	38	#include <loader.h>
41		39
		40	extern char *spell_mapping[];
		41
		42	static treasurelist *first_treasurelist;
42		43
43	static void change_treasure (treasure *t, object *op); /* overrule default values */	44	static void change_treasure (treasure *t, object *op); /* overrule default values */
44	extern char *spell_mapping[];
45		45
46	/*	46	typedef std::tr1::unordered_map<
47	* Initialize global archtype pointers:	47	const char *,
48	*/	48	treasurelist *,
		49	str_hash,
		50	str_equal,
		51	slice_allocator< std::pair<const char *const, treasurelist *> >,
		52	true
		53	> tl_map_t;
49		54
		55	static tl_map_t tl_map;
		56
		57	/*
		58	* Searches for the given treasurelist
		59	*/
		60	treasurelist *
		61	treasurelist::find (const char *name)
		62	{
		63	if (!name)
		64	return 0;
		65
		66	auto (i, tl_map.find (name));
		67
		68	if (i == tl_map.end ())
		69	return 0;
		70
		71	return i->second;
		72	}
		73
		74	/*
		75	* Searches for the given treasurelist in the globally linked list
		76	* of treasurelists which has been built by load_treasures().
		77	*/
		78	treasurelist *
		79	treasurelist::get (const char *name)
		80	{
		81	treasurelist *tl = find (name);
		82
		83	if (!tl)
		84	{
		85	tl = new treasurelist;
		86
		87	tl->name = name;
		88	tl->next = first_treasurelist;
		89	first_treasurelist = tl;
		90
		91	tl_map.insert (std::make_pair (tl->name, tl));
		92	}
		93
		94	return tl;
		95	}
		96
		97	//TODO: class method
50	void	98	void
51	init_archetype_pointers ()	99	clear (treasurelist *tl)
52	{	100	{
53	int prev_warn = warn_archetypes;	101	if (tl->items)
		102	{
		103	free_treasurestruct (tl->items);
		104	tl->items = 0;
		105	}
54		106
55	warn_archetypes = 1;
56	if (ring_arch == NULL)
57	ring_arch = archetype::find ("ring");
58	if (amulet_arch == NULL)
59	amulet_arch = archetype::find ("amulet");
60	if (staff_arch == NULL)
61	staff_arch = archetype::find ("staff");
62	if (crown_arch == NULL)
63	crown_arch = archetype::find ("crown");
64	warn_archetypes = prev_warn;
65	}
66
67	/*
68	* Allocate and return the pointer to an empty treasurelist structure.
69	*/
70
71	static treasurelist *
72	get_empty_treasurelist (void)
73	{
74	return new treasurelist;
75	}
76
77	/*
78	* Allocate and return the pointer to an empty treasure structure.
79	*/
80	//TODO: make this a constructor
81	static treasure *
82	get_empty_treasure (void)
83	{
84	treasure *t = new treasure;
85
86	t->chance = 100;	107	tl->total_chance = 0;
87
88	return t;
89	}	108	}
		109
		110	#ifdef TREASURE_DEBUG
		111	/* recursived checks the linked list. Treasurelist is passed only
		112	* so that the treasure name can be printed out
		113	*/
		114	static void
		115	check_treasurelist (const treasure *t, const treasurelist * tl)
		116	{
		117	if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
		118	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
		119
		120	if (t->next)
		121	check_treasurelist (t->next, tl);
		122
		123	if (t->next_yes)
		124	check_treasurelist (t->next_yes, tl);
		125
		126	if (t->next_no)
		127	check_treasurelist (t->next_no, tl);
		128	}
		129	#endif
90		130
91	/*	131	/*
92	* Reads the lib/treasure file from disk, and parses the contents	132	* Reads the lib/treasure file from disk, and parses the contents
93	* into an internal treasure structure (very linked lists)	133	* into an internal treasure structure (very linked lists)
94	*/	134	*/
95
96	static treasure *	135	static treasure *
97	load_treasure (FILE * fp, int *line)	136	read_treasure (object_thawer &f)
98	{	137	{
99	char buf[MAX_BUF], *cp, variable[MAX_BUF];
100	treasure *t = get_empty_treasure ();	138	treasure *t = new treasure;
101	int value;
102		139
103	nroftreasures++;	140	f.next ();
104	while (fgets (buf, MAX_BUF, fp) != NULL)
105	{
106	(*line)++;
107		141
108	if (*buf == '#')	142	for (;;)
109	continue;	143	{
110	if ((cp = strchr (buf, '\n')) != NULL)	144	coroapi::cede_to_tick_every (10);
111	*cp = '\0';
112	cp = buf;
113	while (isspace (*cp)) /* Skip blanks */
114	cp++;
115		145
116	if (sscanf (cp, "arch %s", variable))	146	switch (f.kw)
117	{
118	if ((t->item = archetype::find (variable)) == NULL)
119	LOG (llevError, "Treasure lacks archetype: %s\n", variable);
120	}	147	{
121	else if (sscanf (cp, "list %s", variable))	148	case KW_arch:
122	t->name = variable;	149	t->item = archetype::get (f.get_str ());
123	else if (sscanf (cp, "change_name %s", variable))	150	break;
124	t->change_arch.name = variable;	151
125	else if (sscanf (cp, "change_title %s", variable))	152	case KW_list: f.get (t->name); break;
126	t->change_arch.title = variable;	153	case KW_change_name: f.get (t->change_arch.name); break;
127	else if (sscanf (cp, "change_slaying %s", variable))	154	case KW_change_title: f.get (t->change_arch.title); break;
128	t->change_arch.slaying = variable;	155	case KW_change_slaying: f.get (t->change_arch.slaying); break;
129	else if (sscanf (cp, "chance %d", &value))	156	case KW_chance: f.get (t->chance); break;
130	t->chance = (uint8) value;	157	case KW_nrof: f.get (t->nrof); break;
131	else if (sscanf (cp, "nrof %d", &value))	158	case KW_magic: f.get (t->magic); break;
132	t->nrof = (uint16) value;	159
133	else if (sscanf (cp, "magic %d", &value))	160	case KW_yes: t->next_yes = read_treasure (f); continue;
134	t->magic = (uint8) value;	161	case KW_no: t->next_no = read_treasure (f); continue;
135	else if (!strcmp (cp, "yes"))	162
136	t->next_yes = load_treasure (fp, line);	163	case KW_end:
137	else if (!strcmp (cp, "no"))	164	f.next ();
138	t->next_no = load_treasure (fp, line);
139	else if (!strcmp (cp, "end"))
140	return t;
141	else if (!strcmp (cp, "more"))
142	{
143	t->next = load_treasure (fp, line);
144	return t;	165	return t;
145	}
146	else
147	LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
148	}
149	LOG (llevError, "treasure lacks 'end'.\n");
150	return t;
151	}
152		166
153	#ifdef TREASURE_DEBUG	167	case KW_more:
		168	t->next = read_treasure (f);
		169	return t;
154		170
155	/* recursived checks the linked list. Treasurelist is passed only	171	default:
156	* so that the treasure name can be printed out	172	if (!f.parse_error ("treasurelist", t->name))
157	*/	173	return 0;
158	static void
159	check_treasurelist (const treasure *t, const treasurelist * tl)
160	{
161	if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
162	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
163	/* find_treasurelist will print out its own error message */
164	if (t->name && *t->name)
165	find_treasurelist (t->name);
166	if (t->next)
167	check_treasurelist (t->next, tl);
168	if (t->next_yes)
169	check_treasurelist (t->next_yes, tl);
170	if (t->next_no)
171	check_treasurelist (t->next_no, tl);
172	}
173	#endif
174		174
		175	return t;
		176	}
		177
		178	f.next ();
		179	}
		180	}
		181
175	/*	182	/*
176	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
177	* Each treasure is parsed with the help of load_treasure().	183	* Each treasure is parsed with the help of load_treasure().
178	*/	184	*/
179		185	treasurelist *
180	void	186	treasurelist::read (object_thawer &f)
181	load_treasures (void)
182	{	187	{
183	FILE *fp;	188	assert (f.kw == KW_treasure || f.kw == KW_treasureone);
184	char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
185	treasurelist *previous = NULL;
186	treasure *t;
187	int comp, line = 0;
188		189
189	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	190	bool one = f.kw == KW_treasureone;
190	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	191	treasurelist *tl = treasurelist::get (f.get_str ());
191	{	192	clear (tl);
192	LOG (llevError, "Can't open treasure file.\n");	193	tl->items = read_treasure (f);
		194	if (!tl->items)
193	return;	195	return 0;
194	}
195	while (fgets (buf, MAX_BUF, fp) != NULL)
196	{
197	line++;
198	if (*buf == '#')
199	continue;
200		196
201	if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name))
202	{
203	treasurelist *tl = get_empty_treasurelist ();
204
205	tl->name = name;
206	if (previous == NULL)
207	first_treasurelist = tl;
208	else
209	previous->next = tl;
210	previous = tl;
211	tl->items = load_treasure (fp, &line);
212
213	/* This is a one of the many items on the list should be generated.	197	/* This is a one of the many items on the list should be generated.
214	* Add up the chance total, and check to make sure the yes & no	198	* Add up the chance total, and check to make sure the yes & no
215	* fields of the treasures are not being used.	199	* fields of the treasures are not being used.
216	*/	200	*/
217	if (!strncmp (buf, "treasureone", 11))	201	if (one)
		202	{
		203	for (treasure *t = tl->items; t; t = t->next)
		204	{
		205	if (t->next_yes || t->next_no)
218	{	206	{
219	for (t = tl->items; t != NULL; t = t->next)
220	{
221	#ifdef TREASURE_DEBUG
222	if (t->next_yes || t->next_no)
223	{
224	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);	207	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
225	LOG (llevError, " the next_yes or next_no field is set\n");	208	LOG (llevError, " the next_yes or next_no field is set\n");
226	}
227	#endif
228	tl->total_chance += t->chance;
229	}
230	}	209	}
231	}
232	else
233	LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
234	}
235	close_and_delete (fp, comp);
236		210
237	#ifdef TREASURE_DEBUG	211	tl->total_chance += t->chance;
238	/* Perform some checks on how valid the treasure data actually is.	212	}
239	* verify that list transitions work (ie, the list that it is supposed	213	}
240	* to transition to exists). Also, verify that at least the name
241	* or archetype is set for each treasure element.
242	*/
243	for (previous = first_treasurelist; previous != NULL; previous = previous->next)
244	check_treasurelist (previous->items, previous);
245	#endif
246	}
247		214
248	/*
249	* Searches for the given treasurelist in the globally linked list
250	* of treasurelists which has been built by load_treasures().
251	*/
252
253	treasurelist *
254	find_treasurelist (const char *name)
255	{
256	shstr_cmp name_ (name);
257
258	if (!name_)
259	return 0;
260
261	for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
262	if (name_ == tl->name)
263	return tl;
264
265	if (first_treasurelist)
266	LOG (llevError, "Couldn't find treasurelist %s\n", name);
267
268	return 0;	215	return tl;
269	}	216	}
270
271		217
272	/*	218	/*
273	* Generates the objects specified by the given treasure.	219	* Generates the objects specified by the given treasure.
274	* It goes recursively through the rest of the linked list.	220	* It goes recursively through the rest of the linked list.
275	* If there is a certain percental chance for a treasure to be generated,	221	* If there is a certain percental chance for a treasure to be generated,
…		…
281	* start with equipment, but only their abilities).	227	* start with equipment, but only their abilities).
282	*/	228	*/
283	static void	229	static void
284	put_treasure (object *op, object *creator, int flags)	230	put_treasure (object *op, object *creator, int flags)
285	{	231	{
286	object *tmp;	232	if (flags & GT_ENVIRONMENT)
287		233	{
288	/* Bit of a hack - spells should never be put onto the map. The entire	234	/* Bit of a hack - spells should never be put onto the map. The entire
289	* treasure stuff is a problem - there is no clear idea of knowing	235	* treasure stuff is a problem - there is no clear idea of knowing
290	* this is the original object, or if this is an object that should be created	236	* this is the original object, or if this is an object that should be created
291	* by another object.	237	* by another object.
292	*/	238	*/
293	if (flags & GT_ENVIRONMENT && op->type != SPELL)	239	//TODO: flag such as objects... as such (no drop, anybody?)
294	{	240	if (op->type == SPELL)
		241	{
		242	op->destroy ();
		243	return;
		244	}
		245
		246	op->expand_tail ();
		247
		248	if (ob_blocked (op, creator->map, creator->x, creator->y))
		249	op->destroy ();
		250	else
		251	{
295	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	252	SET_FLAG (op, FLAG_OBJ_ORIGINAL);
296	op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);	253	op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
		254	}
297	}	255	}
298	else	256	else
299	{	257	{
300	op = creator->insert (op);	258	op = creator->insert (op);
301		259
302	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	260	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
303	monster_check_apply (creator, op);	261	monster_check_apply (creator, op);
304		262
305	if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))	263	if (flags & GT_UPDATE_INV)
		264	if (object *tmp = creator->in_player ())
306	esrv_send_item (tmp, op);	265	esrv_send_item (tmp, op);
307	}	266	}
308	}	267	}
309		268
310	/* if there are change_xxx commands in the treasure, we include the changes	269	/* if there are change_xxx commands in the treasure, we include the changes
311	* in the generated object	270	* in the generated object
…		…
325		284
326	if (t->change_arch.slaying)	285	if (t->change_arch.slaying)
327	op->slaying = t->change_arch.slaying;	286	op->slaying = t->change_arch.slaying;
328	}	287	}
329		288
330	void	289	static void
331	create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)	290	create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
332	{	291	{
333	object *tmp;
334
335	if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance)	292	if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
336	{	293	{
337	if (t->name)	294	if (t->name)
338	{	295	{
339	if (difficulty >= t->magic)	296	if (difficulty >= t->magic)
		297	if (treasurelist *tl = treasurelist::find (t->name))
		298	create_treasure (tl, op, flag, difficulty, tries);
		299	else
		300	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
		301	}
		302	else
		303	{
		304	if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
340	{	305	{
341	treasurelist *tl = find_treasurelist (t->name);
342	if (tl)
343	create_treasure (tl, op, flag, difficulty, tries);
344	}
345	}
346	else
347	{
348	if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
349	{
350	tmp = arch_to_object (t->item);	306	object *tmp = arch_to_object (t->item);
		307
351	if (t->nrof && tmp->nrof <= 1)	308	if (t->nrof && tmp->nrof <= 1)
352	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	309	tmp->nrof = rndm (t->nrof) + 1;
		310
353	fix_generated_item (tmp, op, difficulty, t->magic, flag);	311	fix_generated_item (tmp, op, difficulty, t->magic, flag);
354	change_treasure (t, tmp);	312	change_treasure (t, tmp);
355	put_treasure (tmp, op, flag);	313	put_treasure (tmp, op, flag);
356	}	314	}
357	}	315	}
358		316
359	if (t->next_yes != NULL)	317	if (t->next_yes)
360	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	318	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
361	}	319	}
362	else if (t->next_no != NULL)	320	else if (t->next_no)
363	create_all_treasures (t->next_no, op, flag, difficulty, tries);	321	create_all_treasures (t->next_no, op, flag, difficulty, tries);
364		322
365	if (t->next != NULL)	323	if (t->next)
366	create_all_treasures (t->next, op, flag, difficulty, tries);	324	create_all_treasures (t->next, op, flag, difficulty, tries);
367	}	325	}
368		326
369	void	327	static void
370	create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries)	328	create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
371	{	329	{
372	int value = RANDOM () % tl->total_chance;	330	int value = rndm (tl->total_chance);
373	treasure *t;	331	treasure *t;
374		332
375	if (tries++ > 100)	333	if (tries++ > 100)
376	{	334	{
377	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");	335	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
378	return;	336	return;
379	}	337	}
380		338
381	for (t = tl->items; t != NULL; t = t->next)	339	for (t = tl->items; t; t = t->next)
382	{	340	{
383	value -= t->chance;	341	value -= t->chance;
384		342
385	if (value < 0)	343	if (value < 0)
386	break;	344	break;
387	}	345	}
388		346
389	if (!t || value >= 0)	347	if (!t || value >= 0)
390	{
391	LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n");	348	cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
392	abort ();
393	return;
394	}
395		349
396	if (t->name)	350	if (t->name)
397	{	351	{
398	if (difficulty >= t->magic)	352	if (difficulty >= t->magic)
399	{	353	{
400	treasurelist *tl = find_treasurelist (t->name);	354	treasurelist *tl = treasurelist::find (t->name);
401	if (tl)	355	if (tl)
402	create_treasure (tl, op, flag, difficulty, tries);	356	create_treasure (tl, op, flag, difficulty, tries);
403	}	357	}
404	else if (t->nrof)	358	else if (t->nrof)
405	create_one_treasure (tl, op, flag, difficulty, tries);	359	create_one_treasure (tl, op, flag, difficulty, tries);
406
407	return;
408	}	360	}
409
410	if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))	361	else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
411	{	362	{
412	object *tmp = arch_to_object (t->item);	363	if (object *tmp = arch_to_object (t->item))
413		364	{
414	if (!tmp)
415	return;
416
417	if (t->nrof && tmp->nrof <= 1)	365	if (t->nrof && tmp->nrof <= 1)
418	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	366	tmp->nrof = rndm (t->nrof) + 1;
419		367
420	fix_generated_item (tmp, op, difficulty, t->magic, flag);	368	fix_generated_item (tmp, op, difficulty, t->magic, flag);
421	change_treasure (t, tmp);	369	change_treasure (t, tmp);
422	put_treasure (tmp, op, flag);	370	put_treasure (tmp, op, flag);
		371	}
423	}	372	}
		373	}
		374
		375	void
		376	object::create_treasure (treasurelist *tl, int flags)
		377	{
		378	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
424	}	379	}
425		380
426	/* This calls the appropriate treasure creation function. tries is passed	381	/* This calls the appropriate treasure creation function. tries is passed
427	* to determine how many list transitions or attempts to create treasure	382	* to determine how many list transitions or attempts to create treasure
428	* have been made. It is really in place to prevent infinite loops with	383	* have been made. It is really in place to prevent infinite loops with
…		…
431	* to do that.	386	* to do that.
432	*/	387	*/
433	void	388	void
434	create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)	389	create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
435	{	390	{
		391	// empty treasurelists are legal
		392	if (!tl->items)
		393	return;
436		394
437	if (tries++ > 100)	395	if (tries++ > 100)
438	{	396	{
439	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	397	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
440	return;	398	return;
441	}	399	}
		400
		401	if (op->flag [FLAG_TREASURE_ENV])
		402	{
		403	// do not generate items when there already is something above the object
		404	if (op->flag [FLAG_IS_FLOOR] && op->above)
		405	return;
		406
		407	flag |= GT_ENVIRONMENT;
		408	}
		409
442	if (tl->total_chance)	410	if (tl->total_chance)
443	create_one_treasure (tl, op, flag, difficulty, tries);	411	create_one_treasure (tl, op, flag, difficulty, tries);
444	else	412	else
445	create_all_treasures (tl->items, op, flag, difficulty, tries);	413	create_all_treasures (tl->items, op, flag, difficulty, tries);
446	}	414	}
…		…
453	object *	421	object *
454	generate_treasure (treasurelist *tl, int difficulty)	422	generate_treasure (treasurelist *tl, int difficulty)
455	{	423	{
456	difficulty = clamp (difficulty, 1, settings.max_level);	424	difficulty = clamp (difficulty, 1, settings.max_level);
457		425
458	object *ob = object::create (), *tmp;	426	object *ob = object::create ();
459		427
460	create_treasure (tl, ob, 0, difficulty, 0);	428	create_treasure (tl, ob, 0, difficulty, 0);
461		429
462	/* Don't want to free the object we are about to return */	430	/* Don't want to free the object we are about to return */
463	tmp = ob->inv;	431	object *tmp = ob->inv;
464	if (tmp != NULL)	432	if (tmp)
465	tmp->remove ();	433	tmp->remove ();
466		434
467	if (ob->inv)	435	if (ob->inv)
468	LOG (llevError, "In generate treasure, created multiple objects.\n");	436	LOG (llevError, "In generate treasure, created multiple objects.\n");
469		437
…		…
477	* The array has two arguments, the difficulty of the level, and the	445	* The array has two arguments, the difficulty of the level, and the
478	* magical bonus "wanted".	446	* magical bonus "wanted".
479	*/	447	*/
480		448
481	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	449	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
482
483	/*chance of magic difficulty*/	450	// chance of magic difficulty
484
485	/* +0 +1 +2 +3 +4 */	451	// +0 +1 +2 +3 +4
486	{95, 2, 2, 1, 0}, /*1 */	452	{95, 2, 2, 1, 0}, // 1
487	{92, 5, 2, 1, 0}, /*2 */	453	{92, 5, 2, 1, 0}, // 2
488	{85, 10, 4, 1, 0}, /*3 */	454	{85, 10, 4, 1, 0}, // 3
489	{80, 14, 4, 2, 0}, /*4 */	455	{80, 14, 4, 2, 0}, // 4
490	{75, 17, 5, 2, 1}, /*5 */	456	{75, 17, 5, 2, 1}, // 5
491	{70, 18, 8, 3, 1}, /*6 */	457	{70, 18, 8, 3, 1}, // 6
492	{65, 21, 10, 3, 1}, /*7 */	458	{65, 21, 10, 3, 1}, // 7
493	{60, 22, 12, 4, 2}, /*8 */	459	{60, 22, 12, 4, 2}, // 8
494	{55, 25, 14, 4, 2}, /*9 */	460	{55, 25, 14, 4, 2}, // 9
495	{50, 27, 16, 5, 2}, /*10 */	461	{50, 27, 16, 5, 2}, // 10
496	{45, 28, 18, 6, 3}, /*11 */	462	{45, 28, 18, 6, 3}, // 11
497	{42, 28, 20, 7, 3}, /*12 */	463	{42, 28, 20, 7, 3}, // 12
498	{40, 27, 21, 8, 4}, /*13 */	464	{40, 27, 21, 8, 4}, // 13
499	{38, 25, 22, 10, 5}, /*14 */	465	{38, 25, 22, 10, 5}, // 14
500	{36, 23, 23, 12, 6}, /*15 */	466	{36, 23, 23, 12, 6}, // 15
501	{33, 21, 24, 14, 8}, /*16 */	467	{33, 21, 24, 14, 8}, // 16
502	{31, 19, 25, 16, 9}, /*17 */	468	{31, 19, 25, 16, 9}, // 17
503	{27, 15, 30, 18, 10}, /*18 */	469	{27, 15, 30, 18, 10}, // 18
504	{20, 12, 30, 25, 13}, /*19 */	470	{20, 12, 30, 25, 13}, // 19
505	{15, 10, 28, 30, 17}, /*20 */	471	{15, 10, 28, 30, 17}, // 20
506	{13, 9, 27, 28, 23}, /*21 */	472	{13, 9, 27, 28, 23}, // 21
507	{10, 8, 25, 28, 29}, /*22 */	473	{10, 8, 25, 28, 29}, // 22
508	{8, 7, 23, 26, 36}, /*23 */	474	{ 8, 7, 23, 26, 36}, // 23
509	{6, 6, 20, 22, 46}, /*24 */	475	{ 6, 6, 20, 22, 46}, // 24
510	{4, 5, 17, 18, 56}, /*25 */	476	{ 4, 5, 17, 18, 56}, // 25
511	{2, 4, 12, 14, 68}, /*26 */	477	{ 2, 4, 12, 14, 68}, // 26
512	{0, 3, 7, 10, 80}, /*27 */	478	{ 0, 3, 7, 10, 80}, // 27
513	{0, 0, 3, 7, 90}, /*28 */	479	{ 0, 0, 3, 7, 90}, // 28
514	{0, 0, 0, 3, 97}, /*29 */	480	{ 0, 0, 0, 3, 97}, // 29
515	{0, 0, 0, 0, 100}, /*30 */	481	{ 0, 0, 0, 0, 100}, // 30
516	{0, 0, 0, 0, 100}, /*31 */	482	{ 0, 0, 0, 0, 100}, // 31
517	};	483	};
518
519		484
520	/* calculate the appropriate level for wands staves and scrolls.	485	/* calculate the appropriate level for wands staves and scrolls.
521	* This code presumes that op has had its spell object created (in op->inv)	486	* This code presumes that op has had its spell object created (in op->inv)
522	*	487	*
523	* elmex Wed Aug 9 17:44:59 CEST 2006:	488	* elmex Wed Aug 9 17:44:59 CEST 2006:
524	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.	489	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.
525	*/	490	*/
526
527	int	491	int
528	level_for_item (const object *op, int difficulty)	492	level_for_item (const object *op, int difficulty)
529	{	493	{
530	int olevel = 0;	494	int olevel = 0;
531		495
…		…
554	* elmex Thu Aug 10 18:45:44 CEST 2006:	518	* elmex Thu Aug 10 18:45:44 CEST 2006:
555	* Scaling difficulty by max_level, as difficulty is a level and not some	519	* Scaling difficulty by max_level, as difficulty is a level and not some
556	* weird integer between 1-31.	520	* weird integer between 1-31.
557	*	521	*
558	*/	522	*/
559
560	int	523	int
561	magic_from_difficulty (int difficulty)	524	magic_from_difficulty (int difficulty)
562	{	525	{
563	int percent = 0, magic = 0;	526	int percent = 0, magic = 0;
564	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	527	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
…		…
569	scaled_diff = 0;	532	scaled_diff = 0;
570		533
571	if (scaled_diff >= DIFFLEVELS)	534	if (scaled_diff >= DIFFLEVELS)
572	scaled_diff = DIFFLEVELS - 1;	535	scaled_diff = DIFFLEVELS - 1;
573		536
574	percent = RANDOM () % 100;	537	percent = rndm (100);
575		538
576	for (magic = 0; magic < (MAXMAGIC + 1); magic++)	539	for (magic = 0; magic < (MAXMAGIC + 1); magic++)
577	{	540	{
578	percent -= difftomagic_list[scaled_diff][magic];	541	percent -= difftomagic_list[scaled_diff][magic];
579		542
…		…
585	{	548	{
586	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);	549	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
587	magic = 0;	550	magic = 0;
588	}	551	}
589		552
590	magic = (RANDOM () % 3) ? magic : -magic;	553	magic = (rndm (3)) ? magic : -magic;
591	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */	554	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
592		555
593	return magic;	556	return magic;
594	}	557	}
595		558
…		…
608		571
609	op->magic = magic;	572	op->magic = magic;
610	if (op->arch)	573	if (op->arch)
611	{	574	{
612	if (op->type == ARMOUR)	575	if (op->type == ARMOUR)
613	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	576	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
614		577
615	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	578	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
616	magic = (-magic);	579	magic = (-magic);
617	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	580	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
618	}	581	}
619	else	582	else
620	{	583	{
621	if (op->type == ARMOUR)	584	if (op->type == ARMOUR)
622	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	585	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
623	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	586	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
624	magic = (-magic);	587	magic = (-magic);
625	op->weight = (op->weight * (100 - magic * 10)) / 100;	588	op->weight = (op->weight * (100 - magic * 10)) / 100;
626	}	589	}
627	}	590	}
628		591
…		…
652	* 1) Since rings can have multiple bonuses, if the same bonus	615	* 1) Since rings can have multiple bonuses, if the same bonus
653	* is rolled again, increase it - the bonuses now stack with	616	* is rolled again, increase it - the bonuses now stack with
654	* other bonuses previously rolled and ones the item might natively have.	617	* other bonuses previously rolled and ones the item might natively have.
655	* 2) Add code to deal with new PR method.	618	* 2) Add code to deal with new PR method.
656	*/	619	*/
657
658	void	620	void
659	set_ring_bonus (object *op, int bonus)	621	set_ring_bonus (object *op, int bonus)
660	{	622	{
661		623
662	int r = RANDOM () % (bonus > 0 ? 25 : 11);	624	int r = rndm (bonus > 0 ? 25 : 11);
663		625
664	if (op->type == AMULET)	626	if (op->type == AMULET)
665	{	627	{
666	if (!(RANDOM () % 21))	628	if (!(rndm (21)))
667	r = 20 + RANDOM () % 2;	629	r = 20 + rndm (2);
668	else	630	else
669	{	631	{
670	if (RANDOM () & 2)	632	if (rndm (2))
671	r = 10;	633	r = 10;
672	else	634	else
673	r = 11 + RANDOM () % 9;	635	r = 11 + rndm (9);
674	}	636	}
675	}	637	}
676		638
677	switch (r)	639	switch (r)
678	{	640	{
…		…
685	case 2:	647	case 2:
686	case 3:	648	case 3:
687	case 4:	649	case 4:
688	case 5:	650	case 5:
689	case 6:	651	case 6:
690	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	652	op->stats.stat (r) += bonus;
691	break;	653	break;
692		654
693	case 7:	655	case 7:
694	op->stats.dam += bonus;	656	op->stats.dam += bonus;
695	break;	657	break;
…		…
715	case 16:	677	case 16:
716	case 17:	678	case 17:
717	case 18:	679	case 18:
718	case 19:	680	case 19:
719	{	681	{
720	int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table;	682	int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
721		683
722	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */	684	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
723	val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b;	685	val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
724		686
725	/* Cursed items need to have higher negative values to equal out with	687	/* Cursed items need to have higher negative values to equal out with
726	* positive values for how protections work out. Put another	688	* positive values for how protections work out. Put another
727	* little random element in since that they don't always end up with	689	* little random element in since that they don't always end up with
728	* even values.	690	* even values.
729	*/	691	*/
730	if (bonus < 0)	692	if (bonus < 0)
731	val = 2 * -val - RANDOM () % b;	693	val = 2 * -val - rndm (b);
732	if (val > 35)	694	if (val > 35)
733	val = 35; /* Upper limit */	695	val = 35; /* Upper limit */
734	b = 0;	696	b = 0;
		697
735	while (op->resist[resist_table[resist]] != 0 && b < 4)	698	while (op->resist[resist_table[resist]] != 0 && b < 4)
736	{
737	resist = RANDOM () % num_resist_table;	699	resist = rndm (num_resist_table);
738	}	700
739	if (b == 4)	701	if (b == 4)
740	return; /* Not able to find a free resistance */	702	return; /* Not able to find a free resistance */
		703
741	op->resist[resist_table[resist]] = val;	704	op->resist[resist_table[resist]] = val;
742	/* We should probably do something more clever here to adjust value	705	/* We should probably do something more clever here to adjust value
743	* based on how good a resistance we gave.	706	* based on how good a resistance we gave.
744	*/	707	*/
745	break;	708	break;
…		…
773	case 22:	736	case 22:
774	op->stats.exp += bonus; /* Speed! */	737	op->stats.exp += bonus; /* Speed! */
775	op->value = (op->value * 2) / 3;	738	op->value = (op->value * 2) / 3;
776	break;	739	break;
777	}	740	}
		741
778	if (bonus > 0)	742	if (bonus > 0)
779	op->value *= 2 * bonus;	743	op->value *= 2 * bonus;
780	else	744	else
781	op->value = -(op->value * 2 * bonus) / 3;	745	op->value = -(op->value * 2 * bonus) / 3;
782	}	746	}
…		…
787	* higher is the chance of returning a low number.	751	* higher is the chance of returning a low number.
788	* It is only used in fix_generated_treasure() to set bonuses on	752	* It is only used in fix_generated_treasure() to set bonuses on
789	* rings and amulets.	753	* rings and amulets.
790	* Another scheme is used to calculate the magic of weapons and armours.	754	* Another scheme is used to calculate the magic of weapons and armours.
791	*/	755	*/
792
793	int	756	int
794	get_magic (int diff)	757	get_magic (int diff)
795	{	758	{
796	int i;	759	int i;
797		760
798	if (diff < 3)	761	if (diff < 3)
799	diff = 3;	762	diff = 3;
		763
800	for (i = 0; i < 4; i++)	764	for (i = 0; i < 4; i++)
801	if (RANDOM () % diff)	765	if (rndm (diff))
802	return i;	766	return i;
		767
803	return 4;	768	return 4;
804	}	769	}
805		770
806	#define DICE2 (get_magic(2)==2?2:1)	771	#define DICE2 (get_magic(2)==2?2:1)
807	#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3)	772	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
808		773
809	/*	774	/*
810	* fix_generated_item(): This is called after an item is generated, in	775	* fix_generated_item(): This is called after an item is generated, in
811	* order to set it up right. This produced magical bonuses, puts spells	776	* order to set it up right. This produced magical bonuses, puts spells
812	* into scrolls/books/wands, makes it unidentified, hides the value, etc.	777	* into scrolls/books/wands, makes it unidentified, hides the value, etc.
…		…
826	* value.	791	* value.
827	* GT_MINIMAL: Does minimal processing on the object - just enough to make it	792	* GT_MINIMAL: Does minimal processing on the object - just enough to make it
828	* a working object - don't change magic, value, etc, but set it material	793	* a working object - don't change magic, value, etc, but set it material
829	* type as appropriate, for objects that need spell objects, set those, etc	794	* type as appropriate, for objects that need spell objects, set those, etc
830	*/	795	*/
831
832	void	796	void
833	fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)	797	fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
834	{	798	{
835	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;	799	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
836		800
…		…
841	save_item_power = op->item_power;	805	save_item_power = op->item_power;
842	op->item_power = 0;	806	op->item_power = 0;
843		807
844	if (op->randomitems && op->type != SPELL)	808	if (op->randomitems && op->type != SPELL)
845	{	809	{
846	create_treasure (op->randomitems, op, flags, difficulty, 0);	810	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
847	if (!op->inv)
848	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
849
850	/* So the treasure doesn't get created again */	811	/* So the treasure doesn't get created again */
851	op->randomitems = NULL;	812	op->randomitems = 0;
852	}	813	}
853		814
854	if (difficulty < 1)	815	if (difficulty < 1)
855	difficulty = 1;	816	difficulty = 1;
856		817
…		…
873	if (!op->magic && max_magic)	834	if (!op->magic && max_magic)
874	set_magic (difficulty, op, max_magic, flags);	835	set_magic (difficulty, op, max_magic, flags);
875		836
876	num_enchantments = calc_item_power (op, 1);	837	num_enchantments = calc_item_power (op, 1);
877		838
878	if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact,	839	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
		840	|| op->type == HORN
		841	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact,
879	* used for shop_floors or treasures */	842	* used for shop_floors or treasures */
880	generate_artifact (op, difficulty);	843	generate_artifact (op, difficulty);
881	}	844	}
882		845
883	/* Object was made an artifact. Calculate its item_power rating.	846	/* Object was made an artifact. Calculate its item_power rating.
…		…
941	case WEAPON:	904	case WEAPON:
942	case ARMOUR:	905	case ARMOUR:
943	case SHIELD:	906	case SHIELD:
944	case HELMET:	907	case HELMET:
945	case CLOAK:	908	case CLOAK:
946	if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4))	909	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
947	set_ring_bonus (op, -DICE2);	910	set_ring_bonus (op, -DICE2);
948	break;	911	break;
949		912
950	case BRACERS:	913	case BRACERS:
951	if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)))	914	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
952	{	915	{
953	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	916	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
954	if (!QUERY_FLAG (op, FLAG_CURSED))	917	if (!QUERY_FLAG (op, FLAG_CURSED))
955	op->value *= 3;	918	op->value *= 3;
956	}	919	}
…		…
982	*/	945	*/
983	if (op->inv && op->randomitems)	946	if (op->inv && op->randomitems)
984	{	947	{
985	/* value multiplier is same as for scrolls */	948	/* value multiplier is same as for scrolls */
986	op->value = (op->value * op->inv->value);	949	op->value = (op->value * op->inv->value);
987	op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty;	950	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
988	}	951	}
989	else	952	else
990	{	953	{
991	op->name = "potion";	954	op->name = "potion";
992	op->name_pl = "potions";	955	op->name_pl = "potions";
993	}	956	}
994		957
995	if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2)	958	if (!(flags & GT_ONLY_GOOD) && rndm (2))
996	SET_FLAG (op, FLAG_CURSED);	959	SET_FLAG (op, FLAG_CURSED);
997	break;	960	break;
998	}	961	}
999		962
1000	case AMULET:	963	case AMULET:
…		…
1010	}	973	}
1011		974
1012	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	975	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */
1013	break;	976	break;
1014		977
1015	if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3))	978	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1016	SET_FLAG (op, FLAG_CURSED);	979	SET_FLAG (op, FLAG_CURSED);
1017		980
1018	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	981	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1019		982
1020	if (op->type != RING) /* Amulets have only one ability */	983	if (op->type != RING) /* Amulets have only one ability */
1021	break;	984	break;
1022		985
1023	if (!(RANDOM () % 4))	986	if (!(rndm (4)))
1024	{	987	{
1025	int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	988	int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1026		989
1027	if (d > 0)	990	if (d > 0)
1028	op->value *= 3;	991	op->value *= 3;
1029		992
1030	set_ring_bonus (op, d);	993	set_ring_bonus (op, d);
1031		994
1032	if (!(RANDOM () % 4))	995	if (!(rndm (4)))
1033	{	996	{
1034	int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	997	int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1035		998
1036	if (d > 0)	999	if (d > 0)
1037	op->value *= 5;	1000	op->value *= 5;
1038	set_ring_bonus (op, d);	1001	set_ring_bonus (op, d);
1039	}	1002	}
1040	}	1003	}
1041		1004
1042	if (GET_ANIM_ID (op))	1005	if (GET_ANIM_ID (op))
1043	SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op)));	1006	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1044		1007
1045	break;	1008	break;
1046		1009
1047	case BOOK:	1010	case BOOK:
1048	/* Is it an empty book?, if yes lets make a special·	1011	/* Is it an empty book?, if yes lets make a special·
1049	* msg for it, and tailor its properties based on the·	1012	* msg for it, and tailor its properties based on the·
1050	* creator and/or map level we found it on.	1013	* creator and/or map level we found it on.
1051	*/	1014	*/
1052	if (!op->msg && RANDOM () % 10)	1015	if (!op->msg && rndm (10))
1053	{	1016	{
1054	/* set the book level properly */	1017	/* set the book level properly */
1055	if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))	1018	if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))
1056	{	1019	{
1057	if (op->map && op->map->difficulty)	1020	if (op->map && op->map->difficulty)
1058	op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1;	1021	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1059	else	1022	else
1060	op->level = RANDOM () % 20 + 1;	1023	op->level = rndm (20) + 1;
1061	}	1024	}
1062	else	1025	else
1063	op->level = RANDOM () % creator->level;	1026	op->level = rndm (creator->level);
1064		1027
1065	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1028	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1066	/* books w/ info are worth more! */	1029	/* books w/ info are worth more! */
1067	op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));	1030	op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1068	/* creator related stuff */	1031	/* creator related stuff */
…		…
1167	*/	1130	*/
1168		1131
1169	/*	1132	/*
1170	* Allocate and return the pointer to an empty artifactlist structure.	1133	* Allocate and return the pointer to an empty artifactlist structure.
1171	*/	1134	*/
1172
1173	static artifactlist *	1135	static artifactlist *
1174	get_empty_artifactlist (void)	1136	get_empty_artifactlist (void)
1175	{	1137	{
1176	artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist));	1138	return salloc0 <artifactlist> ();
1177
1178	if (al == NULL)
1179	fatal (OUT_OF_MEMORY);
1180	al->next = NULL;
1181	al->items = NULL;
1182	al->total_chance = 0;
1183	return al;
1184	}	1139	}
1185		1140
1186	/*	1141	/*
1187	* Allocate and return the pointer to an empty artifact structure.	1142	* Allocate and return the pointer to an empty artifact structure.
1188	*/	1143	*/
1189
1190	static artifact *	1144	static artifact *
1191	get_empty_artifact (void)	1145	get_empty_artifact (void)
1192	{	1146	{
1193	artifact *a = (artifact *) malloc (sizeof (artifact));	1147	return salloc0 <artifact> ();
1194
1195	if (a == NULL)
1196	fatal (OUT_OF_MEMORY);
1197	a->item = NULL;
1198	a->next = NULL;
1199	a->chance = 0;
1200	a->difficulty = 0;
1201	a->allowed = NULL;
1202	return a;
1203	}	1148	}
1204		1149
1205	/*	1150	/*
1206	* Searches the artifact lists and returns one that has the same type	1151	* Searches the artifact lists and returns one that has the same type
1207	* of objects on it.	1152	* of objects on it.
1208	*/	1153	*/
1209
1210	artifactlist *	1154	artifactlist *
1211	find_artifactlist (int type)	1155	find_artifactlist (int type)
1212	{	1156	{
1213	artifactlist *al;
1214
1215	for (al = first_artifactlist; al != NULL; al = al->next)	1157	for (artifactlist *al = first_artifactlist; al; al = al->next)
1216	if (al->type == type)	1158	if (al->type == type)
1217	return al;	1159	return al;
		1160
1218	return NULL;	1161	return 0;
1219	}	1162	}
1220		1163
1221	/*	1164	/*
1222	* For debugging purposes. Dumps all tables.	1165	* For debugging purposes. Dumps all tables.
1223	*/	1166	*/
1224
1225	void	1167	void
1226	dump_artifacts (void)	1168	dump_artifacts (void)
1227	{	1169	{
1228	artifactlist *al;	1170	artifactlist *al;
1229	artifact *art;	1171	artifact *art;
…		…
1236	for (art = al->items; art != NULL; art = art->next)	1178	for (art = al->items; art != NULL; art = art->next)
1237	{	1179	{
1238	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);	1180	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1239	if (art->allowed != NULL)	1181	if (art->allowed != NULL)
1240	{	1182	{
1241	fprintf (logfile, "\tAllowed combinations:");	1183	fprintf (logfile, "\tallowed combinations:");
1242	for (next = art->allowed; next != NULL; next = next->next)	1184	for (next = art->allowed; next != NULL; next = next->next)
1243	fprintf (logfile, "%s,", &next->name);	1185	fprintf (logfile, "%s,", &next->name);
1244	fprintf (logfile, "\n");	1186	fprintf (logfile, "\n");
1245	}	1187	}
1246	}	1188	}
…		…
1257	treasurelist *tl;	1199	treasurelist *tl;
1258	int i;	1200	int i;
1259		1201
1260	if (depth > 100)	1202	if (depth > 100)
1261	return;	1203	return;
		1204
1262	while (t)	1205	while (t)
1263	{	1206	{
1264	if (t->name)	1207	if (t->name)
1265	{	1208	{
1266	for (i = 0; i < depth; i++)	1209	for (i = 0; i < depth; i++)
1267	fprintf (logfile, " ");	1210	fprintf (logfile, " ");
		1211
1268	fprintf (logfile, "{ (list: %s)\n", &t->name);	1212	fprintf (logfile, "{ (list: %s)\n", &t->name);
		1213
1269	tl = find_treasurelist (t->name);	1214	tl = treasurelist::find (t->name);
1270	if (tl)	1215	if (tl)
1271	dump_monster_treasure_rec (name, tl->items, depth + 2);	1216	dump_monster_treasure_rec (name, tl->items, depth + 2);
		1217
1272	for (i = 0; i < depth; i++)	1218	for (i = 0; i < depth; i++)
1273	fprintf (logfile, " ");	1219	fprintf (logfile, " ");
		1220
1274	fprintf (logfile, "} (end of list: %s)\n", &t->name);	1221	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1275	}	1222	}
1276	else	1223	else
1277	{	1224	{
1278	for (i = 0; i < depth; i++)	1225	for (i = 0; i < depth; i++)
1279	fprintf (logfile, " ");	1226	fprintf (logfile, " ");
		1227
1280	if (t->item && t->item->clone.type == FLESH)	1228	if (t->item && t->item->type == FLESH)
1281	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);	1229	fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
1282	else	1230	else
1283	fprintf (logfile, "%s\n", &t->item->clone.name);	1231	fprintf (logfile, "%s\n", &t->item->object::name);
1284	}	1232	}
1285		1233
1286	if (t->next_yes)	1234	if (t->next_yes)
1287	{	1235	{
1288	for (i = 0; i < depth; i++)	1236	for (i = 0; i < depth; i++)
1289	fprintf (logfile, " ");	1237	fprintf (logfile, " ");
		1238
1290	fprintf (logfile, " (if yes)\n");	1239	fprintf (logfile, " (if yes)\n");
1291	dump_monster_treasure_rec (name, t->next_yes, depth + 1);	1240	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1292	}	1241	}
1293		1242
1294	if (t->next_no)	1243	if (t->next_no)
1295	{	1244	{
1296	for (i = 0; i < depth; i++)	1245	for (i = 0; i < depth; i++)
1297	fprintf (logfile, " ");	1246	fprintf (logfile, " ");
		1247
1298	fprintf (logfile, " (if no)\n");	1248	fprintf (logfile, " (if no)\n");
1299	dump_monster_treasure_rec (name, t->next_no, depth + 1);	1249	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1300	}	1250	}
1301		1251
1302	t = t->next;	1252	t = t->next;
…		…
1305		1255
1306	/*	1256	/*
1307	* For debugging purposes. Dumps all treasures for a given monster.	1257	* For debugging purposes. Dumps all treasures for a given monster.
1308	* Created originally by Raphael Quinet for debugging the alchemy code.	1258	* Created originally by Raphael Quinet for debugging the alchemy code.
1309	*/	1259	*/
1310
1311	void	1260	void
1312	dump_monster_treasure (const char *name)	1261	dump_monster_treasure (const char *name)
1313	{	1262	{
1314	archetype *at;	1263	archetype *at;
1315	int found;	1264	int found;
1316		1265
1317	found = 0;	1266	found = 0;
1318	fprintf (logfile, "\n");	1267	fprintf (logfile, "\n");
1319	for (at = first_archetype; at != NULL; at = at->next)	1268
		1269	for_all_archetypes (at)
1320	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)	1270	if (!strcasecmp (at->object::name, name) && at->title == NULL)
1321	{	1271	{
1322	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);	1272	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
1323	if (at->clone.randomitems != NULL)	1273	if (at->randomitems != NULL)
1324	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);	1274	dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
1325	else	1275	else
1326	fprintf (logfile, "(nothing)\n");	1276	fprintf (logfile, "(nothing)\n");
		1277
1327	fprintf (logfile, "\n");	1278	fprintf (logfile, "\n");
1328	found++;	1279	found++;
1329	}	1280	}
		1281
1330	if (found == 0)	1282	if (found == 0)
1331	fprintf (logfile, "No objects have the name %s!\n\n", name);	1283	fprintf (logfile, "No objects have the name %s!\n\n", name);
1332	}	1284	}
1333		1285
1334	/*	1286	/*
1335	* Builds up the lists of artifacts from the file in the libdir.	1287	* Builds up the lists of artifacts from the file in the libdir.
1336	*/	1288	*/
1337
1338	void	1289	void
1339	init_artifacts (void)	1290	init_artifacts (void)
1340	{	1291	{
1341	static int has_been_inited = 0;	1292	static int has_been_inited = 0;
1342	char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;	1293	char filename[MAX_BUF];
1343	artifact *art = NULL;	1294	artifact *art = NULL;
1344	linked_char *tmp;
1345	int value;
1346	artifactlist *al;	1295	artifactlist *al;
1347		1296
1348	if (has_been_inited)	1297	if (has_been_inited)
1349	return;	1298	return;
1350	else	1299	else
1351	has_been_inited = 1;	1300	has_been_inited = 1;
1352		1301
1353	sprintf (filename, "%s/artifacts", settings.datadir);	1302	sprintf (filename, "%s/artifacts", settings.datadir);
1354	object_thawer thawer (filename);	1303	object_thawer f (filename);
1355		1304
1356	if (!thawer)	1305	if (!f)
1357	return;	1306	return;
1358		1307
1359	while (fgets (buf, HUGE_BUF, thawer) != NULL)	1308	f.next ();
1360	{
1361	if (*buf == '#')
1362	continue;
1363	if ((cp = strchr (buf, '\n')) != NULL)
1364	*cp = '\0';
1365	cp = buf;
1366	while (*cp == ' ') /* Skip blanks */
1367	cp++;
1368	if (*cp == '\0')
1369	continue;
1370		1309
1371	if (!strncmp (cp, "Allowed", 7))	1310	for (;;)
		1311	{
		1312	switch (f.kw)
1372	{	1313	{
		1314	case KW_allowed:
1373	if (art == NULL)	1315	if (!art)
		1316	art = get_empty_artifact ();
		1317
1374	{	1318	{
1375	art = get_empty_artifact ();	1319	if (!strcmp (f.get_str (), "all"))
1376	nrofartifacts++;	1320	break;
		1321
		1322	char *next, *cp = f.get_str ();
		1323
		1324	do
		1325	{
		1326	if ((next = strchr (cp, ',')))
		1327	*next++ = '\0';
		1328
		1329	linked_char *tmp = new linked_char;
		1330
		1331	tmp->name = cp;
		1332	tmp->next = art->allowed;
		1333	art->allowed = tmp;
		1334	}
		1335	while ((cp = next));
1377	}	1336	}
1378	cp = strchr (cp, ' ') + 1;	1337	break;
1379	if (!strcmp (cp, "all"))	1338
		1339	case KW_chance:
		1340	f.get (art->chance);
		1341	break;
		1342
		1343	case KW_difficulty:
		1344	f.get (art->difficulty);
		1345	break;
		1346
		1347	case KW_object:
		1348	{
		1349	art->item = object::create ();
		1350	f.get (art->item->name);
		1351	f.next ();
		1352
		1353	if (!art->item->parse_kv (f))
		1354	LOG (llevError, "Init_Artifacts: Could not load object.\n");
		1355
		1356	al = find_artifactlist (art->item->type);
		1357
		1358	if (!al)
		1359	{
		1360	al = get_empty_artifactlist ();
		1361	al->type = art->item->type;
		1362	al->next = first_artifactlist;
		1363	first_artifactlist = al;
		1364	}
		1365
		1366	art->next = al->items;
		1367	al->items = art;
		1368	art = 0;
		1369	}
1380	continue;	1370	continue;
1381		1371
1382	do	1372	case KW_EOF:
		1373	goto done;
		1374
		1375	default:
		1376	if (!f.parse_error ("artifacts file"))
		1377	cleanup ("artifacts file required");
1383	{	1378	break;
1384	nrofallowedstr++;
1385	if ((next = strchr (cp, ',')) != NULL)
1386	*(next++) = '\0';
1387	tmp = new linked_char;
1388
1389	tmp->name = cp;
1390	tmp->next = art->allowed;
1391	art->allowed = tmp;
1392	}
1393	while ((cp = next) != NULL);
1394	}
1395	else if (sscanf (cp, "chance %d", &value))
1396	art->chance = (uint16) value;
1397	else if (sscanf (cp, "difficulty %d", &value))
1398	art->difficulty = (uint8) value;
1399	else if (!strncmp (cp, "Object", 6))
1400	{	1379	}
1401	art->item = object::create ();
1402		1380
1403	if (!load_object (thawer, art->item, 0))	1381	f.next ();
1404	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1405
1406	art->item->name = strchr (cp, ' ') + 1;
1407	al = find_artifactlist (art->item->type);
1408	if (al == NULL)
1409	{
1410	al = get_empty_artifactlist ();
1411	al->type = art->item->type;
1412	al->next = first_artifactlist;
1413	first_artifactlist = al;
1414	}
1415	art->next = al->items;
1416	al->items = art;
1417	art = NULL;
1418	}
1419	else
1420	LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1421	}	1382	}
1422		1383
		1384	done:
1423	for (al = first_artifactlist; al != NULL; al = al->next)	1385	for (al = first_artifactlist; al; al = al->next)
1424	{	1386	{
		1387	al->total_chance = 0;
		1388
1425	for (art = al->items; art != NULL; art = art->next)	1389	for (art = al->items; art; art = art->next)
1426	{	1390	{
1427	if (!art->chance)	1391	if (!art->chance)
1428	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1392	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1429	else	1393	else
1430	al->total_chance += art->chance;	1394	al->total_chance += art->chance;
…		…
1435	}	1399	}
1436		1400
1437	LOG (llevDebug, "done.\n");	1401	LOG (llevDebug, "done.\n");
1438	}	1402	}
1439		1403
1440
1441	/*	1404	/*
1442	* Used in artifact generation. The bonuses of the first object	1405	* Used in artifact generation. The bonuses of the first object
1443	* is modified by the bonuses of the second object.	1406	* is modified by the bonuses of the second object.
1444	*/	1407	*/
1445
1446	void	1408	void
1447	add_abilities (object *op, object *change)	1409	add_abilities (object *op, object *change)
1448	{	1410	{
1449	int i, tmp;	1411	int i, tmp;
1450		1412
1451	if (change->face != blank_face)	1413	if (change->face != blank_face)
1452	{	1414	{
1453	#ifdef TREASURE_VERBOSE	1415	#ifdef TREASURE_VERBOSE
1454	LOG (llevDebug, "FACE: %d\n", change->face->number);	1416	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1455	#endif	1417	#endif
1456	op->face = change->face;	1418	op->face = change->face;
1457	}	1419	}
1458		1420
1459	for (i = 0; i < NUM_STATS; i++)	1421	for (i = 0; i < NUM_STATS; i++)
1460	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1422	change_attr_value (&(op->stats), i, change->stats.stat (i));
1461		1423
1462	op->attacktype |= change->attacktype;	1424	op->attacktype |= change->attacktype;
1463	op->path_attuned |= change->path_attuned;	1425	op->path_attuned |= change->path_attuned;
1464	op->path_repelled |= change->path_repelled;	1426	op->path_repelled |= change->path_repelled;
1465	op->path_denied |= change->path_denied;	1427	op->path_denied |= change->path_denied;
…		…
1499		1461
1500	op->set_speed (op->speed);	1462	op->set_speed (op->speed);
1501	}	1463	}
1502		1464
1503	if (change->nrof)	1465	if (change->nrof)
1504	op->nrof = RANDOM () % ((int) change->nrof) + 1;	1466	op->nrof = rndm (change->nrof) + 1;
1505		1467
1506	op->stats.exp += change->stats.exp; /* Speed modifier */	1468	op->stats.exp += change->stats.exp; /* Speed modifier */
1507	op->stats.wc += change->stats.wc;	1469	op->stats.wc += change->stats.wc;
1508	op->stats.ac += change->stats.ac;	1470	op->stats.ac += change->stats.ac;
1509		1471
…		…
1612	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);	1574	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1613	}	1575	}
1614		1576
1615	op->value *= change->value;	1577	op->value *= change->value;
1616		1578
1617	if (change->material)	1579	if (change->materials)
1618	op->material = change->material;	1580	op->materials = change->materials;
1619		1581
1620	if (change->materialname)	1582	if (change->materialname)
1621	op->materialname = change->materialname;	1583	op->materialname = change->materialname;
1622		1584
1623	if (change->slaying)	1585	if (change->slaying)
…		…
1629	if (change->msg)	1591	if (change->msg)
1630	op->msg = change->msg;	1592	op->msg = change->msg;
1631	}	1593	}
1632		1594
1633	static int	1595	static int
1634	legal_artifact_combination (object *op, artifact * art)	1596	legal_artifact_combination (object *op, artifact *art)
1635	{	1597	{
1636	int neg, success = 0;	1598	int neg, success = 0;
1637	linked_char *tmp;	1599	linked_char *tmp;
1638	const char *name;	1600	const char *name;
1639		1601
1640	if (art->allowed == (linked_char *) NULL)	1602	if (!art->allowed)
1641	return 1; /* Ie, "all" */	1603	return 1; /* Ie, "all" */
		1604
1642	for (tmp = art->allowed; tmp; tmp = tmp->next)	1605	for (tmp = art->allowed; tmp; tmp = tmp->next)
1643	{	1606	{
1644	#ifdef TREASURE_VERBOSE	1607	#ifdef TREASURE_VERBOSE
1645	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1608	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1646	#endif	1609	#endif
1647	if (*tmp->name == '!')	1610	if (*tmp->name == '!')
1648	name = tmp->name + 1, neg = 1;	1611	name = tmp->name + 1, neg = 1;
1649	else	1612	else
1650	name = tmp->name, neg = 0;	1613	name = tmp->name, neg = 0;
1651		1614
1652	/* If we match name, then return the opposite of 'neg' */	1615	/* If we match name, then return the opposite of 'neg' */
1653	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name)))	1616	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1654	return !neg;	1617	return !neg;
1655		1618
1656	/* Set success as true, since if the match was an inverse, it means	1619	/* Set success as true, since if the match was an inverse, it means
1657	* everything is allowed except what we match	1620	* everything is allowed except what we match
1658	*/	1621	*/
1659	else if (neg)	1622	else if (neg)
1660	success = 1;	1623	success = 1;
1661	}	1624	}
		1625
1662	return success;	1626	return success;
1663	}	1627	}
1664		1628
1665	/*	1629	/*
1666	* Fixes the given object, giving it the abilities and titles	1630	* Fixes the given object, giving it the abilities and titles
…		…
1717	return;	1681	return;
1718	}	1682	}
1719		1683
1720	for (i = 0; i < ARTIFACT_TRIES; i++)	1684	for (i = 0; i < ARTIFACT_TRIES; i++)
1721	{	1685	{
1722	int roll = RANDOM () % al->total_chance;	1686	int roll = rndm (al->total_chance);
1723		1687
1724	for (art = al->items; art != NULL; art = art->next)	1688	for (art = al->items; art; art = art->next)
1725	{	1689	{
1726	roll -= art->chance;	1690	roll -= art->chance;
1727	if (roll < 0)	1691	if (roll < 0)
1728	break;	1692	break;
1729	}	1693	}
…		…
1745	continue;	1709	continue;
1746		1710
1747	if (!legal_artifact_combination (op, art))	1711	if (!legal_artifact_combination (op, art))
1748	{	1712	{
1749	#ifdef TREASURE_VERBOSE	1713	#ifdef TREASURE_VERBOSE
1750	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1714	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1751	#endif	1715	#endif
1752	continue;	1716	continue;
1753	}	1717	}
		1718
1754	give_artifact_abilities (op, art->item);	1719	give_artifact_abilities (op, art->item);
1755	return;	1720	return;
1756	}	1721	}
1757	}	1722	}
1758		1723
…		…
1802	SET_FLAG (item, FLAG_NO_STEAL);	1767	SET_FLAG (item, FLAG_NO_STEAL);
1803	}	1768	}
1804	}	1769	}
1805		1770
1806	/* special_potion() - so that old potion code is still done right. */	1771	/* special_potion() - so that old potion code is still done right. */
1807
1808	int	1772	int
1809	special_potion (object *op)	1773	special_potion (object *op)
1810	{	1774	{
1811	if (op->attacktype)	1775	if (op->attacktype)
1812	return 1;	1776	return 1;
…		…
1822	}	1786	}
1823		1787
1824	void	1788	void
1825	free_treasurestruct (treasure *t)	1789	free_treasurestruct (treasure *t)
1826	{	1790	{
1827	if (t->next)
1828	free_treasurestruct (t->next);	1791	if (t->next) free_treasurestruct (t->next);
1829	if (t->next_yes)
1830	free_treasurestruct (t->next_yes);	1792	if (t->next_yes) free_treasurestruct (t->next_yes);
1831	if (t->next_no)
1832	free_treasurestruct (t->next_no);	1793	if (t->next_no) free_treasurestruct (t->next_no);
1833		1794
1834	delete t;	1795	delete t;
1835	}	1796	}
1836		1797
1837	void	1798	void
…		…
1842		1803
1843	delete lc;	1804	delete lc;
1844	}	1805	}
1845		1806
1846	void	1807	void
1847	free_artifact (artifact * at)	1808	free_artifact (artifact *at)
1848	{	1809	{
1849	if (at->next)
1850	free_artifact (at->next);	1810	if (at->next) free_artifact (at->next);
1851
1852	if (at->allowed)
1853	free_charlinks (at->allowed);	1811	if (at->allowed) free_charlinks (at->allowed);
1854		1812
1855	at->item->destroy (1);	1813	at->item->destroy (1);
1856		1814
1857	delete at;	1815	sfree (at);
1858	}	1816	}
1859		1817
1860	void	1818	void
1861	free_artifactlist (artifactlist * al)	1819	free_artifactlist (artifactlist *al)
1862	{	1820	{
1863	artifactlist *nextal;	1821	artifactlist *nextal;
1864		1822
1865	for (al = first_artifactlist; al; al = nextal)	1823	for (al = first_artifactlist; al; al = nextal)
1866	{	1824	{
1867	nextal = al->next;	1825	nextal = al->next;
1868		1826
1869	if (al->items)	1827	if (al->items)
1870	free_artifact (al->items);	1828	free_artifact (al->items);
1871		1829
1872	free (al);	1830	sfree (al);
1873	}	1831	}
1874	}	1832	}
1875		1833
1876	void	1834	void
1877	free_all_treasures (void)	1835	free_all_treasures (void)
1878	{	1836	{
1879	treasurelist *tl, *next;	1837	treasurelist *tl, *next;
1880		1838
1881
1882	for (tl = first_treasurelist; tl != NULL; tl = next)	1839	for (tl = first_treasurelist; tl; tl = next)
1883	{	1840	{
		1841	clear (tl);
		1842
1884	next = tl->next;	1843	next = tl->next;
1885	if (tl->items)
1886	free_treasurestruct (tl->items);
1887	delete tl;	1844	delete tl;
1888	}	1845	}
		1846
1889	free_artifactlist (first_artifactlist);	1847	free_artifactlist (first_artifactlist);
1890	}	1848	}

Diff Legend

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