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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.21 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.49 by root, Tue Apr 17 18:59:05 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	if (!(t->item = archetype::find (f.get_str ())))
123	else if (sscanf (cp, "change_name %s", variable))	151	LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
124	t->change_arch.name = variable;	152	break;
125	else if (sscanf (cp, "change_title %s", variable))	153
126	t->change_arch.title = variable;	154	case KW_list: f.get (t->name); break;
127	else if (sscanf (cp, "change_slaying %s", variable))	155	case KW_change_name: f.get (t->change_arch.name); break;
128	t->change_arch.slaying = variable;	156	case KW_change_title: f.get (t->change_arch.title); break;
129	else if (sscanf (cp, "chance %d", &value))	157	case KW_change_slaying: f.get (t->change_arch.slaying); break;
130	t->chance = (uint8) value;	158	case KW_chance: f.get (t->chance); break;
131	else if (sscanf (cp, "nrof %d", &value))	159	case KW_nrof: f.get (t->nrof); break;
132	t->nrof = (uint16) value;	160	case KW_magic: f.get (t->magic); break;
133	else if (sscanf (cp, "magic %d", &value))	161
134	t->magic = (uint8) value;	162	case KW_yes: t->next_yes = read_treasure (f); continue;
135	else if (!strcmp (cp, "yes"))	163	case KW_no: t->next_no = read_treasure (f); continue;
136	t->next_yes = load_treasure (fp, line);	164
137	else if (!strcmp (cp, "no"))	165	case KW_end:
138	t->next_no = load_treasure (fp, line);	166	f.next ();
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;	167	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		168
153	#ifdef TREASURE_DEBUG	169	case KW_more:
		170	t->next = read_treasure (f);
		171	return t;
154		172
155	/* recursived checks the linked list. Treasurelist is passed only	173	default:
156	* so that the treasure name can be printed out	174	if (!f.parse_error ("treasurelist", t->name))
157	*/	175	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		176
		177	return t;
		178	}
		179
		180	f.next ();
		181	}
		182	}
		183
177	/*	184	/*
178	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
179	* Each treasure is parsed with the help of load_treasure().	185	* Each treasure is parsed with the help of load_treasure().
180	*/	186	*/
181		187	treasurelist *
182	void	188	treasurelist::read (object_thawer &f)
183	load_treasures (void)
184	{	189	{
185	FILE *fp;	190	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		191
191	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	192	bool one = f.kw == KW_treasureone;
192	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	193	treasurelist *tl = treasurelist::get (f.get_str ());
193	{	194	clear (tl);
194	LOG (llevError, "Can't open treasure file.\n");	195	tl->items = read_treasure (f);
		196	if (!tl->items)
195	return;	197	return 0;
196	}
197	while (fgets (buf, MAX_BUF, fp) != NULL)
198	{
199	line++;
200	if (*buf == '#')
201	continue;
202		198
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.	199	/* 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	200	* Add up the chance total, and check to make sure the yes & no
217	* fields of the treasures are not being used.	201	* fields of the treasures are not being used.
218	*/	202	*/
219	if (!strncmp (buf, "treasureone", 11))	203	tl->total_chance = 0;
		204
		205	if (one)
		206	{
		207	for (treasure *t = tl->items; t; t = t->next)
		208	{
		209	if (t->next_yes \|\| t->next_no)
220	{	210	{
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);	211	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");	212	LOG (llevError, " the next_yes or next_no field is set\n");
228	}
229	#endif
230	tl->total_chance += t->chance;
231	}
232	}	213	}
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		214
239	#ifdef TREASURE_DEBUG	215	tl->total_chance += t->chance;
240	/* Perform some checks on how valid the treasure data actually is.	216	}
241	* verify that list transitions work (ie, the list that it is supposed	217	}
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		218
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;	219	return tl;
271	}	220	}
272
273		221
274	/*	222	/*
275	* Generates the objects specified by the given treasure.	223	* Generates the objects specified by the given treasure.
276	* It goes recursively through the rest of the linked list.	224	* It goes recursively through the rest of the linked list.
277	* If there is a certain percental chance for a treasure to be generated,	225	* If there is a certain percental chance for a treasure to be generated,
280	* being generated.	228	* being generated.
281	* If flag is GT_INVISIBLE, only invisible objects are generated (ie, only	229	* If flag is GT_INVISIBLE, only invisible objects are generated (ie, only
282	* abilities. This is used by summon spells, thus no summoned monsters	230	* abilities. This is used by summon spells, thus no summoned monsters
283	* start with equipment, but only their abilities).	231	* start with equipment, but only their abilities).
284	*/	232	*/
285
286
287	static void	233	static void
288	put_treasure (object op, object creator, int flags)	234	put_treasure (object op, object creator, int flags)
289	{	235	{
290	object *tmp;	236	object *tmp;
291		237
…		…
294	* this is the original object, or if this is an object that should be created	240	* this is the original object, or if this is an object that should be created
295	* by another object.	241	* by another object.
296	*/	242	*/
297	if (flags & GT_ENVIRONMENT && op->type != SPELL)	243	if (flags & GT_ENVIRONMENT && op->type != SPELL)
298	{	244	{
299	op->x = creator->x;
300	op->y = creator->y;
301	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	245	SET_FLAG (op, FLAG_OBJ_ORIGINAL);
302	insert_ob_in_map (op, creator->map, op, INS_NO_MERGE \| INS_NO_WALK_ON);	246	op->insert_at (creator, creator, INS_NO_MERGE \| INS_NO_WALK_ON);
303	}	247	}
304	else	248	else
305	{	249	{
306	op = insert_ob_in_ob (op, creator);	250	op = creator->insert (op);
		251
307	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	252	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
308	monster_check_apply (creator, op);	253	monster_check_apply (creator, op);
		254
309	if ((flags & GT_UPDATE_INV) && (tmp = is_player_inv (creator)) != NULL)	255	if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
310	esrv_send_item (tmp, op);	256	esrv_send_item (tmp, op);
311	}	257	}
312	}	258	}
313		259
314	/* if there are change_xxx commands in the treasure, we include the changes	260	/* if there are change_xxx commands in the treasure, we include the changes
…		…
329		275
330	if (t->change_arch.slaying)	276	if (t->change_arch.slaying)
331	op->slaying = t->change_arch.slaying;	277	op->slaying = t->change_arch.slaying;
332	}	278	}
333		279
334	void	280	static void
335	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)	281	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)
336	{	282	{
337	object *tmp;
338
339	if ((int) t->chance >= 100 \|\| (RANDOM () % 100 + 1) < (int) t->chance)	283	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)
340	{	284	{
341	if (t->name)	285	if (t->name)
342	{	286	{
343	if (strcmp (t->name, "NONE") && difficulty >= t->magic)	287	if (difficulty >= t->magic)
		288	if (treasurelist *tl = treasurelist::find (t->name))
344	create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries);	289	create_treasure (tl, op, flag, difficulty, tries);
		290	else
		291	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
345	}	292	}
346	else	293	else
347	{	294	{
348	if (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE))	295	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))
349	{	296	{
350	tmp = arch_to_object (t->item);	297	object *tmp = arch_to_object (t->item);
		298
351	if (t->nrof && tmp->nrof <= 1)	299	if (t->nrof && tmp->nrof <= 1)
352	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	300	tmp->nrof = rndm (t->nrof) + 1;
		301
353	fix_generated_item (tmp, op, difficulty, t->magic, flag);	302	fix_generated_item (tmp, op, difficulty, t->magic, flag);
354	change_treasure (t, tmp);	303	change_treasure (t, tmp);
355	put_treasure (tmp, op, flag);	304	put_treasure (tmp, op, flag);
356	}	305	}
357	}	306	}
358		307
359	if (t->next_yes != NULL)	308	if (t->next_yes)
360	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	309	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
361	}	310	}
362	else if (t->next_no != NULL)	311	else if (t->next_no)
363	create_all_treasures (t->next_no, op, flag, difficulty, tries);	312	create_all_treasures (t->next_no, op, flag, difficulty, tries);
364		313
365	if (t->next != NULL)	314	if (t->next)
366	create_all_treasures (t->next, op, flag, difficulty, tries);	315	create_all_treasures (t->next, op, flag, difficulty, tries);
367	}	316	}
368		317
369	void	318	static void
370	create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries)	319	create_one_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
371	{	320	{
372	int value = RANDOM () % tl->total_chance;	321	int value = rndm (tl->total_chance);
373	treasure *t;	322	treasure *t;
374		323
375	if (tries++ > 100)	324	if (tries++ > 100)
376	{	325	{
377	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");	326	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
378	return;	327	return;
379	}	328	}
380		329
381	for (t = tl->items; t != NULL; t = t->next)	330	for (t = tl->items; t; t = t->next)
382	{	331	{
383	value -= t->chance;	332	value -= t->chance;
384		333
385	if (value < 0)	334	if (value < 0)
386	break;	335	break;
387	}	336	}
388		337
389	if (!t \|\| value >= 0)	338	if (!t \|\| value >= 0)
390	{
391	LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n");	339	cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
392	abort ();
393	return;
394	}
395		340
396	if (t->name)	341	if (t->name)
397	{	342	{
398	if (!strcmp (t->name, "NONE"))
399	return;
400
401	if (difficulty >= t->magic)	343	if (difficulty >= t->magic)
		344	{
		345	treasurelist *tl = treasurelist::find (t->name);
		346	if (tl)
402	create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries);	347	create_treasure (tl, op, flag, difficulty, tries);
		348	}
403	else if (t->nrof)	349	else if (t->nrof)
404	create_one_treasure (tl, op, flag, difficulty, tries);	350	create_one_treasure (tl, op, flag, difficulty, tries);
405
406	return;
407	}	351	}
408
409	if ((t->item && t->item->clone.invisible != 0) \|\| flag != GT_INVISIBLE)	352	else if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))
410	{	353	{
411	object *tmp = arch_to_object (t->item);	354	if (object *tmp = arch_to_object (t->item))
412		355	{
413	if (!tmp)
414	return;
415
416	if (t->nrof && tmp->nrof <= 1)	356	if (t->nrof && tmp->nrof <= 1)
417	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	357	tmp->nrof = rndm (t->nrof) + 1;
418		358
419	fix_generated_item (tmp, op, difficulty, t->magic, flag);	359	fix_generated_item (tmp, op, difficulty, t->magic, flag);
420	change_treasure (t, tmp);	360	change_treasure (t, tmp);
421	put_treasure (tmp, op, flag);	361	put_treasure (tmp, op, flag);
		362	}
422	}	363	}
423	}	364	}
424		365
425	/* This calls the appropriate treasure creation function. tries is passed	366	/* This calls the appropriate treasure creation function. tries is passed
426	* to determine how many list transitions or attempts to create treasure	367	* to determine how many list transitions or attempts to create treasure
…		…
428	* list transitions, or so that excessively good treasure will not be	369	* 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	370	* created on weak maps, because it will exceed the number of allowed tries
430	* to do that.	371	* to do that.
431	*/	372	*/
432	void	373	void
433	create_treasure (treasurelist * t, object *op, int flag, int difficulty, int tries)	374	create_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
434	{	375	{
		376	// empty treasurelists are legal
		377	if (!tl->items)
		378	return;
435		379
436	if (tries++ > 100)	380	if (tries++ > 100)
437	{	381	{
438	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	382	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
439	return;	383	return;
440	}	384	}
		385
441	if (t->total_chance)	386	if (tl->total_chance)
442	create_one_treasure (t, op, flag, difficulty, tries);	387	create_one_treasure (tl, op, flag, difficulty, tries);
443	else	388	else
444	create_all_treasures (t->items, op, flag, difficulty, tries);	389	create_all_treasures (tl->items, op, flag, difficulty, tries);
445	}	390	}
446		391
447	/* This is similar to the old generate treasure function. However,	392	/* This is similar to the old generate treasure function. However,
448	* it instead takes a treasurelist. It is really just a wrapper around	393	* it instead takes a treasurelist. It is really just a wrapper around
449	* create_treasure. We create a dummy object that the treasure gets	394	* create_treasure. We create a dummy object that the treasure gets
450	* inserted into, and then return that treausre	395	* inserted into, and then return that treausre
451	*/	396	*/
452	object *	397	object *
453	generate_treasure (treasurelist * t, int difficulty)	398	generate_treasure (treasurelist *tl, int difficulty)
454	{	399	{
		400	difficulty = clamp (difficulty, 1, settings.max_level);
		401
455	object ob = get_object (), tmp;	402	object ob = object::create (), tmp;
456		403
457	create_treasure (t, ob, 0, difficulty, 0);	404	create_treasure (tl, ob, 0, difficulty, 0);
458		405
459	/* Don't want to free the object we are about to return */	406	/* Don't want to free the object we are about to return */
460	tmp = ob->inv;	407	tmp = ob->inv;
461	if (tmp != NULL)	408	if (tmp != NULL)
462	remove_ob (tmp);	409	tmp->remove ();
463		410
464	if (ob->inv)	411	if (ob->inv)
465	LOG (llevError, "In generate treasure, created multiple objects.\n");	412	LOG (llevError, "In generate treasure, created multiple objects.\n");
466		413
467	free_object (ob);	414	ob->destroy ();
468	return tmp;	415	return tmp;
469	}	416	}
470		417
471	/*	418	/*
472	* This is a new way of calculating the chance for an item to have	419	* This is a new way of calculating the chance for an item to have
…		…
475	* magical bonus "wanted".	422	* magical bonus "wanted".
476	*/	423	*/
477		424
478	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	425	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
479		426
480	/chance of magic difficulty/	427	// chance of magic difficulty
481
482	/* +0 +1 +2 +3 +4 */	428	// +0 +1 +2 +3 +4
483	{95, 2, 2, 1, 0}, /1 /	429	{95, 2, 2, 1, 0}, // 1
484	{92, 5, 2, 1, 0}, /2 /	430	{92, 5, 2, 1, 0}, // 2
485	{85, 10, 4, 1, 0}, /3 /	431	{85, 10, 4, 1, 0}, // 3
486	{80, 14, 4, 2, 0}, /4 /	432	{80, 14, 4, 2, 0}, // 4
487	{75, 17, 5, 2, 1}, /5 /	433	{75, 17, 5, 2, 1}, // 5
488	{70, 18, 8, 3, 1}, /6 /	434	{70, 18, 8, 3, 1}, // 6
489	{65, 21, 10, 3, 1}, /7 /	435	{65, 21, 10, 3, 1}, // 7
490	{60, 22, 12, 4, 2}, /8 /	436	{60, 22, 12, 4, 2}, // 8
491	{55, 25, 14, 4, 2}, /9 /	437	{55, 25, 14, 4, 2}, // 9
492	{50, 27, 16, 5, 2}, /10 /	438	{50, 27, 16, 5, 2}, // 10
493	{45, 28, 18, 6, 3}, /11 /	439	{45, 28, 18, 6, 3}, // 11
494	{42, 28, 20, 7, 3}, /12 /	440	{42, 28, 20, 7, 3}, // 12
495	{40, 27, 21, 8, 4}, /13 /	441	{40, 27, 21, 8, 4}, // 13
496	{38, 25, 22, 10, 5}, /14 /	442	{38, 25, 22, 10, 5}, // 14
497	{36, 23, 23, 12, 6}, /15 /	443	{36, 23, 23, 12, 6}, // 15
498	{33, 21, 24, 14, 8}, /16 /	444	{33, 21, 24, 14, 8}, // 16
499	{31, 19, 25, 16, 9}, /17 /	445	{31, 19, 25, 16, 9}, // 17
500	{27, 15, 30, 18, 10}, /18 /	446	{27, 15, 30, 18, 10}, // 18
501	{20, 12, 30, 25, 13}, /19 /	447	{20, 12, 30, 25, 13}, // 19
502	{15, 10, 28, 30, 17}, /20 /	448	{15, 10, 28, 30, 17}, // 20
503	{13, 9, 27, 28, 23}, /21 /	449	{13, 9, 27, 28, 23}, // 21
504	{10, 8, 25, 28, 29}, /22 /	450	{10, 8, 25, 28, 29}, // 22
505	{8, 7, 23, 26, 36}, /23 /	451	{ 8, 7, 23, 26, 36}, // 23
506	{6, 6, 20, 22, 46}, /24 /	452	{ 6, 6, 20, 22, 46}, // 24
507	{4, 5, 17, 18, 56}, /25 /	453	{ 4, 5, 17, 18, 56}, // 25
508	{2, 4, 12, 14, 68}, /26 /	454	{ 2, 4, 12, 14, 68}, // 26
509	{0, 3, 7, 10, 80}, /27 /	455	{ 0, 3, 7, 10, 80}, // 27
510	{0, 0, 3, 7, 90}, /28 /	456	{ 0, 0, 3, 7, 90}, // 28
511	{0, 0, 0, 3, 97}, /29 /	457	{ 0, 0, 0, 3, 97}, // 29
512	{0, 0, 0, 0, 100}, /30 /	458	{ 0, 0, 0, 0, 100}, // 30
513	{0, 0, 0, 0, 100}, /31 /	459	{ 0, 0, 0, 0, 100}, // 31
514	};	460	};
515		461
516		462
517	/* calculate the appropriate level for wands staves and scrolls.	463	/* calculate the appropriate level for wands staves and scrolls.
518	* This code presumes that op has had its spell object created (in op->inv)	464	* This code presumes that op has had its spell object created (in op->inv)
…		…
551	* elmex Thu Aug 10 18:45:44 CEST 2006:	497	* elmex Thu Aug 10 18:45:44 CEST 2006:
552	* Scaling difficulty by max_level, as difficulty is a level and not some	498	* Scaling difficulty by max_level, as difficulty is a level and not some
553	* weird integer between 1-31.	499	* weird integer between 1-31.
554	*	500	*
555	*/	501	*/
556
557	int	502	int
558	magic_from_difficulty (int difficulty)	503	magic_from_difficulty (int difficulty)
559	{	504	{
560	int percent = 0, magic = 0;	505	int percent = 0, magic = 0;
561	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	506	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
…		…
566	scaled_diff = 0;	511	scaled_diff = 0;
567		512
568	if (scaled_diff >= DIFFLEVELS)	513	if (scaled_diff >= DIFFLEVELS)
569	scaled_diff = DIFFLEVELS - 1;	514	scaled_diff = DIFFLEVELS - 1;
570		515
571	percent = RANDOM () % 100;	516	percent = rndm (100);
572		517
573	for (magic = 0; magic < (MAXMAGIC + 1); magic++)	518	for (magic = 0; magic < (MAXMAGIC + 1); magic++)
574	{	519	{
575	percent -= difftomagic_list[scaled_diff][magic];	520	percent -= difftomagic_list[scaled_diff][magic];
576		521
…		…
582	{	527	{
583	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);	528	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
584	magic = 0;	529	magic = 0;
585	}	530	}
586		531
587	magic = (RANDOM () % 3) ? magic : -magic;	532	magic = (rndm (3)) ? magic : -magic;
588	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */	533	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
589		534
590	return magic;	535	return magic;
591	}	536	}
592		537
…		…
607	if (op->arch)	552	if (op->arch)
608	{	553	{
609	if (op->type == ARMOUR)	554	if (op->type == ARMOUR)
610	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	555	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;
611		556
612	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	557	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
613	magic = (-magic);	558	magic = (-magic);
614	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	559	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;
615	}	560	}
616	else	561	else
617	{	562	{
618	if (op->type == ARMOUR)	563	if (op->type == ARMOUR)
619	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	564	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
620	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	565	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
621	magic = (-magic);	566	magic = (-magic);
622	op->weight = (op->weight * (100 - magic * 10)) / 100;	567	op->weight = (op->weight * (100 - magic * 10)) / 100;
623	}	568	}
624	}	569	}
625		570
…		…
649	* 1) Since rings can have multiple bonuses, if the same bonus	594	* 1) Since rings can have multiple bonuses, if the same bonus
650	* is rolled again, increase it - the bonuses now stack with	595	* is rolled again, increase it - the bonuses now stack with
651	* other bonuses previously rolled and ones the item might natively have.	596	* other bonuses previously rolled and ones the item might natively have.
652	* 2) Add code to deal with new PR method.	597	* 2) Add code to deal with new PR method.
653	*/	598	*/
654
655	void	599	void
656	set_ring_bonus (object *op, int bonus)	600	set_ring_bonus (object *op, int bonus)
657	{	601	{
658		602
659	int r = RANDOM () % (bonus > 0 ? 25 : 11);	603	int r = rndm (bonus > 0 ? 25 : 11);
660		604
661	if (op->type == AMULET)	605	if (op->type == AMULET)
662	{	606	{
663	if (!(RANDOM () % 21))	607	if (!(rndm (21)))
664	r = 20 + RANDOM () % 2;	608	r = 20 + rndm (2);
665	else	609	else
666	{	610	{
667	if (RANDOM () & 2)	611	if (rndm (2))
668	r = 10;	612	r = 10;
669	else	613	else
670	r = 11 + RANDOM () % 9;	614	r = 11 + rndm (9);
671	}	615	}
672	}	616	}
673		617
674	switch (r)	618	switch (r)
675	{	619	{
…		…
712	case 16:	656	case 16:
713	case 17:	657	case 17:
714	case 18:	658	case 18:
715	case 19:	659	case 19:
716	{	660	{
717	int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table;	661	int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
718		662
719	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */	663	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
720	val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b;	664	val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
721		665
722	/* Cursed items need to have higher negative values to equal out with	666	/* Cursed items need to have higher negative values to equal out with
723	* positive values for how protections work out. Put another	667	* positive values for how protections work out. Put another
724	* little random element in since that they don't always end up with	668	* little random element in since that they don't always end up with
725	* even values.	669	* even values.
726	*/	670	*/
727	if (bonus < 0)	671	if (bonus < 0)
728	val = 2 * -val - RANDOM () % b;	672	val = 2 * -val - rndm (b);
729	if (val > 35)	673	if (val > 35)
730	val = 35; /* Upper limit */	674	val = 35; /* Upper limit */
731	b = 0;	675	b = 0;
		676
732	while (op->resist[resist_table[resist]] != 0 && b < 4)	677	while (op->resist[resist_table[resist]] != 0 && b < 4)
733	{
734	resist = RANDOM () % num_resist_table;	678	resist = rndm (num_resist_table);
735	}	679
736	if (b == 4)	680	if (b == 4)
737	return; /* Not able to find a free resistance */	681	return; /* Not able to find a free resistance */
		682
738	op->resist[resist_table[resist]] = val;	683	op->resist[resist_table[resist]] = val;
739	/* We should probably do something more clever here to adjust value	684	/* We should probably do something more clever here to adjust value
740	* based on how good a resistance we gave.	685	* based on how good a resistance we gave.
741	*/	686	*/
742	break;	687	break;
…		…
770	case 22:	715	case 22:
771	op->stats.exp += bonus; /* Speed! */	716	op->stats.exp += bonus; /* Speed! */
772	op->value = (op->value * 2) / 3;	717	op->value = (op->value * 2) / 3;
773	break;	718	break;
774	}	719	}
		720
775	if (bonus > 0)	721	if (bonus > 0)
776	op->value = 2 bonus;	722	op->value = 2 bonus;
777	else	723	else
778	op->value = -(op->value * 2 * bonus) / 3;	724	op->value = -(op->value * 2 * bonus) / 3;
779	}	725	}
…		…
784	* higher is the chance of returning a low number.	730	* higher is the chance of returning a low number.
785	* It is only used in fix_generated_treasure() to set bonuses on	731	* It is only used in fix_generated_treasure() to set bonuses on
786	* rings and amulets.	732	* rings and amulets.
787	* Another scheme is used to calculate the magic of weapons and armours.	733	* Another scheme is used to calculate the magic of weapons and armours.
788	*/	734	*/
789
790	int	735	int
791	get_magic (int diff)	736	get_magic (int diff)
792	{	737	{
793	int i;	738	int i;
794		739
795	if (diff < 3)	740	if (diff < 3)
796	diff = 3;	741	diff = 3;
		742
797	for (i = 0; i < 4; i++)	743	for (i = 0; i < 4; i++)
798	if (RANDOM () % diff)	744	if (rndm (diff))
799	return i;	745	return i;
		746
800	return 4;	747	return 4;
801	}	748	}
802		749
803	#define DICE2 (get_magic(2)==2?2:1)	750	#define DICE2 (get_magic(2)==2?2:1)
804	#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3)	751	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
805		752
806	/*	753	/*
807	* fix_generated_item(): This is called after an item is generated, in	754	* 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	755	* order to set it up right. This produced magical bonuses, puts spells
809	* into scrolls/books/wands, makes it unidentified, hides the value, etc.	756	* into scrolls/books/wands, makes it unidentified, hides the value, etc.
…		…
823	* value.	770	* value.
824	* GT_MINIMAL: Does minimal processing on the object - just enough to make it	771	* 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	772	* 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	773	* type as appropriate, for objects that need spell objects, set those, etc
827	*/	774	*/
828
829	void	775	void
830	fix_generated_item (object op, object creator, int difficulty, int max_magic, int flags)	776	fix_generated_item (object op, object creator, int difficulty, int max_magic, int flags)
831	{	777	{
832	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;	778	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
833		779
…		…
840		786
841	if (op->randomitems && op->type != SPELL)	787	if (op->randomitems && op->type != SPELL)
842	{	788	{
843	create_treasure (op->randomitems, op, flags, difficulty, 0);	789	create_treasure (op->randomitems, op, flags, difficulty, 0);
844	if (!op->inv)	790	if (!op->inv)
845	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);	791	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
846		792
847	/* So the treasure doesn't get created again */	793	/* So the treasure doesn't get created again */
848	op->randomitems = NULL;	794	op->randomitems = 0;
849	}	795	}
850		796
851	if (difficulty < 1)	797	if (difficulty < 1)
852	difficulty = 1;	798	difficulty = 1;
		799
		800	if (INVOKE_OBJECT (ADD_BONUS, op,
		801	ARG_OBJECT (creator != op ? creator : 0),
		802	ARG_INT (difficulty), ARG_INT (max_magic),
		803	ARG_INT (flags)))
		804	return;
853		805
854	if (!(flags & GT_MINIMAL))	806	if (!(flags & GT_MINIMAL))
855	{	807	{
856	if (op->arch == crown_arch)	808	if (op->arch == crown_arch)
857	{	809	{
…		…
864	if (!op->magic && max_magic)	816	if (!op->magic && max_magic)
865	set_magic (difficulty, op, max_magic, flags);	817	set_magic (difficulty, op, max_magic, flags);
866		818
867	num_enchantments = calc_item_power (op, 1);	819	num_enchantments = calc_item_power (op, 1);
868		820
869	if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) \|\| op->type == HORN \|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	821	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
		822	\|\| op->type == HORN
		823	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,
870	* used for shop_floors or treasures */	824	* used for shop_floors or treasures */
871	generate_artifact (op, difficulty);	825	generate_artifact (op, difficulty);
872	}	826	}
873		827
874	/* Object was made an artifact. Calculate its item_power rating.	828	/* Object was made an artifact. Calculate its item_power rating.
…		…
932	case WEAPON:	886	case WEAPON:
933	case ARMOUR:	887	case ARMOUR:
934	case SHIELD:	888	case SHIELD:
935	case HELMET:	889	case HELMET:
936	case CLOAK:	890	case CLOAK:
937	if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4))	891	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
938	set_ring_bonus (op, -DICE2);	892	set_ring_bonus (op, -DICE2);
939	break;	893	break;
940		894
941	case BRACERS:	895	case BRACERS:
942	if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)))	896	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
943	{	897	{
944	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	898	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
945	if (!QUERY_FLAG (op, FLAG_CURSED))	899	if (!QUERY_FLAG (op, FLAG_CURSED))
946	op->value *= 3;	900	op->value *= 3;
947	}	901	}
…		…
973	*/	927	*/
974	if (op->inv && op->randomitems)	928	if (op->inv && op->randomitems)
975	{	929	{
976	/* value multiplier is same as for scrolls */	930	/* value multiplier is same as for scrolls */
977	op->value = (op->value * op->inv->value);	931	op->value = (op->value * op->inv->value);
978	op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty;	932	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
979	}	933	}
980	else	934	else
981	{	935	{
982	op->name = "potion";	936	op->name = "potion";
983	op->name_pl = "potions";	937	op->name_pl = "potions";
984	}	938	}
985		939
986	if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2)	940	if (!(flags & GT_ONLY_GOOD) && rndm (2))
987	SET_FLAG (op, FLAG_CURSED);	941	SET_FLAG (op, FLAG_CURSED);
988	break;	942	break;
989	}	943	}
990		944
991	case AMULET:	945	case AMULET:
…		…
993	op->value = 5; / Since it's not just decoration */	947	op->value = 5; / Since it's not just decoration */
994		948
995	case RING:	949	case RING:
996	if (op->arch == NULL)	950	if (op->arch == NULL)
997	{	951	{
998	remove_ob (op);	952	op->destroy ();
999	free_object (op);
1000	op = NULL;	953	op = 0;
1001	break;	954	break;
1002	}	955	}
1003		956
1004	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	957	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */
1005	break;	958	break;
1006		959
1007	if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3))	960	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1008	SET_FLAG (op, FLAG_CURSED);	961	SET_FLAG (op, FLAG_CURSED);
1009		962
1010	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	963	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1011		964
1012	if (op->type != RING) /* Amulets have only one ability */	965	if (op->type != RING) /* Amulets have only one ability */
1013	break;	966	break;
1014		967
1015	if (!(RANDOM () % 4))	968	if (!(rndm (4)))
1016	{	969	{
1017	int d = (RANDOM () % 2 \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	970	int d = (rndm (2) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1018		971
1019	if (d > 0)	972	if (d > 0)
1020	op->value *= 3;	973	op->value *= 3;
1021		974
1022	set_ring_bonus (op, d);	975	set_ring_bonus (op, d);
1023		976
1024	if (!(RANDOM () % 4))	977	if (!(rndm (4)))
1025	{	978	{
1026	int d = (RANDOM () % 3 \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	979	int d = (rndm (3) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1027		980
1028	if (d > 0)	981	if (d > 0)
1029	op->value *= 5;	982	op->value *= 5;
1030	set_ring_bonus (op, d);	983	set_ring_bonus (op, d);
1031	}	984	}
1032	}	985	}
1033		986
1034	if (GET_ANIM_ID (op))	987	if (GET_ANIM_ID (op))
1035	SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op)));	988	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1036		989
1037	break;	990	break;
1038		991
1039	case BOOK:	992	case BOOK:
1040	/* Is it an empty book?, if yes lets make a special·	993	/* Is it an empty book?, if yes lets make a special·
1041	* msg for it, and tailor its properties based on the·	994	* msg for it, and tailor its properties based on the·
1042	* creator and/or map level we found it on.	995	* creator and/or map level we found it on.
1043	*/	996	*/
1044	if (!op->msg && RANDOM () % 10)	997	if (!op->msg && rndm (10))
1045	{	998	{
1046	/* set the book level properly */	999	/* set the book level properly */
1047	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))	1000	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))
1048	{	1001	{
1049	if (op->map && op->map->difficulty)	1002	if (op->map && op->map->difficulty)
1050	op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1;	1003	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1051	else	1004	else
1052	op->level = RANDOM () % 20 + 1;	1005	op->level = rndm (20) + 1;
1053	}	1006	}
1054	else	1007	else
1055	op->level = RANDOM () % creator->level;	1008	op->level = rndm (creator->level);
1056		1009
1057	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1010	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1058	/* books w/ info are worth more! */	1011	/* books w/ info are worth more! */
1059	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));	1012	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));
1060	/* creator related stuff */	1013	/* creator related stuff */
…		…
1159	*/	1112	*/
1160		1113
1161	/*	1114	/*
1162	* Allocate and return the pointer to an empty artifactlist structure.	1115	* Allocate and return the pointer to an empty artifactlist structure.
1163	*/	1116	*/
1164
1165	static artifactlist *	1117	static artifactlist *
1166	get_empty_artifactlist (void)	1118	get_empty_artifactlist (void)
1167	{	1119	{
1168	artifactlist tl = (artifactlist ) malloc (sizeof (artifactlist));	1120	return salloc0 <artifactlist> ();
1169
1170	if (tl == NULL)
1171	fatal (OUT_OF_MEMORY);
1172	tl->next = NULL;
1173	tl->items = NULL;
1174	tl->total_chance = 0;
1175	return tl;
1176	}	1121	}
1177		1122
1178	/*	1123	/*
1179	* Allocate and return the pointer to an empty artifact structure.	1124	* Allocate and return the pointer to an empty artifact structure.
1180	*/	1125	*/
1181
1182	static artifact *	1126	static artifact *
1183	get_empty_artifact (void)	1127	get_empty_artifact (void)
1184	{	1128	{
1185	artifact t = (artifact ) malloc (sizeof (artifact));	1129	return salloc0 <artifact> ();
1186
1187	if (t == NULL)
1188	fatal (OUT_OF_MEMORY);
1189	t->item = NULL;
1190	t->next = NULL;
1191	t->chance = 0;
1192	t->difficulty = 0;
1193	t->allowed = NULL;
1194	return t;
1195	}	1130	}
1196		1131
1197	/*	1132	/*
1198	* Searches the artifact lists and returns one that has the same type	1133	* Searches the artifact lists and returns one that has the same type
1199	* of objects on it.	1134	* of objects on it.
1200	*/	1135	*/
1201
1202	artifactlist *	1136	artifactlist *
1203	find_artifactlist (int type)	1137	find_artifactlist (int type)
1204	{	1138	{
1205	artifactlist *al;
1206
1207	for (al = first_artifactlist; al != NULL; al = al->next)	1139	for (artifactlist *al = first_artifactlist; al; al = al->next)
1208	if (al->type == type)	1140	if (al->type == type)
1209	return al;	1141	return al;
		1142
1210	return NULL;	1143	return 0;
1211	}	1144	}
1212		1145
1213	/*	1146	/*
1214	* For debugging purposes. Dumps all tables.	1147	* For debugging purposes. Dumps all tables.
1215	*/	1148	*/
1216
1217	void	1149	void
1218	dump_artifacts (void)	1150	dump_artifacts (void)
1219	{	1151	{
1220	artifactlist *al;	1152	artifactlist *al;
1221	artifact *art;	1153	artifact *art;
…		…
1228	for (art = al->items; art != NULL; art = art->next)	1160	for (art = al->items; art != NULL; art = art->next)
1229	{	1161	{
1230	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);	1162	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1231	if (art->allowed != NULL)	1163	if (art->allowed != NULL)
1232	{	1164	{
1233	fprintf (logfile, "\tAllowed combinations:");	1165	fprintf (logfile, "\tallowed combinations:");
1234	for (next = art->allowed; next != NULL; next = next->next)	1166	for (next = art->allowed; next != NULL; next = next->next)
1235	fprintf (logfile, "%s,", &next->name);	1167	fprintf (logfile, "%s,", &next->name);
1236	fprintf (logfile, "\n");	1168	fprintf (logfile, "\n");
1237	}	1169	}
1238	}	1170	}
…		…
1249	treasurelist *tl;	1181	treasurelist *tl;
1250	int i;	1182	int i;
1251		1183
1252	if (depth > 100)	1184	if (depth > 100)
1253	return;	1185	return;
1254	while (t != NULL)	1186
		1187	while (t)
1255	{	1188	{
1256	if (t->name != NULL)	1189	if (t->name)
1257	{	1190	{
1258	for (i = 0; i < depth; i++)	1191	for (i = 0; i < depth; i++)
1259	fprintf (logfile, " ");	1192	fprintf (logfile, " ");
		1193
1260	fprintf (logfile, "{ (list: %s)\n", &t->name);	1194	fprintf (logfile, "{ (list: %s)\n", &t->name);
		1195
1261	tl = find_treasurelist (t->name);	1196	tl = treasurelist::find (t->name);
		1197	if (tl)
1262	dump_monster_treasure_rec (name, tl->items, depth + 2);	1198	dump_monster_treasure_rec (name, tl->items, depth + 2);
		1199
1263	for (i = 0; i < depth; i++)	1200	for (i = 0; i < depth; i++)
1264	fprintf (logfile, " ");	1201	fprintf (logfile, " ");
		1202
1265	fprintf (logfile, "} (end of list: %s)\n", &t->name);	1203	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1266	}	1204	}
1267	else	1205	else
1268	{	1206	{
1269	for (i = 0; i < depth; i++)	1207	for (i = 0; i < depth; i++)
1270	fprintf (logfile, " ");	1208	fprintf (logfile, " ");
		1209
1271	if (t->item->clone.type == FLESH)	1210	if (t->item && t->item->clone.type == FLESH)
1272	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);	1211	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1273	else	1212	else
1274	fprintf (logfile, "%s\n", &t->item->clone.name);	1213	fprintf (logfile, "%s\n", &t->item->clone.name);
1275	}	1214	}
		1215
1276	if (t->next_yes != NULL)	1216	if (t->next_yes)
1277	{	1217	{
1278	for (i = 0; i < depth; i++)	1218	for (i = 0; i < depth; i++)
1279	fprintf (logfile, " ");	1219	fprintf (logfile, " ");
		1220
1280	fprintf (logfile, " (if yes)\n");	1221	fprintf (logfile, " (if yes)\n");
1281	dump_monster_treasure_rec (name, t->next_yes, depth + 1);	1222	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1282	}	1223	}
		1224
1283	if (t->next_no != NULL)	1225	if (t->next_no)
1284	{	1226	{
1285	for (i = 0; i < depth; i++)	1227	for (i = 0; i < depth; i++)
1286	fprintf (logfile, " ");	1228	fprintf (logfile, " ");
		1229
1287	fprintf (logfile, " (if no)\n");	1230	fprintf (logfile, " (if no)\n");
1288	dump_monster_treasure_rec (name, t->next_no, depth + 1);	1231	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1289	}	1232	}
		1233
1290	t = t->next;	1234	t = t->next;
1291	}	1235	}
1292	}	1236	}
1293		1237
1294	/*	1238	/*
1295	* For debugging purposes. Dumps all treasures for a given monster.	1239	* For debugging purposes. Dumps all treasures for a given monster.
1296	* Created originally by Raphael Quinet for debugging the alchemy code.	1240	* Created originally by Raphael Quinet for debugging the alchemy code.
1297	*/	1241	*/
1298
1299	void	1242	void
1300	dump_monster_treasure (const char *name)	1243	dump_monster_treasure (const char *name)
1301	{	1244	{
1302	archetype *at;	1245	archetype *at;
1303	int found;	1246	int found;
1304		1247
1305	found = 0;	1248	found = 0;
1306	fprintf (logfile, "\n");	1249	fprintf (logfile, "\n");
		1250
1307	for (at = first_archetype; at != NULL; at = at->next)	1251	for (at = first_archetype; at != NULL; at = at->next)
1308	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)	1252	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1309	{	1253	{
1310	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);	1254	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1311	if (at->clone.randomitems != NULL)	1255	if (at->clone.randomitems != NULL)
1312	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);	1256	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1313	else	1257	else
1314	fprintf (logfile, "(nothing)\n");	1258	fprintf (logfile, "(nothing)\n");
		1259
1315	fprintf (logfile, "\n");	1260	fprintf (logfile, "\n");
1316	found++;	1261	found++;
1317	}	1262	}
		1263
1318	if (found == 0)	1264	if (found == 0)
1319	fprintf (logfile, "No objects have the name %s!\n\n", name);	1265	fprintf (logfile, "No objects have the name %s!\n\n", name);
1320	}	1266	}
1321		1267
1322	/*	1268	/*
1323	* Builds up the lists of artifacts from the file in the libdir.	1269	* Builds up the lists of artifacts from the file in the libdir.
1324	*/	1270	*/
1325
1326	void	1271	void
1327	init_artifacts (void)	1272	init_artifacts (void)
1328	{	1273	{
1329	static int has_been_inited = 0;	1274	static int has_been_inited = 0;
1330	char filename[MAX_BUF], buf[HUGE_BUF], cp, next;	1275	char filename[MAX_BUF];
1331	artifact *art = NULL;	1276	artifact *art = NULL;
1332	linked_char *tmp;
1333	int value;
1334	artifactlist *al;	1277	artifactlist *al;
1335		1278
1336	if (has_been_inited)	1279	if (has_been_inited)
1337	return;	1280	return;
1338	else	1281	else
1339	has_been_inited = 1;	1282	has_been_inited = 1;
1340		1283
1341	sprintf (filename, "%s/artifacts", settings.datadir);	1284	sprintf (filename, "%s/artifacts", settings.datadir);
1342	object_thawer thawer (filename);	1285	object_thawer f (filename);
1343		1286
1344	if (!thawer)	1287	if (!f)
1345	return;	1288	return;
1346		1289
1347	while (fgets (buf, HUGE_BUF, thawer) != NULL)	1290	f.next ();
1348	{
1349	if (*buf == '#')
1350	continue;
1351	if ((cp = strchr (buf, '\n')) != NULL)
1352	*cp = '\0';
1353	cp = buf;
1354	while (cp == ' ') / Skip blanks */
1355	cp++;
1356	if (*cp == '\0')
1357	continue;
1358		1291
1359	if (!strncmp (cp, "Allowed", 7))	1292	for (;;)
		1293	{
		1294	switch (f.kw)
1360	{	1295	{
		1296	case KW_allowed:
1361	if (art == NULL)	1297	if (!art)
		1298	art = get_empty_artifact ();
		1299
1362	{	1300	{
1363	art = get_empty_artifact ();	1301	if (!strcmp (f.get_str (), "all"))
1364	nrofartifacts++;	1302	break;
		1303
		1304	char next, cp = f.get_str ();
		1305
		1306	do
		1307	{
		1308	if ((next = strchr (cp, ',')))
		1309	*next++ = '\0';
		1310
		1311	linked_char *tmp = new linked_char;
		1312
		1313	tmp->name = cp;
		1314	tmp->next = art->allowed;
		1315	art->allowed = tmp;
		1316	}
		1317	while ((cp = next));
1365	}	1318	}
1366	cp = strchr (cp, ' ') + 1;	1319	break;
1367	if (!strcmp (cp, "all"))	1320
		1321	case KW_chance:
		1322	f.get (art->chance);
		1323	break;
		1324
		1325	case KW_difficulty:
		1326	f.get (art->difficulty);
		1327	break;
		1328
		1329	case KW_object:
		1330	{
		1331	art->item = object::create ();
		1332	f.get (art->item->name);
		1333	f.next ();
		1334
		1335	if (!art->item->parse_kv (f))
		1336	LOG (llevError, "Init_Artifacts: Could not load object.\n");
		1337
		1338	al = find_artifactlist (art->item->type);
		1339
		1340	if (!al)
		1341	{
		1342	al = get_empty_artifactlist ();
		1343	al->type = art->item->type;
		1344	al->next = first_artifactlist;
		1345	first_artifactlist = al;
		1346	}
		1347
		1348	art->next = al->items;
		1349	al->items = art;
		1350	art = 0;
		1351	}
1368	continue;	1352	continue;
1369		1353
1370	do	1354	case KW_EOF:
		1355	goto done;
		1356
		1357	default:
		1358	if (!f.parse_error ("artifacts file"))
		1359	cleanup ("artifacts file required");
1371	{	1360	break;
1372	nrofallowedstr++;
1373	if ((next = strchr (cp, ',')) != NULL)
1374	*(next++) = '\0';
1375	tmp = new linked_char;
1376
1377	tmp->name = cp;
1378	tmp->next = art->allowed;
1379	art->allowed = tmp;
1380	}
1381	while ((cp = next) != NULL);
1382	}
1383	else if (sscanf (cp, "chance %d", &value))
1384	art->chance = (uint16) value;
1385	else if (sscanf (cp, "difficulty %d", &value))
1386	art->difficulty = (uint8) value;
1387	else if (!strncmp (cp, "Object", 6))
1388	{	1361	}
1389	art->item = get_object ();
1390		1362
1391	if (!load_object (thawer, art->item, 0))	1363	f.next ();
1392	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1393
1394	art->item->name = strchr (cp, ' ') + 1;
1395	al = find_artifactlist (art->item->type);
1396	if (al == NULL)
1397	{
1398	al = get_empty_artifactlist ();
1399	al->type = art->item->type;
1400	al->next = first_artifactlist;
1401	first_artifactlist = al;
1402	}
1403	art->next = al->items;
1404	al->items = art;
1405	art = NULL;
1406	}
1407	else
1408	LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1409	}	1364	}
1410		1365
		1366	done:
1411	for (al = first_artifactlist; al != NULL; al = al->next)	1367	for (al = first_artifactlist; al; al = al->next)
1412	{	1368	{
		1369	al->total_chance = 0;
		1370
1413	for (art = al->items; art != NULL; art = art->next)	1371	for (art = al->items; art; art = art->next)
1414	{	1372	{
1415	if (!art->chance)	1373	if (!art->chance)
1416	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1374	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1417	else	1375	else
1418	al->total_chance += art->chance;	1376	al->total_chance += art->chance;
…		…
1423	}	1381	}
1424		1382
1425	LOG (llevDebug, "done.\n");	1383	LOG (llevDebug, "done.\n");
1426	}	1384	}
1427		1385
1428
1429	/*	1386	/*
1430	* Used in artifact generation. The bonuses of the first object	1387	* Used in artifact generation. The bonuses of the first object
1431	* is modified by the bonuses of the second object.	1388	* is modified by the bonuses of the second object.
1432	*/	1389	*/
1433
1434	void	1390	void
1435	add_abilities (object op, object change)	1391	add_abilities (object op, object change)
1436	{	1392	{
1437	int i, tmp;	1393	int i, tmp;
1438		1394
1439	if (change->face != blank_face)	1395	if (change->face != blank_face)
1440	{	1396	{
1441	#ifdef TREASURE_VERBOSE	1397	#ifdef TREASURE_VERBOSE
1442	LOG (llevDebug, "FACE: %d\n", change->face->number);	1398	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1443	#endif	1399	#endif
1444	op->face = change->face;	1400	op->face = change->face;
1445	}	1401	}
1446		1402
1447	for (i = 0; i < NUM_STATS; i++)	1403	for (i = 0; i < NUM_STATS; i++)
…		…
1483	CLEAR_FLAG (op, FLAG_ANIMATE);	1439	CLEAR_FLAG (op, FLAG_ANIMATE);
1484	/* so artifacts will join */	1440	/* so artifacts will join */
1485	if (!QUERY_FLAG (op, FLAG_ALIVE))	1441	if (!QUERY_FLAG (op, FLAG_ALIVE))
1486	op->speed = 0.0;	1442	op->speed = 0.0;
1487		1443
1488	update_ob_speed (op);	1444	op->set_speed (op->speed);
1489	}	1445	}
1490		1446
1491	if (change->nrof)	1447	if (change->nrof)
1492	op->nrof = RANDOM () % ((int) change->nrof) + 1;	1448	op->nrof = rndm (change->nrof) + 1;
1493		1449
1494	op->stats.exp += change->stats.exp; /* Speed modifier */	1450	op->stats.exp += change->stats.exp; /* Speed modifier */
1495	op->stats.wc += change->stats.wc;	1451	op->stats.wc += change->stats.wc;
1496	op->stats.ac += change->stats.ac;	1452	op->stats.ac += change->stats.ac;
1497		1453
…		…
1505	{	1461	{
1506	object *tmp_obj;	1462	object *tmp_obj;
1507		1463
1508	/* Remove any spells this object currently has in it */	1464	/* Remove any spells this object currently has in it */
1509	while (op->inv)	1465	while (op->inv)
1510	{	1466	op->inv->destroy ();
1511	tmp_obj = op->inv;
1512	remove_ob (tmp_obj);
1513	free_object (tmp_obj);
1514	}
1515		1467
1516	tmp_obj = arch_to_object (change->other_arch);	1468	tmp_obj = arch_to_object (change->other_arch);
1517	insert_ob_in_ob (tmp_obj, op);	1469	insert_ob_in_ob (tmp_obj, op);
1518	}	1470	}
1519	/* No harm setting this for potions/horns */	1471	/* No harm setting this for potions/horns */
…		…
1604	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);	1556	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1605	}	1557	}
1606		1558
1607	op->value *= change->value;	1559	op->value *= change->value;
1608		1560
1609	if (change->material)	1561	if (change->materials)
1610	op->material = change->material;	1562	op->materials = change->materials;
1611		1563
1612	if (change->materialname)	1564	if (change->materialname)
1613	op->materialname = change->materialname;	1565	op->materialname = change->materialname;
1614		1566
1615	if (change->slaying)	1567	if (change->slaying)
…		…
1632	if (art->allowed == (linked_char *) NULL)	1584	if (art->allowed == (linked_char *) NULL)
1633	return 1; /* Ie, "all" */	1585	return 1; /* Ie, "all" */
1634	for (tmp = art->allowed; tmp; tmp = tmp->next)	1586	for (tmp = art->allowed; tmp; tmp = tmp->next)
1635	{	1587	{
1636	#ifdef TREASURE_VERBOSE	1588	#ifdef TREASURE_VERBOSE
1637	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1589	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1638	#endif	1590	#endif
1639	if (*tmp->name == '!')	1591	if (*tmp->name == '!')
1640	name = tmp->name + 1, neg = 1;	1592	name = tmp->name + 1, neg = 1;
1641	else	1593	else
1642	name = tmp->name, neg = 0;	1594	name = tmp->name, neg = 0;
…		…
1709	return;	1661	return;
1710	}	1662	}
1711		1663
1712	for (i = 0; i < ARTIFACT_TRIES; i++)	1664	for (i = 0; i < ARTIFACT_TRIES; i++)
1713	{	1665	{
1714	int roll = RANDOM () % al->total_chance;	1666	int roll = rndm (al->total_chance);
1715		1667
1716	for (art = al->items; art != NULL; art = art->next)	1668	for (art = al->items; art; art = art->next)
1717	{	1669	{
1718	roll -= art->chance;	1670	roll -= art->chance;
1719	if (roll < 0)	1671	if (roll < 0)
1720	break;	1672	break;
1721	}	1673	}
…		…
1737	continue;	1689	continue;
1738		1690
1739	if (!legal_artifact_combination (op, art))	1691	if (!legal_artifact_combination (op, art))
1740	{	1692	{
1741	#ifdef TREASURE_VERBOSE	1693	#ifdef TREASURE_VERBOSE
1742	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1694	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1743	#endif	1695	#endif
1744	continue;	1696	continue;
1745	}	1697	}
		1698
1746	give_artifact_abilities (op, art->item);	1699	give_artifact_abilities (op, art->item);
1747	return;	1700	return;
1748	}	1701	}
1749	}	1702	}
1750		1703
…		…
1794	SET_FLAG (item, FLAG_NO_STEAL);	1747	SET_FLAG (item, FLAG_NO_STEAL);
1795	}	1748	}
1796	}	1749	}
1797		1750
1798	/* special_potion() - so that old potion code is still done right. */	1751	/* special_potion() - so that old potion code is still done right. */
1799
1800	int	1752	int
1801	special_potion (object *op)	1753	special_potion (object *op)
1802	{	1754	{
1803
1804	int i;
1805
1806	if (op->attacktype)	1755	if (op->attacktype)
1807	return 1;	1756	return 1;
1808		1757
1809	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)	1758	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)
1810	return 1;	1759	return 1;
1811		1760
1812	for (i = 0; i < NROFATTACKS; i++)	1761	for (int i = 0; i < NROFATTACKS; i++)
1813	if (op->resist[i])	1762	if (op->resist[i])
1814	return 1;	1763	return 1;
1815		1764
1816	return 0;	1765	return 0;
1817	}	1766	}
1818		1767
1819	void	1768	void
1820	free_treasurestruct (treasure *t)	1769	free_treasurestruct (treasure *t)
1821	{	1770	{
1822	if (t->next)
1823	free_treasurestruct (t->next);	1771	if (t->next) free_treasurestruct (t->next);
1824	if (t->next_yes)
1825	free_treasurestruct (t->next_yes);	1772	if (t->next_yes) free_treasurestruct (t->next_yes);
1826	if (t->next_no)
1827	free_treasurestruct (t->next_no);	1773	if (t->next_no) free_treasurestruct (t->next_no);
1828		1774
1829	delete t;	1775	delete t;
1830	}	1776	}
1831		1777
1832	void	1778	void
…		…
1837		1783
1838	delete lc;	1784	delete lc;
1839	}	1785	}
1840		1786
1841	void	1787	void
1842	free_artifact (artifact * at)	1788	free_artifact (artifact *at)
1843	{	1789	{
1844	if (at->next)
1845	free_artifact (at->next);	1790	if (at->next) free_artifact (at->next);
1846
1847	if (at->allowed)
1848	free_charlinks (at->allowed);	1791	if (at->allowed) free_charlinks (at->allowed);
1849		1792
1850	at->item->destroy (1);	1793	at->item->destroy (1);
1851		1794
1852	delete at;	1795	sfree (at);
1853	}	1796	}
1854		1797
1855	void	1798	void
1856	free_artifactlist (artifactlist * al)	1799	free_artifactlist (artifactlist *al)
1857	{	1800	{
1858	artifactlist *nextal;	1801	artifactlist *nextal;
1859		1802
1860	for (al = first_artifactlist; al; al = nextal)	1803	for (al = first_artifactlist; al; al = nextal)
1861	{	1804	{
1862	nextal = al->next;	1805	nextal = al->next;
1863		1806
1864	if (al->items)	1807	if (al->items)
1865	free_artifact (al->items);	1808	free_artifact (al->items);
1866		1809
1867	free (al);	1810	sfree (al);
1868	}	1811	}
1869	}	1812	}
1870		1813
1871	void	1814	void
1872	free_all_treasures (void)	1815	free_all_treasures (void)
1873	{	1816	{
1874	treasurelist tl, next;	1817	treasurelist tl, next;
1875		1818
1876
1877	for (tl = first_treasurelist; tl != NULL; tl = next)	1819	for (tl = first_treasurelist; tl; tl = next)
1878	{	1820	{
		1821	clear (tl);
		1822
1879	next = tl->next;	1823	next = tl->next;
1880	if (tl->items)
1881	free_treasurestruct (tl->items);
1882	delete tl;	1824	delete tl;
1883	}	1825	}
		1826
1884	free_artifactlist (first_artifactlist);	1827	free_artifactlist (first_artifactlist);
1885	}	1828	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.21 by root, Wed Sep 27 00:36:08 2006 UTC vs. Revision 1.49 by root, Tue Apr 17 18:59:05 2007 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.21 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.49 by root, Tue Apr 17 18:59:05 2007 UTC