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.21 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.42 by root, Mon Apr 16 10:14:25 2007 UTC

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

Diff Legend

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