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.25 by root, Tue Dec 12 22:37:05 2006 UTC vs.
Revision 1.61 by root, Mon May 28 21:21:40 2007 UTC

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

Diff Legend

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