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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.22 by root, Sun Dec 10 20:15:57 2006 UTC vs.
Revision 1.50 by root, Thu Apr 19 16:23:46 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.22 by root, Sun Dec 10 20:15:57 2006 UTC vs. Revision 1.50 by root, Thu Apr 19 16:23:46 2007 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.22 by root, Sun Dec 10 20:15:57 2006 UTC vs.
Revision 1.50 by root, Thu Apr 19 16:23:46 2007 UTC