ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.30 by elmex, Wed Jan 3 02:30:51 2007 UTC vs.
Revision 1.79 by root, Tue Jul 29 02:00:55 2008 UTC

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

Diff Legend

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