ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.116 by pippijn, Mon Jan 15 21:06:18 2007 UTC

1
2	/*	1	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.24 2006/09/10 16:00:23 root Exp $";
5	*/
6
7	/*
8	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
9		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
12		7	*
13	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
14	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
15	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
16	(at your option) any later version.	11	* (at your option) any later version.
17		12	*
18	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,
19	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
20	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21	GNU General Public License for more details.	16	* GNU General Public License for more details.
22		17	*
23	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
24	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		21	*
27	The authors can be reached via e-mail at crossfire-devel@real-time.com	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
28	*/	23	*/
29		24
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
32	variable. */	27	variable. */
33	#include <global.h>	28	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	29	#include <stdio.h>
36	# include <sys/types.h>	30	#include <sys/types.h>
37	# include <sys/uio.h>	31	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	32	#include <object.h>
40	#include <funcpoint.h>	33	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	34	#include <loader.h>
		35
		36	#include <bitset>
		37
43	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
		39	static UUID uuid;
		40	const uint64 UUID_SKIP = 1<<19;
44		41
45	object *objects; /* Pointer to the list of used objects */	42	objectvec objects;
46	object *active_objects; /* List of active objects that need to be processed */	43	activevec actives;
47		44
48	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
49	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
50	};	47	};
51	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
57	int freedir[SIZEOFFREE] = {	54	int freedir[SIZEOFFREE] = {
58	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
59	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
60	};	57	};
61		58
		59	static void
		60	write_uuid (void)
		61	{
		62	char filename1[MAX_BUF], filename2[MAX_BUF];
		63
		64	sprintf (filename1, "%s/uuid", settings.localdir);
		65	sprintf (filename2, "%s/uuid~", settings.localdir);
		66
		67	FILE *fp;
		68
		69	if (!(fp = fopen (filename2, "w")))
		70	{
		71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		72	return;
		73	}
		74
		75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		76	fclose (fp);
		77	rename (filename2, filename1);
		78	}
		79
		80	static void
		81	read_uuid (void)
		82	{
		83	char filename[MAX_BUF];
		84
		85	sprintf (filename, "%s/uuid", settings.localdir);
		86
		87	FILE *fp;
		88
		89	if (!(fp = fopen (filename, "r")))
		90	{
		91	if (errno == ENOENT)
		92	{
		93	LOG (llevInfo, "RESET uid to 1\n");
		94	uuid.seq = 0;
		95	write_uuid ();
		96	return;
		97	}
		98
		99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		100	_exit (1);
		101	}
		102
		103	int version;
		104	unsigned long long uid;
		105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		106	{
		107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		108	_exit (1);
		109	}
		110
		111	uuid.seq = uid;
		112	write_uuid ();
		113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		114	fclose (fp);
		115	}
		116
		117	UUID
		118	gen_uuid ()
		119	{
		120	UUID uid;
		121
		122	uid.seq = ++uuid.seq;
		123
		124	if (!(uuid.seq & (UUID_SKIP - 1)))
		125	write_uuid ();
		126
		127	return uid;
		128	}
		129
		130	void
		131	init_uuid ()
		132	{
		133	read_uuid ();
		134	}
		135
62	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
63	static int	137	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	138	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	139	{
66	key_value *wants_field;	140	key_value *wants_field;
…		…
69	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
70	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
71	*/	145	*/
72		146
73	/* For each field in wants, */	147	/* For each field in wants, */
74	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
75	{	149	{
76	key_value *has_field;	150	key_value *has_field;
77		151
78	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
79	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
113	*	187	*
114	* Note that this function appears a lot longer than the macro it	188	* Note that this function appears a lot longer than the macro it
115	* replaces - this is mostly for clarity - a decent compiler should hopefully	189	* replaces - this is mostly for clarity - a decent compiler should hopefully
116	* reduce this to the same efficiency.	190	* reduce this to the same efficiency.
117	*	191	*
118	* Check nrof variable *before* calling CAN_MERGE()	192	* Check nrof variable *before* calling can_merge()
119	*	193	*
120	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
121	* check weight	195	* check weight
122	*/	196	*/
123
124	bool object::can_merge (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
125	{	198	{
126	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
127	if ((ob1 == ob2) || (ob1->type != ob2->type))	200	if (ob1 == ob2
		201	|| ob1->type != ob2->type
		202	|| ob1->speed != ob2->speed
		203	|| ob1->value != ob2->value
		204	|| ob1->name != ob2->name)
128	return 0;	205	return 0;
129		206
130	if (ob1->speed != ob2->speed)	207	//TODO: this ain't working well, use nicer and correct overflow check
131	return 0;
132
133	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
134	* value could not be stored in a sint32 (which unfortunately sometimes is	209	* value could not be stored in a sint32 (which unfortunately sometimes is
135	* used to store nrof).	210	* used to store nrof).
136	*/	211	*/
137	if (ob1->nrof + ob2->nrof >= 1UL << 31)	212	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
147	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
148		223
149	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
150	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
151		226
152		227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
153	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	228	|| ob1->arch != ob2->arch
154	* being locked in inventory should prevent merging.
155	* 0x4 in flags3 is CLIENT_SENT
156	*/
157	if ((ob1->arch != ob2->arch) ||
158	(ob1->flags[0] != ob2->flags[0]) ||
159	(ob1->flags[1] != ob2->flags[1]) ||
160	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
161	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
162	(ob1->name != ob2->name) ||	229	|| ob1->name != ob2->name
163	(ob1->title != ob2->title) ||	230	|| ob1->title != ob2->title
164	(ob1->msg != ob2->msg) ||	231	|| ob1->msg != ob2->msg
165	(ob1->weight != ob2->weight) ||	232	|| ob1->weight != ob2->weight
166	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
167	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
168	(ob1->attacktype != ob2->attacktype) ||	235	|| ob1->attacktype != ob2->attacktype
169	(ob1->magic != ob2->magic) ||	236	|| ob1->magic != ob2->magic
170	(ob1->slaying != ob2->slaying) ||	237	|| ob1->slaying != ob2->slaying
171	(ob1->skill != ob2->skill) ||	238	|| ob1->skill != ob2->skill
172	(ob1->value != ob2->value) ||	239	|| ob1->value != ob2->value
173	(ob1->animation_id != ob2->animation_id) ||	240	|| ob1->animation_id != ob2->animation_id
174	(ob1->client_type != ob2->client_type) ||	241	|| ob1->client_type != ob2->client_type
175	(ob1->materialname != ob2->materialname) ||	242	|| ob1->materialname != ob2->materialname
176	(ob1->lore != ob2->lore) ||	243	|| ob1->lore != ob2->lore
177	(ob1->subtype != ob2->subtype) ||	244	|| ob1->subtype != ob2->subtype
178	(ob1->move_type != ob2->move_type) ||	245	|| ob1->move_type != ob2->move_type
179	(ob1->move_block != ob2->move_block) ||	246	|| ob1->move_block != ob2->move_block
180	(ob1->move_allow != ob2->move_allow) ||	247	|| ob1->move_allow != ob2->move_allow
181	(ob1->move_on != ob2->move_on) ||	248	|| ob1->move_on != ob2->move_on
182	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	249	|| ob1->move_off != ob2->move_off
		250	|| ob1->move_slow != ob2->move_slow
		251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
183	return 0;	252	return 0;
184		253
185	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
186	* check all objects in the inventory.	255	* check all objects in the inventory.
187	*/	256	*/
…		…
190	/* if one object has inventory but the other doesn't, not equiv */	259	/* if one object has inventory but the other doesn't, not equiv */
191	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
192	return 0;	261	return 0;
193		262
194	/* Now check to see if the two inventory objects could merge */	263	/* Now check to see if the two inventory objects could merge */
195	if (!CAN_MERGE (ob1->inv, ob2->inv))	264	if (!object::can_merge (ob1->inv, ob2->inv))
196	return 0;	265	return 0;
197		266
198	/* inventory ok - still need to check rest of this object to see	267	/* inventory ok - still need to check rest of this object to see
199	* if it is valid.	268	* if it is valid.
200	*/	269	*/
…		…
209		278
210	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
211	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
212	* check?	281	* check?
213	*/	282	*/
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
215	return 0;	284	return 0;
216		285
217	switch (ob1->type)	286	switch (ob1->type)
218	{	287	{
219	case SCROLL:	288	case SCROLL:
220	if (ob1->level != ob2->level)	289	if (ob1->level != ob2->level)
221	return 0;	290	return 0;
222	break;	291	break;
223	}	292	}
224		293
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	294	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	295	{
227	/* At least one of these has key_values. */	296	/* At least one of these has key_values. */
…		…
249	/*	318	/*
250	* sum_weight() is a recursive function which calculates the weight	319	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	320	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	321	* containers are carrying, and sums it up.
253	*/	322	*/
254	signed long	323	long
255	sum_weight (object *op)	324	sum_weight (object *op)
256	{	325	{
257	signed long sum;	326	long sum;
258	object *inv;	327	object *inv;
259		328
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	330	{
262	if (inv->inv)	331	if (inv->inv)
263	sum_weight (inv);	332	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	334	}
		335
266	if (op->type == CONTAINER && op->stats.Str)	336	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	337	sum = (sum * (100 - op->stats.Str)) / 100;
		338
268	if (op->carrying != sum)	339	if (op->carrying != sum)
269	op->carrying = sum;	340	op->carrying = sum;
		341
270	return sum;	342	return sum;
271	}	343	}
272		344
273	/**	345	/**
274	* Return the outermost environment object for a given object.	346	* Return the outermost environment object for a given object.
…		…
281	op = op->env;	353	op = op->env;
282	return op;	354	return op;
283	}	355	}
284		356
285	/*	357	/*
286	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
287	* a better check. We basically keeping traversing up until we can't
288	* or find a player.
289	*/
290
291	object *
292	is_player_inv (object *op)
293	{
294	for (; op != NULL && op->type != PLAYER; op = op->env)
295	if (op->env == op)
296	op->env = NULL;
297	return op;
298	}
299
300	/*
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	359	* Some error messages.
303	* The result of the dump is stored in the static global errmsg array.	360	* The result of the dump is stored in the static global errmsg array.
304	*/	361	*/
305		362
306	void	363	char *
307	dump_object2 (object *op)
308	{
309	errmsg[0] = 0;
310	return;
311	//TODO//D#d#
312	#if 0
313	char *cp;
314
315	/* object *tmp;*/
316
317	if (op->arch != NULL)
318	{
319	strcat (errmsg, "arch ");
320	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
321	strcat (errmsg, "\n");
322	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
323	strcat (errmsg, cp);
324	# if 0
325	/* Don't dump player diffs - they are too long, mostly meaningless, and
326	* will overflow the buffer.
327	* Changed so that we don't dump inventory either. This may
328	* also overflow the buffer.
329	*/
330	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
331	strcat (errmsg, cp);
332	for (tmp = op->inv; tmp; tmp = tmp->below)
333	dump_object2 (tmp);
334	# endif
335	strcat (errmsg, "end\n");
336	}
337	else
338	{
339	strcat (errmsg, "Object ");
340	if (op->name == NULL)
341	strcat (errmsg, "(null)");
342	else
343	strcat (errmsg, op->name);
344	strcat (errmsg, "\n");
345	# if 0
346	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
347	strcat (errmsg, cp);
348	for (tmp = op->inv; tmp; tmp = tmp->below)
349	dump_object2 (tmp);
350	# endif
351	strcat (errmsg, "end\n");
352	}
353	#endif
354	}
355
356	/*
357	* Dumps an object. Returns output in the static global errmsg array.
358	*/
359
360	void
361	dump_object (object *op)	364	dump_object (object *op)
362	{	365	{
363	if (op == NULL)	366	if (!op)
364	{	367	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		368
372	void	369	object_freezer freezer;
373	dump_all_objects (void)	370	save_object (freezer, op, 1);
374	{	371	return freezer.as_string ();
375	object *op;
376
377	for (op = objects; op != NULL; op = op->next)
378	{
379	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}
382	}	372	}
383		373
384	/*	374	/*
385	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
386	* multi-object 1 which is closest to the second object.	376	* multi-object 1 which is closest to the second object.
…		…
402	}	392	}
403		393
404	/*	394	/*
405	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
406	*/	396	*/
407
408	object *	397	object *
409	find_object (tag_t i)	398	find_object (tag_t i)
410	{	399	{
411	object *op;	400	for_all_objects (op)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	401	if (op->count == i)
415	break;
416	return op;	402	return op;
		403
		404	return 0;
417	}	405	}
418		406
419	/*	407	/*
420	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
421	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
422	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
423	*/	411	*/
424
425	object *	412	object *
426	find_object_name (const char *str)	413	find_object_name (const char *str)
427	{	414	{
428	const char *name = shstr::find (str);	415	shstr_cmp str_ (str);
429	object *op;	416	object *op;
430		417
431	for (op = objects; op != NULL; op = op->next)	418	for_all_objects (op)
432	if (&op->name == name)	419	if (op->name == str_)
433	break;	420	break;
434		421
435	return op;	422	return op;
436	}	423	}
437		424
…		…
440	{	427	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	429	}
443		430
444	/*	431	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	432	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	433	* skill and experience objects.
485	*/	434	*/
486	void	435	void
487	set_owner (object *op, object *owner)	436	object::set_owner (object *owner)
488	{	437	{
489	if (owner == NULL || op == NULL)	438	if (!owner)
490	return;	439	return;
491		440
492	/* next line added to allow objects which own objects */	441	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	442	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	443	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	444	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	445	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	446	* didn't match, this check is valid and I believe that cause is valid.
498	*/	447	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	448	while (owner->owner)
500	owner = owner->owner;	449	owner = owner->owner;
501		450
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	451	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512
513	}
514
515	/* Set the owner to clone's current owner and set the skill and experience
516	* objects to clone's objects (typically those objects that where the owner's
517	* current skill and experience objects at the time when clone's owner was
518	* set - not the owner's current skill and experience objects).
519	*
520	* Use this function if player created an object (e.g. fire bullet, swarm
521	* spell), and this object creates further objects whose kills should be
522	* accounted for the player's original skill, even if player has changed
523	* skills meanwhile.
524	*/
525	void
526	copy_owner (object *op, object *clone)
527	{
528	object *owner = get_owner (clone);
529
530	if (owner == NULL)
531	{
532	/* players don't have owners - they own themselves. Update
533	* as appropriate.
534	*/
535	if (clone->type == PLAYER)
536	owner = clone;
537	else
538	return;
539	}
540	set_owner (op, owner);
541
542	}	452	}
543		453
544	/* Zero the key_values on op, decrementing the shared-string	454	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	455	* refcounts and freeing the links.
546	*/	456	*/
…		…
556	}	466	}
557		467
558	op->key_values = 0;	468	op->key_values = 0;
559	}	469	}
560		470
561	void object::clear ()
562	{
563	attachable_base::clear ();
564
565	free_key_values (this);
566
567	name = 0;
568	name_pl = 0;
569	title = 0;
570	race = 0;
571	slaying = 0;
572	skill = 0;
573	msg = 0;
574	lore = 0;
575	custom_name = 0;
576	materialname = 0;
577
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));
579
580	SET_FLAG (this, FLAG_REMOVED);
581	}
582
583	void object::clone (object *destination)
584	{
585	*(object_copy *) destination = *this;
586	*(object_pod *) destination = *this;
587
588	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
590	}
591
592	/*	471	/*
593	* clear_object() frees everything allocated by an object, and also
594	* clears all variables and flags to default settings.
595	*/
596
597	void
598	clear_object (object *op)
599	{
600	op->clear ();
601
602	op->contr = NULL;
603	op->below = NULL;
604	op->above = NULL;
605	op->inv = NULL;
606	op->container = NULL;
607	op->env = NULL;
608	op->more = NULL;
609	op->head = NULL;
610	op->map = NULL;
611	op->refcount = 0;
612	op->active_next = NULL;
613	op->active_prev = NULL;
614	/* What is not cleared is next, prev, and count */
615
616	op->expmul = 1.0;
617	op->face = blank_face;
618	op->attacked_by_count = -1;
619
620	if (settings.casting_time)
621	op->casting_time = -1;
622	}
623
624	/*
625	* copy object first frees everything allocated by the second object,	472	* copy_to first frees everything allocated by the dst object,
626	* and then copies the contends of the first object into the second	473	* and then copies the contents of itself into the second
627	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
628	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
629	* if the first object is freed, the pointers in the new object	476	* if the first object is freed, the pointers in the new object
630	* will point at garbage.	477	* will point at garbage.
631	*/	478	*/
632
633	void	479	void
634	copy_object (object *op2, object *op)	480	object::copy_to (object *dst)
635	{	481	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
638		484
639	op2->clone (op);	485	*(object_copy *)dst = *this;
640		486
641	if (is_freed)	487	if (is_freed)
642	SET_FLAG (op, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
		489
643	if (is_removed)	490	if (is_removed)
644	SET_FLAG (op, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
645		492
646	if (op2->speed < 0)	493	if (speed < 0)
647	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
648		495
649	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
650	if (op2->key_values)	497	if (key_values)
651	{	498	{
652	key_value *tail = 0;	499	key_value *tail = 0;
653	key_value *i;	500	key_value *i;
654		501
655	op->key_values = 0;	502	dst->key_values = 0;
656		503
657	for (i = op2->key_values; i; i = i->next)	504	for (i = key_values; i; i = i->next)
658	{	505	{
659	key_value *new_link = new key_value;	506	key_value *new_link = new key_value;
660		507
661	new_link->next = 0;	508	new_link->next = 0;
662	new_link->key = i->key;	509	new_link->key = i->key;
663	new_link->value = i->value;	510	new_link->value = i->value;
664		511
665	/* Try and be clever here, too. */	512	/* Try and be clever here, too. */
666	if (!op->key_values)	513	if (!dst->key_values)
667	{	514	{
668	op->key_values = new_link;	515	dst->key_values = new_link;
669	tail = new_link;	516	tail = new_link;
670	}	517	}
671	else	518	else
672	{	519	{
673	tail->next = new_link;	520	tail->next = new_link;
674	tail = new_link;	521	tail = new_link;
675	}	522	}
676	}	523	}
677	}	524	}
678		525
679	update_ob_speed (op);	526	dst->set_speed (dst->speed);
		527	}
		528
		529	object *
		530	object::clone ()
		531	{
		532	object *neu = create ();
		533	copy_to (neu);
		534	return neu;
680	}	535	}
681		536
682	/*	537	/*
683	* If an object with the IS_TURNABLE() flag needs to be turned due	538	* If an object with the IS_TURNABLE() flag needs to be turned due
684	* to the closest player being on the other side, this function can	539	* to the closest player being on the other side, this function can
685	* be called to update the face variable, _and_ how it looks on the map.	540	* be called to update the face variable, _and_ how it looks on the map.
686	*/	541	*/
687
688	void	542	void
689	update_turn_face (object *op)	543	update_turn_face (object *op)
690	{	544	{
691	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
692	return;	546	return;
		547
693	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
694	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
695	}	550	}
696		551
697	/*	552	/*
698	* Updates the speed of an object. If the speed changes from 0 to another	553	* Updates the speed of an object. If the speed changes from 0 to another
699	* value, or vice versa, then add/remove the object from the active list.	554	* value, or vice versa, then add/remove the object from the active list.
700	* This function needs to be called whenever the speed of an object changes.	555	* This function needs to be called whenever the speed of an object changes.
701	*/	556	*/
702
703	void	557	void
704	update_ob_speed (object *op)	558	object::set_speed (float speed)
705	{	559	{
706	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
707
708	/* No reason putting the archetypes objects on the speed list,
709	* since they never really need to be updated.
710	*/
711
712	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
713	{	561	{
714	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
715	#ifdef MANY_CORES
716	abort ();
717	#else
718	op->speed = 0;	563	speed = 0;
719	#endif
720	}
721	if (arch_init)
722	{	564	}
723	return;
724	}
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{
727	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)
729	return;
730		565
731	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
732	* of the list. */	567
733	op->active_next = active_objects;	568	if (has_active_speed ())
734	if (op->active_next != NULL)	569	activate ();
735	op->active_next->active_prev = op;
736	active_objects = op;
737	}
738	else	570	else
739	{	571	deactivate ();
740	/* If not on the active list, nothing needs to be done */
741	if (!op->active_next && !op->active_prev && op != active_objects)
742	return;
743
744	if (op->active_prev == NULL)
745	{
746	active_objects = op->active_next;
747	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;
749	}
750	else
751	{
752	op->active_prev->active_next = op->active_next;
753	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;
755	}
756	op->active_next = NULL;
757	op->active_prev = NULL;
758	}
759	}	572	}
760		573
761	/* This function removes object 'op' from the list of active
762	* objects.
763	* This should only be used for style maps or other such
764	* reference maps where you don't want an object that isn't
765	* in play chewing up cpu time getting processed.
766	* The reverse of this is to call update_ob_speed, which
767	* will do the right thing based on the speed of the object.
768	*/
769	void
770	remove_from_active_list (object *op)
771	{
772	/* If not on the active list, nothing needs to be done */
773	if (!op->active_next && !op->active_prev && op != active_objects)
774	return;
775
776	if (op->active_prev == NULL)
777	{
778	active_objects = op->active_next;
779	if (op->active_next != NULL)
780	op->active_next->active_prev = NULL;
781	}
782	else
783	{
784	op->active_prev->active_next = op->active_next;
785	if (op->active_next)
786	op->active_next->active_prev = op->active_prev;
787	}
788	op->active_next = NULL;
789	op->active_prev = NULL;
790	}
791
792	/*	574	/*
793	* update_object() updates the array which represents the map.	575	* update_object() updates the the map.
794	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
795	* by invisible objects by whatever is below them (unless it's another	577	* by invisible objects by whatever is below them (unless it's another
796	* invisible object, etc...)	578	* invisible object, etc...)
797	* If the object being updated is beneath a player, the look-window	579	* If the object being updated is beneath a player, the look-window
798	* of that player is updated (this might be a suboptimal way of	580	* of that player is updated (this might be a suboptimal way of
799	* updating that window, though, since update_object() is called _often_)	581	* updating that window, though, since update_object() is called _often_)
800	*	582	*
801	* action is a hint of what the caller believes need to be done.	583	* action is a hint of what the caller believes need to be done.
802	* For example, if the only thing that has changed is the face (due to
803	* an animation), we don't need to call update_position until that actually
804	* comes into view of a player. OTOH, many other things, like addition/removal
805	* of walls or living creatures may need us to update the flags now.
806	* current action are:	584	* current action are:
807	* UP_OBJ_INSERT: op was inserted	585	* UP_OBJ_INSERT: op was inserted
808	* UP_OBJ_REMOVE: op was removed	586	* UP_OBJ_REMOVE: op was removed
809	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	587	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
810	* as that is easier than trying to look at what may have changed.	588	* as that is easier than trying to look at what may have changed.
811	* UP_OBJ_FACE: only the objects face has changed.	589	* UP_OBJ_FACE: only the objects face has changed.
812	*/	590	*/
813
814	void	591	void
815	update_object (object *op, int action)	592	update_object (object *op, int action)
816	{	593	{
817	int update_now = 0, flags;
818	MoveType move_on, move_off, move_block, move_slow;	594	MoveType move_on, move_off, move_block, move_slow;
819		595
820	if (op == NULL)	596	if (op == NULL)
821	{	597	{
822	/* this should never happen */	598	/* this should never happen */
823	LOG (llevDebug, "update_object() called for NULL object.\n");	599	LOG (llevDebug, "update_object() called for NULL object.\n");
824	return;	600	return;
825	}	601	}
826		602
827	if (op->env != NULL)	603	if (op->env)
828	{	604	{
829	/* Animation is currently handled by client, so nothing	605	/* Animation is currently handled by client, so nothing
830	* to do in this case.	606	* to do in this case.
831	*/	607	*/
832	return;	608	return;
…		…
837	*/	613	*/
838	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
839	return;	615	return;
840		616
841	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
842	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
843	{	619	{
844	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
845	#ifdef MANY_CORES	621	#ifdef MANY_CORES
846	abort ();	622	abort ();
847	#endif	623	#endif
848	return;	624	return;
849	}	625	}
850		626
851	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	627	mapspace &m = op->ms ();
852	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
853	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
854	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
855	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
856	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
857		628
		629	if (!(m.flags_ & P_UPTODATE))
		630	/* nop */;
858	if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
859	{	632	{
		633	// this is likely overkill, TODO: revisit (schmorp)
860	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
861	update_now = 1;
862
863	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	635	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
864	update_now = 1;	636	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
865		637	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		638	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
866	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	639	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
867	update_now = 1;
868
869	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
870	update_now = 1;
871
872	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
873	update_now = 1;
874
875	if ((move_on | op->move_on) != move_on)	640	|| (m.move_on | op->move_on ) != m.move_on
876	update_now = 1;
877
878	if ((move_off | op->move_off) != move_off)	641	|| (m.move_off | op->move_off ) != m.move_off
879	update_now = 1;	642	|| (m.move_slow | op->move_slow) != m.move_slow
880
881	/* This isn't perfect, but I don't expect a lot of objects to	643	/* This isn't perfect, but I don't expect a lot of objects to
882	* to have move_allow right now.	644	* to have move_allow right now.
883	*/	645	*/
884	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
885	update_now = 1;	647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
886		648	m.flags_ = 0;
887	if ((move_slow | op->move_slow) != move_slow)
888	update_now = 1;
889	}	649	}
890	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	652	* that is being removed.
893	*/	653	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{	655	m.flags_ = 0;
896	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	657	/* Nothing to do for that case */ ;
901	}
902	else	658	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		660
907	if (update_now)
908	{
909	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
910	update_position (op->map, op->x, op->y);
911	}
912
913	if (op->more != NULL)	661	if (op->more)
914	update_object (op->more, action);	662	update_object (op->more, action);
915	}
916
917	static
918	std::vector < object *>
919	mortals;
920
921	void object::free_mortals ()
922	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)
924	delete *
925	i;
926
927	mortals.clear ();
928	}	663	}
929		664
930	object::object ()	665	object::object ()
931	{	666	{
932	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
933		668
934	expmul = 1.0;	669	expmul = 1.0;
935	face = blank_face;	670	face = blank_face;
936	attacked_by_count = -1;
937	}	671	}
938		672
939	object::~object ()	673	object::~object ()
940	{	674	{
941	free_key_values (this);	675	free_key_values (this);
942	}	676	}
943		677
		678	static int object_count;
		679
944	void object::link ()	680	void object::link ()
945	{	681	{
		682	assert (!index);//D
		683	uuid = gen_uuid ();
946	count = ++ob_count;	684	count = ++object_count;
947		685
948	prev = 0;	686	refcnt_inc ();
949	next = objects;	687	objects.insert (this);
950
951	if (objects)
952	objects->prev = this;
953
954	objects = this;
955	}	688	}
956		689
957	void object::unlink ()	690	void object::unlink ()
958	{	691	{
959	count = 0;	692	assert (index);//D
		693	objects.erase (this);
		694	refcnt_dec ();
		695	}
960		696
961	/* Remove this object from the list of used objects */	697	void
962	if (prev)	698	object::activate ()
963	prev->next = next;	699	{
964	if (next)	700	/* If already on active list, don't do anything */
965	next->prev = prev;	701	if (active)
966	if (this == objects)	702	return;
967	objects = next;	703
		704	if (has_active_speed ())
		705	actives.insert (this);
		706	}
		707
		708	void
		709	object::activate_recursive ()
		710	{
		711	activate ();
		712
		713	for (object *op = inv; op; op = op->below)
		714	op->activate_recursive ();
		715	}
		716
		717	/* This function removes object 'op' from the list of active
		718	* objects.
		719	* This should only be used for style maps or other such
		720	* reference maps where you don't want an object that isn't
		721	* in play chewing up cpu time getting processed.
		722	* The reverse of this is to call update_ob_speed, which
		723	* will do the right thing based on the speed of the object.
		724	*/
		725	void
		726	object::deactivate ()
		727	{
		728	/* If not on the active list, nothing needs to be done */
		729	if (!active)
		730	return;
		731
		732	actives.erase (this);
		733	}
		734
		735	void
		736	object::deactivate_recursive ()
		737	{
		738	for (object *op = inv; op; op = op->below)
		739	op->deactivate_recursive ();
		740
		741	deactivate ();
		742	}
		743
		744	void
		745	object::set_flag_inv (int flag, int value)
		746	{
		747	for (object *op = inv; op; op = op->below)
		748	{
		749	op->flag [flag] = value;
		750	op->set_flag_inv (flag, value);
		751	}
		752	}
		753
		754	/*
		755	* Remove and free all objects in the inventory of the given object.
		756	* object.c ?
		757	*/
		758	void
		759	object::destroy_inv (bool drop_to_ground)
		760	{
		761	// need to check first, because the checks below might segfault
		762	// as we might be on an invalid mapspace and crossfire code
		763	// is too buggy to ensure that the inventory is empty.
		764	// corollary: if you create arrows etc. with stuff in tis inventory,
		765	// cf will crash below with off-map x and y
		766	if (!inv)
		767	return;
		768
		769	/* Only if the space blocks everything do we not process -
		770	* if some form of movement is allowed, let objects
		771	* drop on that space.
		772	*/
		773	if (!drop_to_ground
		774	|| !map
		775	|| map->in_memory != MAP_IN_MEMORY
		776	|| ms ().move_block == MOVE_ALL)
		777	{
		778	while (inv)
		779	{
		780	inv->destroy_inv (drop_to_ground);
		781	inv->destroy ();
		782	}
		783	}
		784	else
		785	{ /* Put objects in inventory onto this space */
		786	while (inv)
		787	{
		788	object *op = inv;
		789
		790	if (op->flag [FLAG_STARTEQUIP]
		791	|| op->flag [FLAG_NO_DROP]
		792	|| op->type == RUNE
		793	|| op->type == TRAP
		794	|| op->flag [FLAG_IS_A_TEMPLATE]
		795	|| op->flag [FLAG_DESTROY_ON_DEATH])
		796	op->destroy ();
		797	else
		798	map->insert (op, x, y);
		799	}
		800	}
968	}	801	}
969		802
970	object *object::create ()	803	object *object::create ()
971	{	804	{
972	object *
973	op = new object;	805	object *op = new object;
974
975	op->link ();	806	op->link ();
976	return op;	807	return op;
977	}	808	}
978		809
979	/*	810	void
980	* free_object() frees everything allocated by an object, removes	811	object::do_destroy ()
981	* it from the list of used objects, and puts it on the list of
982	* free objects. The IS_FREED() flag is set in the object.
983	* The object must have been removed by remove_ob() first for
984	* this function to succeed.
985	*
986	* If free_inventory is set, free inventory as well. Else drop items in
987	* inventory to the ground.
988	*/
989	void object::free (bool free_inventory)
990	{	812	{
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	813	attachable::do_destroy ();
992	{
993	LOG (llevDebug, "Free object called with non removed object\n");
994	dump_object (this);
995	#ifdef MANY_CORES
996	abort ();
997	#endif
998	}
999		814
1000	if (QUERY_FLAG (this, FLAG_FRIENDLY))	815	if (flag [FLAG_IS_LINKED])
1001	{	816	remove_button_link (this);
1002	LOG (llevMonster, "Warning: tried to free friendly object.\n");	817
		818	if (flag [FLAG_FRIENDLY])
1003	remove_friendly_object (this);	819	remove_friendly_object (this);
1004	}
1005		820
1006	if (QUERY_FLAG (this, FLAG_FREED))	821	if (!flag [FLAG_REMOVED])
		822	remove ();
		823
		824	destroy_inv (true);
		825
		826	deactivate ();
		827	unlink ();
		828
		829	flag [FLAG_FREED] = 1;
		830
		831	// hack to ensure that freed objects still have a valid map
		832	{
		833	static maptile *freed_map; // freed objects are moved here to avoid crashes
		834
		835	if (!freed_map)
1007	{	836	{
1008	dump_object (this);	837	freed_map = new maptile;
1009	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);	838
1010	return;	839	freed_map->name = "/internal/freed_objects_map";
		840	freed_map->width = 3;
		841	freed_map->height = 3;
		842
		843	freed_map->alloc ();
		844	freed_map->in_memory = MAP_IN_MEMORY;
1011	}	845	}
		846
		847	map = freed_map;
		848	x = 1;
		849	y = 1;
		850	}
		851
		852	head = 0;
1012		853
1013	if (more)	854	if (more)
1014	{	855	{
1015	more->free (free_inventory);	856	more->destroy ();
1016	more = 0;	857	more = 0;
1017	}	858	}
1018		859
1019	if (inv)	860	// clear those pointers that likely might have circular references to us
1020	{	861	owner = 0;
1021	/* Only if the space blocks everything do we not process -	862	enemy = 0;
1022	* if some form of movement is allowed, let objects	863	attacked_by = 0;
1023	* drop on that space.	864	}
1024	*/
1025	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
1026	{
1027	object *
1028	op = inv;
1029		865
1030	while (op)	866	void
1031	{	867	object::destroy (bool destroy_inventory)
1032	object *	868	{
1033	tmp = op->below;	869	if (destroyed ())
		870	return;
1034		871
1035	remove_ob (op);	872	if (destroy_inventory)
1036	op->free (free_inventory);	873	destroy_inv (false);
1037	op = tmp;
1038	}
1039	}
1040	else
1041	{ /* Put objects in inventory onto this space */
1042	object *
1043	op = inv;
1044		874
1045	while (op)	875	attachable::destroy ();
1046	{
1047	object *
1048	tmp = op->below;
1049
1050	remove_ob (op);
1051
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1053	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1054	free_object (op);
1055	else
1056	{
1057	op->x = x;
1058	op->y = y;
1059	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1060	}
1061
1062	op = tmp;
1063	}
1064	}
1065	}
1066
1067	/* Remove object from the active list */
1068	speed = 0;
1069	update_ob_speed (this);
1070
1071	unlink ();
1072
1073	SET_FLAG (this, FLAG_FREED);
1074
1075	mortals.push_back (this);
1076	}	876	}
1077		877
1078	/*	878	/*
1079	* sub_weight() recursively (outwards) subtracts a number from the	879	* sub_weight() recursively (outwards) subtracts a number from the
1080	* weight of an object (and what is carried by it's environment(s)).	880	* weight of an object (and what is carried by it's environment(s)).
1081	*/	881	*/
1082
1083	void	882	void
1084	sub_weight (object *op, signed long weight)	883	sub_weight (object *op, signed long weight)
1085	{	884	{
1086	while (op != NULL)	885	while (op != NULL)
1087	{	886	{
1088	if (op->type == CONTAINER)	887	if (op->type == CONTAINER)
1089	{
1090	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	888	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1091	}	889
1092	op->carrying -= weight;	890	op->carrying -= weight;
1093	op = op->env;	891	op = op->env;
1094	}	892	}
1095	}	893	}
1096		894
1097	/* remove_ob(op):	895	/* op->remove ():
1098	* This function removes the object op from the linked list of objects	896	* This function removes the object op from the linked list of objects
1099	* which it is currently tied to. When this function is done, the	897	* which it is currently tied to. When this function is done, the
1100	* object will have no environment. If the object previously had an	898	* object will have no environment. If the object previously had an
1101	* environment, the x and y coordinates will be updated to	899	* environment, the x and y coordinates will be updated to
1102	* the previous environment.	900	* the previous environment.
1103	* Beware: This function is called from the editor as well!	901	* Beware: This function is called from the editor as well!
1104	*/	902	*/
1105
1106	void	903	void
1107	remove_ob (object *op)	904	object::remove ()
1108	{	905	{
		906	object *tmp, *last = 0;
1109	object *	907	object *otmp;
1110	tmp, *
1111	last = NULL;
1112	object *
1113	otmp;
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;
1118	mapstruct *
1119	m;
1120	sint16
1121	x,
1122	y;
1123		908
1124
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	909	if (QUERY_FLAG (this, FLAG_REMOVED))
1126	{	910	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		911
1130	/* Changed it to always dump core in this case. As has been learned
1131	* in the past, trying to recover from errors almost always
1132	* make things worse, and this is a real error here - something
1133	* that should not happen.
1134	* Yes, if this was a mission critical app, trying to do something
1135	* to recover may make sense, but that is because failure of the app
1136	* may have other disastrous problems. Cf runs out of a script
1137	* so is easily enough restarted without any real problems.
1138	* MSW 2001-07-01
1139	*/
1140	abort ();
1141	}
1142	if (op->more != NULL)
1143	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);	912	SET_FLAG (this, FLAG_REMOVED);
		913	INVOKE_OBJECT (REMOVE, this);
		914
		915	if (more)
		916	more->remove ();
1146		917
1147	/*	918	/*
1148	* In this case, the object to be removed is in someones	919	* In this case, the object to be removed is in someones
1149	* inventory.	920	* inventory.
1150	*/	921	*/
1151	if (op->env != NULL)	922	if (env)
1152	{	923	{
1153	if (op->nrof)	924	if (nrof)
1154	sub_weight (op->env, op->weight * op->nrof);	925	sub_weight (env, weight * nrof);
1155	else	926	else
1156	sub_weight (op->env, op->weight + op->carrying);	927	sub_weight (env, weight + carrying);
1157		928
1158	/* NO_FIX_PLAYER is set when a great many changes are being	929	/* NO_FIX_PLAYER is set when a great many changes are being
1159	* made to players inventory. If set, avoiding the call	930	* made to players inventory. If set, avoiding the call
1160	* to save cpu time.	931	* to save cpu time.
1161	*/	932	*/
1162	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	933	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1163	fix_player (otmp);	934	otmp->update_stats ();
1164		935
1165	if (op->above != NULL)	936	if (above)
1166	op->above->below = op->below;	937	above->below = below;
1167	else	938	else
1168	op->env->inv = op->below;	939	env->inv = below;
1169		940
1170	if (op->below != NULL)	941	if (below)
1171	op->below->above = op->above;	942	below->above = above;
1172		943
1173	/* we set up values so that it could be inserted into	944	/* we set up values so that it could be inserted into
1174	* the map, but we don't actually do that - it is up	945	* the map, but we don't actually do that - it is up
1175	* to the caller to decide what we want to do.	946	* to the caller to decide what we want to do.
1176	*/	947	*/
1177	op->x = op->env->x, op->y = op->env->y;	948	x = env->x, y = env->y;
1178	op->map = op->env->map;	949	map = env->map;
1179	op->above = NULL, op->below = NULL;	950	above = 0, below = 0;
1180	op->env = NULL;	951	env = 0;
1181	return;
1182	}
1183
1184	/* If we get here, we are removing it from a map */
1185	if (op->map == NULL)
1186	return;
1187
1188	x = op->x;
1189	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);
1191
1192	if (!m)
1193	{	952	}
1194	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	953	else if (map)
1195	op->map->path, op->x, op->y);
1196	/* in old days, we used to set x and y to 0 and continue.
1197	* it seems if we get into this case, something is probablye
1198	* screwed up and should be fixed.
1199	*/
1200	abort ();
1201	}	954	{
1202	if (op->map != m)	955	if (type == PLAYER)
1203	{	956	{
1204	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",	957	--map->players;
1205	op->map->path, m->path, op->x, op->y, x, y);	958	map->touch ();
1206	}	959	}
1207		960
1208	/* Re did the following section of code - it looks like it had	961	map->dirty = true;
1209	* lots of logic for things we no longer care about
1210	*/
1211		962
1212	/* link the object above us */	963	/* link the object above us */
1213	if (op->above)	964	if (above)
1214	op->above->below = op->below;	965	above->below = below;
1215	else	966	else
1216	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	967	map->at (x, y).top = below; /* we were top, set new top */
1217		968
1218	/* Relink the object below us, if there is one */	969	/* Relink the object below us, if there is one */
1219	if (op->below)	970	if (below)
1220	{
1221	op->below->above = op->above;	971	below->above = above;
1222	}
1223	else	972	else
1224	{	973	{
1225	/* Nothing below, which means we need to relink map object for this space	974	/* Nothing below, which means we need to relink map object for this space
1226	* use translated coordinates in case some oddness with map tiling is	975	* use translated coordinates in case some oddness with map tiling is
1227	* evident	976	* evident
1228	*/
1229	if (GET_MAP_OB (m, x, y) != op)
1230	{
1231	dump_object (op);
1232	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1233	errmsg);
1234	dump_object (GET_MAP_OB (m, x, y));
1235	LOG (llevError, "%s\n", errmsg);
1236	}
1237	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1238	}
1239	op->above = NULL;
1240	op->below = NULL;
1241
1242	if (op->map->in_memory == MAP_SAVING)
1243	return;
1244
1245	tag = op->count;
1246	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1247	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1248	{
1249	/* No point updating the players look faces if he is the object
1250	* being removed.
1251	*/
1252
1253	if (tmp->type == PLAYER && tmp != op)
1254	{
1255	/* If a container that the player is currently using somehow gets
1256	* removed (most likely destroyed), update the player view
1257	* appropriately.
1258	*/	977	*/
1259	if (tmp->container == op)	978	if (GET_MAP_OB (map, x, y) != this)
1260	{	979	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	980	char *dump = dump_object (this);
1262	tmp->container = NULL;	981	LOG (llevError,
		982	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		983	free (dump);
		984	dump = dump_object (GET_MAP_OB (map, x, y));
		985	LOG (llevError, "%s\n", dump);
		986	free (dump);
1263	}	987	}
1264	tmp->contr->socket.update_look = 1;	988
1265	}	989	map->at (x, y).bot = above; /* goes on above it. */
1266	/* See if player moving off should effect something */
1267	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1268	{	990	}
1269		991
1270	move_apply (tmp, op, NULL);	992	above = 0;
1271	if (was_destroyed (op, tag))	993	below = 0;
		994
		995	if (map->in_memory == MAP_SAVING)
		996	return;
		997
		998	int check_walk_off = !flag [FLAG_NO_APPLY];
		999
		1000	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
		1001	{
		1002	/* No point updating the players look faces if he is the object
		1003	* being removed.
		1004	*/
		1005
		1006	if (tmp->type == PLAYER && tmp != this)
1272	{	1007	{
1273	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1008	/* If a container that the player is currently using somehow gets
		1009	* removed (most likely destroyed), update the player view
		1010	* appropriately.
		1011	*/
		1012	if (tmp->container == this)
		1013	{
		1014	flag [FLAG_APPLIED] = 0;
		1015	tmp->container = 0;
		1016	}
		1017
		1018	if (tmp->contr->ns)
		1019	tmp->contr->ns->floorbox_update ();
1274	}	1020	}
		1021
		1022	/* See if object moving off should effect something */
		1023	if (check_walk_off
		1024	&& ((move_type & tmp->move_off)
		1025	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1026	{
		1027	move_apply (tmp, this, 0);
		1028
		1029	if (destroyed ())
		1030	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1275	}	1031	}
1276		1032
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1033	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1034	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1279	if (tmp->above == tmp)	1035	if (tmp->above == tmp)
1280	tmp->above = NULL;	1036	tmp->above = 0;
		1037
1281	last = tmp;	1038	last = tmp;
1282	}	1039	}
		1040
1283	/* last == NULL of there are no objects on this space */	1041	/* last == NULL if there are no objects on this space */
1284	if (last == NULL)	1042	//TODO: this makes little sense, why only update the topmost object?
1285	{	1043	if (!last)
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1044	map->at (x, y).flags_ = 0;
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.
1290	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);
1293	}
1294	else	1045	else
1295	update_object (last, UP_OBJ_REMOVE);	1046	update_object (last, UP_OBJ_REMOVE);
1296		1047
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1048	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1298	update_all_los (op->map, op->x, op->y);	1049	update_all_los (map, x, y);
1299		1050	}
1300	}	1051	}
1301		1052
1302	/*	1053	/*
1303	* merge_ob(op,top):	1054	* merge_ob(op,top):
1304	*	1055	*
1305	* This function goes through all objects below and including top, and	1056	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1057	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1058	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1059	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1060	*/
1310
1311	object *	1061	object *
1312	merge_ob (object *op, object *top)	1062	merge_ob (object *op, object *top)
1313	{	1063	{
1314	if (!op->nrof)	1064	if (!op->nrof)
1315	return 0;	1065	return 0;
1316	if (top == NULL)	1066
		1067	if (top)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1068	for (top = op; top && top->above; top = top->above)
		1069	;
		1070
1318	for (; top != NULL; top = top->below)	1071	for (; top; top = top->below)
1319	{	1072	{
1320	if (top == op)	1073	if (top == op)
1321	continue;	1074	continue;
1322	if (CAN_MERGE (op, top))	1075
		1076	if (object::can_merge (op, top))
1323	{	1077	{
1324	top->nrof += op->nrof;	1078	top->nrof += op->nrof;
1325		1079
1326	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1080	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1327	op->weight = 0; /* Don't want any adjustements now */	1081	op->weight = 0; /* Don't want any adjustements now */
1328	remove_ob (op);	1082	op->destroy ();
1329	free_object (op);
1330	return top;	1083	return top;
1331	}	1084	}
1332	}	1085	}
		1086
1333	return NULL;	1087	return 0;
1334	}	1088	}
1335		1089
1336	/*	1090	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1091	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1338	* job preparing multi-part monsters	1092	* job preparing multi-part monsters
1339	*/	1093	*/
1340	object *	1094	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1095	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1342	{	1096	{
1343	object *
1344	tmp;
1345
1346	if (op->head)
1347	op = op->head;
1348	for (tmp = op; tmp; tmp = tmp->more)	1097	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1349	{	1098	{
1350	tmp->x = x + tmp->arch->clone.x;	1099	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1100	tmp->y = y + tmp->arch->clone.y;
1352	}	1101	}
		1102
1353	return insert_ob_in_map (op, m, originator, flag);	1103	return insert_ob_in_map (op, m, originator, flag);
1354	}	1104	}
1355		1105
1356	/*	1106	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1107	* insert_ob_in_map (op, map, originator, flag):
…		…
1371	* Return value:	1121	* Return value:
1372	* new object if 'op' was merged with other object	1122	* new object if 'op' was merged with other object
1373	* NULL if 'op' was destroyed	1123	* NULL if 'op' was destroyed
1374	* just 'op' otherwise	1124	* just 'op' otherwise
1375	*/	1125	*/
1376
1377	object *	1126	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1127	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1379	{	1128	{
1380	object *	1129	object *tmp, *top, *floor = NULL;
1381	tmp, *	1130	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1131
1388	if (QUERY_FLAG (op, FLAG_FREED))	1132	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1133	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1134	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1135	return NULL;
1392	}	1136	}
1393	if (m == NULL)	1137
		1138	if (!m)
1394	{	1139	{
1395	dump_object (op);	1140	char *dump = dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1141	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1142	free (dump);
1397	return op;	1143	return op;
1398	}	1144	}
		1145
1399	if (out_of_map (m, op->x, op->y))	1146	if (out_of_map (m, op->x, op->y))
1400	{	1147	{
1401	dump_object (op);	1148	char *dump = dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1149	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403	#ifdef MANY_CORES	1150	#ifdef MANY_CORES
1404	/* Better to catch this here, as otherwise the next use of this object	1151	/* Better to catch this here, as otherwise the next use of this object
1405	* is likely to cause a crash. Better to find out where it is getting	1152	* is likely to cause a crash. Better to find out where it is getting
1406	* improperly inserted.	1153	* improperly inserted.
1407	*/	1154	*/
1408	abort ();	1155	abort ();
1409	#endif	1156	#endif
		1157	free (dump);
1410	return op;	1158	return op;
1411	}	1159	}
		1160
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1161	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1162	{
1414	dump_object (op);	1163	char *dump = dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1164	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1165	free (dump);
1416	return op;	1166	return op;
1417	}	1167	}
		1168
1418	if (op->more != NULL)	1169	if (op->more)
1419	{	1170	{
1420	/* The part may be on a different map. */	1171	/* The part may be on a different map. */
1421		1172
1422	object *
1423	more = op->more;	1173	object *more = op->more;
1424		1174
1425	/* We really need the caller to normalize coordinates - if	1175	/* We really need the caller to normalise coordinates - if
1426	* we set the map, that doesn't work if the location is within	1176	* we set the map, that doesn't work if the location is within
1427	* a map and this is straddling an edge. So only if coordinate	1177	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.	1178	* is clear wrong do we normalise it.
1429	*/	1179	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1180	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1181	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1182	else if (!more->map)
1435	{	1183	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1184	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1185	* more->map should always point to the parent.
1438	*/	1186	*/
…		…
1441		1189
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1190	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1191	{
1444	if (!op->head)	1192	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1193	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1194
1446	return NULL;	1195	return 0;
1447	}	1196	}
1448	}	1197	}
		1198
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1199	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1200
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1201	/* Ideally, the caller figures this out. However, it complicates a lot
1452	* of areas of callers (eg, anything that uses find_free_spot would now	1202	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1203	* need extra work
…		…
1457	y = op->y;	1207	y = op->y;
1458		1208
1459	/* this has to be done after we translate the coordinates.	1209	/* this has to be done after we translate the coordinates.
1460	*/	1210	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1211	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1212	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1213	if (object::can_merge (op, tmp))
1465	{	1214	{
1466	op->nrof += tmp->nrof;	1215	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1216	tmp->destroy ();
1468	free_object (tmp);
1469	}	1217	}
1470	}
1471		1218
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1219	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1220	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1221
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1222	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1223	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1224
1477	if (flag & INS_BELOW_ORIGINATOR)	1225	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1226	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1227	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1228	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1229	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1230	abort ();
1483	}	1231	}
		1232
1484	op->above = originator;	1233	op->above = originator;
1485	op->below = originator->below;	1234	op->below = originator->below;
		1235
1486	if (op->below)	1236	if (op->below)
1487	op->below->above = op;	1237	op->below->above = op;
1488	else	1238	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1239	op->ms ().bot = op;
		1240
1490	/* since *below* originator, no need to update top */	1241	/* since *below* originator, no need to update top */
1491	originator->below = op;	1242	originator->below = op;
1492	}	1243	}
1493	else	1244	else
1494	{	1245	{
1495	/* If there are other objects, then */	1246	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1247	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1248	{
1498	object *	1249	object *last = 0;
1499	last = NULL;
1500		1250
1501	/*	1251	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1252	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1253	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1254	* Generally, we want to put the new object on top. But if
…		…
1508	* once we get to them. This reduces the need to traverse over all of	1258	* once we get to them. This reduces the need to traverse over all of
1509	* them when adding another one - this saves quite a bit of cpu time	1259	* them when adding another one - this saves quite a bit of cpu time
1510	* when lots of spells are cast in one area. Currently, it is presumed	1260	* when lots of spells are cast in one area. Currently, it is presumed
1511	* that flying non pickable objects are spell objects.	1261	* that flying non pickable objects are spell objects.
1512	*/	1262	*/
1513
1514	while (top != NULL)	1263	while (top)
1515	{	1264	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1265	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1517	floor = top;	1266	floor = top;
		1267
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1268	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1519	{	1269	{
1520	/* We insert above top, so we want this object below this */	1270	/* We insert above top, so we want this object below this */
1521	top = top->below;	1271	top = top->below;
1522	break;	1272	break;
1523	}	1273	}
		1274
1524	last = top;	1275	last = top;
1525	top = top->above;	1276	top = top->above;
1526	}	1277	}
		1278
1527	/* Don't want top to be NULL, so set it to the last valid object */	1279	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;	1280	top = last;
1529		1281
1530	/* We let update_position deal with figuring out what the space	1282	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1283	* looks like instead of lots of conditions here.
…		…
1537	* If INS_ON_TOP is used, don't do this processing	1289	* If INS_ON_TOP is used, don't do this processing
1538	* Need to find the object that in fact blocks view, otherwise	1290	* Need to find the object that in fact blocks view, otherwise
1539	* stacking is a bit odd.	1291	* stacking is a bit odd.
1540	*/	1292	*/
1541	if (!(flag & INS_ON_TOP) &&	1293	if (!(flag & INS_ON_TOP) &&
1542	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1294	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1543	{	1295	{
1544	for (last = top; last != floor; last = last->below)	1296	for (last = top; last != floor; last = last->below)
1545	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1297	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1546	break;	1298	break;
1547	/* Check to see if we found the object that blocks view,	1299	/* Check to see if we found the object that blocks view,
…		…
1551	*/	1303	*/
1552	if (last && last->below && last != floor)	1304	if (last && last->below && last != floor)
1553	top = last->below;	1305	top = last->below;
1554	}	1306	}
1555	} /* If objects on this space */	1307	} /* If objects on this space */
		1308
1556	if (flag & INS_MAP_LOAD)	1309	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1310	top = GET_MAP_TOP (op->map, op->x, op->y);
		1311
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1312	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1313	top = floor;
1560		1314
1561	/* Top is the object that our object (op) is going to get inserted above.	1315	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1316	*/
1563		1317
1564	/* First object on this space */	1318	/* First object on this space */
1565	if (!top)	1319	if (!top)
1566	{	1320	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1321	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1322
1568	if (op->above)	1323	if (op->above)
1569	op->above->below = op;	1324	op->above->below = op;
		1325
1570	op->below = NULL;	1326	op->below = 0;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1327	op->ms ().bot = op;
1572	}	1328	}
1573	else	1329	else
1574	{ /* get inserted into the stack above top */	1330	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1331	op->above = top->above;
		1332
1576	if (op->above)	1333	if (op->above)
1577	op->above->below = op;	1334	op->above->below = op;
		1335
1578	op->below = top;	1336	op->below = top;
1579	top->above = op;	1337	top->above = op;
1580	}	1338	}
		1339
1581	if (op->above == NULL)	1340	if (!op->above)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1341	op->ms ().top = op;
1583	} /* else not INS_BELOW_ORIGINATOR */	1342	} /* else not INS_BELOW_ORIGINATOR */
1584		1343
1585	if (op->type == PLAYER)	1344	if (op->type == PLAYER)
		1345	{
1586	op->contr->do_los = 1;	1346	op->contr->do_los = 1;
		1347	++op->map->players;
		1348	op->map->touch ();
		1349	}
		1350
		1351	op->map->dirty = true;
1587		1352
1588	/* If we have a floor, we know the player, if any, will be above	1353	/* If we have a floor, we know the player, if any, will be above
1589	* it, so save a few ticks and start from there.	1354	* it, so save a few ticks and start from there.
1590	*/	1355	*/
1591	if (!(flag & INS_MAP_LOAD))	1356	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1357	if (object *pl = op->ms ().player ())
1593	{	1358	if (pl->contr->ns)
1594	if (tmp->type == PLAYER)	1359	pl->contr->ns->floorbox_update ();
1595	tmp->contr->socket.update_look = 1;
1596	}
1597		1360
1598	/* If this object glows, it may affect lighting conditions that are	1361	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1362	* visible to others on this map. But update_all_los is really
1600	* an inefficient way to do this, as it means los for all players	1363	* an inefficient way to do this, as it means los for all players
1601	* on the map will get recalculated. The players could very well	1364	* on the map will get recalculated. The players could very well
1602	* be far away from this change and not affected in any way -	1365	* be far away from this change and not affected in any way -
1603	* this should get redone to only look for players within range,	1366	* this should get redone to only look for players within range,
1604	* or just updating the P_NEED_UPDATE for spaces within this area	1367	* or just updating the P_UPTODATE for spaces within this area
1605	* of effect may be sufficient.	1368	* of effect may be sufficient.
1606	*/	1369	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1370	if (op->map->darkness && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1371	update_all_los (op->map, op->x, op->y);
1609
1610		1372
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1373	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1374	update_object (op, UP_OBJ_INSERT);
1613		1375
		1376	INVOKE_OBJECT (INSERT, op);
1614		1377
1615	/* Don't know if moving this to the end will break anything. However,	1378	/* Don't know if moving this to the end will break anything. However,
1616	* we want to have update_look set above before calling this.	1379	* we want to have floorbox_update called before calling this.
1617	*	1380	*
1618	* check_move_on() must be after this because code called from	1381	* check_move_on() must be after this because code called from
1619	* check_move_on() depends on correct map flags (so functions like	1382	* check_move_on() depends on correct map flags (so functions like
1620	* blocked() and wall() work properly), and these flags are updated by	1383	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1384	* update_object().
1622	*/	1385	*/
1623		1386
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1387	/* if this is not the head or flag has been passed, don't check walk on status */
1625
1626	if (!(flag & INS_NO_WALK_ON) && !op->head)	1388	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1389	{
1628	if (check_move_on (op, originator))	1390	if (check_move_on (op, originator))
1629	return NULL;	1391	return 0;
1630		1392
1631	/* If we are a multi part object, lets work our way through the check	1393	/* If we are a multi part object, lets work our way through the check
1632	* walk on's.	1394	* walk on's.
1633	*/	1395	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1396	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1397	if (check_move_on (tmp, originator))
1636	return NULL;	1398	return 0;
1637	}	1399	}
		1400
1638	return op;	1401	return op;
1639	}	1402	}
1640		1403
1641	/* this function inserts an object in the map, but if it	1404	/* this function inserts an object in the map, but if it
1642	* finds an object of its own type, it'll remove that one first.	1405	* finds an object of its own type, it'll remove that one first.
1643	* op is the object to insert it under: supplies x and the map.	1406	* op is the object to insert it under: supplies x and the map.
1644	*/	1407	*/
1645	void	1408	void
1646	replace_insert_ob_in_map (const char *arch_string, object *op)	1409	replace_insert_ob_in_map (const char *arch_string, object *op)
1647	{	1410	{
1648	object *	1411	object *tmp, *tmp1;
1649	tmp;
1650	object *
1651	tmp1;
1652		1412
1653	/* first search for itself and remove any old instances */	1413	/* first search for itself and remove any old instances */
1654		1414
1655	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1415	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1656	{
1657	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1416	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1658	{	1417	tmp->destroy ();
1659	remove_ob (tmp);
1660	free_object (tmp);
1661	}
1662	}
1663		1418
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1419	tmp1 = arch_to_object (archetype::find (arch_string));
1665
1666		1420
1667	tmp1->x = op->x;	1421	tmp1->x = op->x;
1668	tmp1->y = op->y;	1422	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1423	insert_ob_in_map (tmp1, op->map, op, 0);
		1424	}
		1425
		1426	object *
		1427	object::insert_at (object *where, object *originator, int flags)
		1428	{
		1429	where->map->insert (this, where->x, where->y, originator, flags);
1670	}	1430	}
1671		1431
1672	/*	1432	/*
1673	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1433	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1674	* is returned contains nr objects, and the remaining parts contains	1434	* is returned contains nr objects, and the remaining parts contains
1675	* the rest (or is removed and freed if that number is 0).	1435	* the rest (or is removed and freed if that number is 0).
1676	* On failure, NULL is returned, and the reason put into the	1436	* On failure, NULL is returned, and the reason put into the
1677	* global static errmsg array.	1437	* global static errmsg array.
1678	*/	1438	*/
1679
1680	object *	1439	object *
1681	get_split_ob (object *orig_ob, uint32 nr)	1440	get_split_ob (object *orig_ob, uint32 nr)
1682	{	1441	{
1683	object *	1442	object *newob;
1684	newob;
1685	int
1686	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1443	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1687		1444
1688	if (orig_ob->nrof < nr)	1445	if (orig_ob->nrof < nr)
1689	{	1446	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1447	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;	1448	return NULL;
1692	}	1449	}
		1450
1693	newob = object_create_clone (orig_ob);	1451	newob = object_create_clone (orig_ob);
		1452
1694	if ((orig_ob->nrof -= nr) < 1)	1453	if ((orig_ob->nrof -= nr) < 1)
1695	{	1454	orig_ob->destroy (1);
1696	if (!is_removed)
1697	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);
1699	}
1700	else if (!is_removed)	1455	else if (!is_removed)
1701	{	1456	{
1702	if (orig_ob->env != NULL)	1457	if (orig_ob->env != NULL)
1703	sub_weight (orig_ob->env, orig_ob->weight * nr);	1458	sub_weight (orig_ob->env, orig_ob->weight * nr);
1704	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1459	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1461	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1707	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1462	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;	1463	return NULL;
1709	}	1464	}
1710	}	1465	}
		1466
1711	newob->nrof = nr;	1467	newob->nrof = nr;
1712		1468
1713	return newob;	1469	return newob;
1714	}	1470	}
1715		1471
…		…
1722	*/	1478	*/
1723		1479
1724	object *	1480	object *
1725	decrease_ob_nr (object *op, uint32 i)	1481	decrease_ob_nr (object *op, uint32 i)
1726	{	1482	{
1727	object *	1483	object *tmp;
1728	tmp;
1729	player *
1730	pl;
1731		1484
1732	if (i == 0) /* objects with op->nrof require this check */	1485	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1486	return op;
1734		1487
1735	if (i > op->nrof)	1488	if (i > op->nrof)
1736	i = op->nrof;	1489	i = op->nrof;
1737		1490
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1491	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1492	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1493	else if (op->env)
1743	{	1494	{
1744	/* is this object in the players inventory, or sub container	1495	/* is this object in the players inventory, or sub container
1745	* therein?	1496	* therein?
1746	*/	1497	*/
1747	tmp = is_player_inv (op->env);	1498	tmp = op->in_player ();
1748	/* nope. Is this a container the player has opened?	1499	/* nope. Is this a container the player has opened?
1749	* If so, set tmp to that player.	1500	* If so, set tmp to that player.
1750	* IMO, searching through all the players will mostly	1501	* IMO, searching through all the players will mostly
1751	* likely be quicker than following op->env to the map,	1502	* likely be quicker than following op->env to the map,
1752	* and then searching the map for a player.	1503	* and then searching the map for a player.
1753	*/	1504	*/
1754	if (!tmp)	1505	if (!tmp)
1755	{	1506	for_all_players (pl)
1756	for (pl = first_player; pl; pl = pl->next)
1757	if (pl->ob->container == op->env)	1507	if (pl->ob->container == op->env)
		1508	{
		1509	tmp = pl->ob;
1758	break;	1510	break;
1759	if (pl)
1760	tmp = pl->ob;
1761	else
1762	tmp = NULL;
1763	}	1511	}
1764		1512
1765	if (i < op->nrof)	1513	if (i < op->nrof)
1766	{	1514	{
1767	sub_weight (op->env, op->weight * i);	1515	sub_weight (op->env, op->weight * i);
1768	op->nrof -= i;	1516	op->nrof -= i;
1769	if (tmp)	1517	if (tmp)
1770	{
1771	esrv_send_item (tmp, op);	1518	esrv_send_item (tmp, op);
1772	}
1773	}	1519	}
1774	else	1520	else
1775	{	1521	{
1776	remove_ob (op);	1522	op->remove ();
1777	op->nrof = 0;	1523	op->nrof = 0;
1778	if (tmp)	1524	if (tmp)
1779	{
1780	esrv_del_item (tmp->contr, op->count);	1525	esrv_del_item (tmp->contr, op->count);
1781	}
1782	}	1526	}
1783	}	1527	}
1784	else	1528	else
1785	{	1529	{
1786	object *
1787	above = op->above;	1530	object *above = op->above;
1788		1531
1789	if (i < op->nrof)	1532	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1533	op->nrof -= i;
1792	}
1793	else	1534	else
1794	{	1535	{
1795	remove_ob (op);	1536	op->remove ();
1796	op->nrof = 0;	1537	op->nrof = 0;
1797	}	1538	}
		1539
1798	/* Since we just removed op, op->above is null */	1540	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1541	for (tmp = above; tmp; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1542	if (tmp->type == PLAYER)
1801	{	1543	{
1802	if (op->nrof)	1544	if (op->nrof)
1803	esrv_send_item (tmp, op);	1545	esrv_send_item (tmp, op);
1804	else	1546	else
1805	esrv_del_item (tmp->contr, op->count);	1547	esrv_del_item (tmp->contr, op->count);
1806	}	1548	}
1807	}	1549	}
1808		1550
1809	if (op->nrof)	1551	if (op->nrof)
1810	{
1811	return op;	1552	return op;
1812	}
1813	else	1553	else
1814	{	1554	{
1815	free_object (op);	1555	op->destroy ();
1816	return NULL;	1556	return 0;
1817	}	1557	}
1818	}	1558	}
1819		1559
1820	/*	1560	/*
1821	* add_weight(object, weight) adds the specified weight to an object,	1561	* add_weight(object, weight) adds the specified weight to an object,
…		…
1826	add_weight (object *op, signed long weight)	1566	add_weight (object *op, signed long weight)
1827	{	1567	{
1828	while (op != NULL)	1568	while (op != NULL)
1829	{	1569	{
1830	if (op->type == CONTAINER)	1570	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1571	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1572
1834	op->carrying += weight;	1573	op->carrying += weight;
1835	op = op->env;	1574	op = op->env;
1836	}	1575	}
1837	}	1576	}
1838		1577
		1578	object *
		1579	insert_ob_in_ob (object *op, object *where)
		1580	{
		1581	if (!where)
		1582	{
		1583	char *dump = dump_object (op);
		1584	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1585	free (dump);
		1586	return op;
		1587	}
		1588
		1589	if (where->head)
		1590	{
		1591	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1592	where = where->head;
		1593	}
		1594
		1595	return where->insert (op);
		1596	}
		1597
1839	/*	1598	/*
1840	* insert_ob_in_ob(op,environment):	1599	* env->insert (op)
1841	* This function inserts the object op in the linked list	1600	* This function inserts the object op in the linked list
1842	* inside the object environment.	1601	* inside the object environment.
1843	*	1602	*
1844	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1845	* the inventory at the last position or next to other objects of the same
1846	* type.
1847	* Frank: Now sorted by type, archetype and magic!
1848	*
1849	* The function returns now pointer to inserted item, and return value can	1603	* The function returns now pointer to inserted item, and return value can
1850	* be != op, if items are merged. -Tero	1604	* be != op, if items are merged. -Tero
1851	*/	1605	*/
1852		1606
1853	object *	1607	object *
1854	insert_ob_in_ob (object *op, object *where)	1608	object::insert (object *op)
1855	{	1609	{
1856	object *	1610	object *tmp, *otmp;
1857	tmp, *
1858	otmp;
1859		1611
1860	if (!QUERY_FLAG (op, FLAG_REMOVED))	1612	if (!QUERY_FLAG (op, FLAG_REMOVED))
1861	{	1613	op->remove ();
1862	dump_object (op);	1614
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1864	return op;
1865	}
1866	if (where == NULL)
1867	{
1868	dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870	return op;
1871	}
1872	if (where->head)
1873	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;
1876	}
1877	if (op->more)	1615	if (op->more)
1878	{	1616	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1617	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1618	return op;
1881	}	1619	}
		1620
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1621	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1622	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1623	if (op->nrof)
1885	{	1624	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1625	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1887	if (CAN_MERGE (tmp, op))	1626	if (object::can_merge (tmp, op))
1888	{	1627	{
1889	/* return the original object and remove inserted object	1628	/* return the original object and remove inserted object
1890	(client needs the original object) */	1629	(client needs the original object) */
1891	tmp->nrof += op->nrof;	1630	tmp->nrof += op->nrof;
1892	/* Weight handling gets pretty funky. Since we are adding to	1631	/* Weight handling gets pretty funky. Since we are adding to
1893	* tmp->nrof, we need to increase the weight.	1632	* tmp->nrof, we need to increase the weight.
1894	*/	1633	*/
1895	add_weight (where, op->weight * op->nrof);	1634	add_weight (this, op->weight * op->nrof);
1896	SET_FLAG (op, FLAG_REMOVED);	1635	SET_FLAG (op, FLAG_REMOVED);
1897	free_object (op); /* free the inserted object */	1636	op->destroy (); /* free the inserted object */
1898	op = tmp;	1637	op = tmp;
1899	remove_ob (op); /* and fix old object's links */	1638	op->remove (); /* and fix old object's links */
1900	CLEAR_FLAG (op, FLAG_REMOVED);	1639	CLEAR_FLAG (op, FLAG_REMOVED);
1901	break;	1640	break;
1902	}	1641	}
1903		1642
1904	/* I assume combined objects have no inventory	1643	/* I assume combined objects have no inventory
1905	* We add the weight - this object could have just been removed	1644	* We add the weight - this object could have just been removed
1906	* (if it was possible to merge). calling remove_ob will subtract	1645	* (if it was possible to merge). calling remove_ob will subtract
1907	* the weight, so we need to add it in again, since we actually do	1646	* the weight, so we need to add it in again, since we actually do
1908	* the linking below	1647	* the linking below
1909	*/	1648	*/
1910	add_weight (where, op->weight * op->nrof);	1649	add_weight (this, op->weight * op->nrof);
1911	}	1650	}
1912	else	1651	else
1913	add_weight (where, (op->weight + op->carrying));	1652	add_weight (this, (op->weight + op->carrying));
1914		1653
1915	otmp = is_player_inv (where);	1654	otmp = this->in_player ();
1916	if (otmp && otmp->contr != NULL)	1655	if (otmp && otmp->contr)
1917	{
1918	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1656	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1919	fix_player (otmp);	1657	otmp->update_stats ();
1920	}
1921		1658
1922	op->map = NULL;	1659	op->map = 0;
1923	op->env = where;	1660	op->env = this;
1924	op->above = NULL;	1661	op->above = 0;
1925	op->below = NULL;	1662	op->below = 0;
1926	op->x = 0, op->y = 0;	1663	op->x = 0, op->y = 0;
1927		1664
1928	/* reset the light list and los of the players on the map */	1665	/* reset the light list and los of the players on the map */
1929	if ((op->glow_radius != 0) && where->map)	1666	if ((op->glow_radius != 0) && map)
1930	{	1667	{
1931	#ifdef DEBUG_LIGHTS	1668	#ifdef DEBUG_LIGHTS
1932	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1669	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1933	#endif /* DEBUG_LIGHTS */	1670	#endif /* DEBUG_LIGHTS */
1934	if (MAP_DARKNESS (where->map))	1671	if (map->darkness)
1935	update_all_los (where->map, where->x, where->y);	1672	update_all_los (map, x, y);
1936	}	1673	}
1937		1674
1938	/* Client has no idea of ordering so lets not bother ordering it here.	1675	/* Client has no idea of ordering so lets not bother ordering it here.
1939	* It sure simplifies this function...	1676	* It sure simplifies this function...
1940	*/	1677	*/
1941	if (where->inv == NULL)	1678	if (!inv)
1942	where->inv = op;	1679	inv = op;
1943	else	1680	else
1944	{	1681	{
1945	op->below = where->inv;	1682	op->below = inv;
1946	op->below->above = op;	1683	op->below->above = op;
1947	where->inv = op;	1684	inv = op;
1948	}	1685	}
		1686
		1687	INVOKE_OBJECT (INSERT, this);
		1688
1949	return op;	1689	return op;
1950	}	1690	}
1951		1691
1952	/*	1692	/*
1953	* Checks if any objects has a move_type that matches objects	1693	* Checks if any objects has a move_type that matches objects
…		…
1967	*	1707	*
1968	* MSW 2001-07-08: Check all objects on space, not just those below	1708	* MSW 2001-07-08: Check all objects on space, not just those below
1969	* object being inserted. insert_ob_in_map may not put new objects	1709	* object being inserted. insert_ob_in_map may not put new objects
1970	* on top.	1710	* on top.
1971	*/	1711	*/
1972
1973	int	1712	int
1974	check_move_on (object *op, object *originator)	1713	check_move_on (object *op, object *originator)
1975	{	1714	{
1976	object *	1715	object *tmp;
1977	tmp;	1716	maptile *m = op->map;
1978	tag_t
1979	tag;
1980	mapstruct *
1981	m = op->map;
1982	int
1983	x = op->x, y = op->y;	1717	int x = op->x, y = op->y;
1984	MoveType	1718
1985	move_on,	1719	MoveType move_on, move_slow, move_block;
1986	move_slow,
1987	move_block;
1988		1720
1989	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1721	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1990	return 0;	1722	return 0;
1991
1992	tag = op->count;
1993		1723
1994	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1724	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1995	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1725	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1996	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1726	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1997		1727
…		…
2013		1743
2014	/* The objects have to be checked from top to bottom.	1744	/* The objects have to be checked from top to bottom.
2015	* Hence, we first go to the top:	1745	* Hence, we first go to the top:
2016	*/	1746	*/
2017		1747
2018	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1748	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
2019	{	1749	{
2020	/* Trim the search when we find the first other spell effect	1750	/* Trim the search when we find the first other spell effect
2021	* this helps performance so that if a space has 50 spell objects,	1751	* this helps performance so that if a space has 50 spell objects,
2022	* we don't need to check all of them.	1752	* we don't need to check all of them.
2023	*/	1753	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1754	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;	1755	break;
2026	}	1756	}
		1757
2027	for (; tmp != NULL; tmp = tmp->below)	1758	for (; tmp; tmp = tmp->below)
2028	{	1759	{
2029	if (tmp == op)	1760	if (tmp == op)
2030	continue; /* Can't apply yourself */	1761	continue; /* Can't apply yourself */
2031		1762
2032	/* Check to see if one of the movement types should be slowed down.	1763	/* Check to see if one of the movement types should be slowed down.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1771	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2041	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1772	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	1773	{
2043		1774
2044	float	1775	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	1776	diff = tmp->move_slow_penalty * FABS (op->speed);
		1777
2048	if (op->type == PLAYER)	1778	if (op->type == PLAYER)
2049	{
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1779	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2051	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1780	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	1781	diff /= 4.0;
2054	}	1782
2055	}
2056	op->speed_left -= diff;	1783	op->speed_left -= diff;
2057	}	1784	}
2058	}	1785	}
2059		1786
2060	/* Basically same logic as above, except now for actual apply. */	1787	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1788	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2062	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1789	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	1790	{
2064
2065	move_apply (tmp, op, originator);	1791	move_apply (tmp, op, originator);
		1792
2066	if (was_destroyed (op, tag))	1793	if (op->destroyed ())
2067	return 1;	1794	return 1;
2068		1795
2069	/* what the person/creature stepped onto has moved the object	1796	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	1797	* someplace new. Don't process any further - if we did,
2071	* have a feeling strange problems would result.	1798	* have a feeling strange problems would result.
2072	*/	1799	*/
2073	if (op->map != m || op->x != x || op->y != y)	1800	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	1801	return 0;
2075	}	1802	}
2076	}	1803	}
		1804
2077	return 0;	1805	return 0;
2078	}	1806	}
2079		1807
2080	/*	1808	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	1809	* present_arch(arch, map, x, y) searches for any objects with
2082	* a matching archetype at the given map and coordinates.	1810	* a matching archetype at the given map and coordinates.
2083	* The first matching object is returned, or NULL if none.	1811	* The first matching object is returned, or NULL if none.
2084	*/	1812	*/
2085
2086	object *	1813	object *
2087	present_arch (const archetype *at, mapstruct *m, int x, int y)	1814	present_arch (const archetype *at, maptile *m, int x, int y)
2088	{	1815	{
2089	object *
2090	tmp;
2091
2092	if (m == NULL || out_of_map (m, x, y))	1816	if (!m || out_of_map (m, x, y))
2093	{	1817	{
2094	LOG (llevError, "Present_arch called outside map.\n");	1818	LOG (llevError, "Present_arch called outside map.\n");
2095	return NULL;	1819	return NULL;
2096	}	1820	}
2097	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1821
		1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2098	if (tmp->arch == at)	1823	if (tmp->arch == at)
2099	return tmp;	1824	return tmp;
		1825
2100	return NULL;	1826	return NULL;
2101	}	1827	}
2102		1828
2103	/*	1829	/*
2104	* present(type, map, x, y) searches for any objects with	1830	* present(type, map, x, y) searches for any objects with
2105	* a matching type variable at the given map and coordinates.	1831	* a matching type variable at the given map and coordinates.
2106	* The first matching object is returned, or NULL if none.	1832	* The first matching object is returned, or NULL if none.
2107	*/	1833	*/
2108
2109	object *	1834	object *
2110	present (unsigned char type, mapstruct *m, int x, int y)	1835	present (unsigned char type, maptile *m, int x, int y)
2111	{	1836	{
2112	object *
2113	tmp;
2114
2115	if (out_of_map (m, x, y))	1837	if (out_of_map (m, x, y))
2116	{	1838	{
2117	LOG (llevError, "Present called outside map.\n");	1839	LOG (llevError, "Present called outside map.\n");
2118	return NULL;	1840	return NULL;
2119	}	1841	}
2120	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1842
		1843	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2121	if (tmp->type == type)	1844	if (tmp->type == type)
2122	return tmp;	1845	return tmp;
		1846
2123	return NULL;	1847	return NULL;
2124	}	1848	}
2125		1849
2126	/*	1850	/*
2127	* present_in_ob(type, object) searches for any objects with	1851	* present_in_ob(type, object) searches for any objects with
2128	* a matching type variable in the inventory of the given object.	1852	* a matching type variable in the inventory of the given object.
2129	* The first matching object is returned, or NULL if none.	1853	* The first matching object is returned, or NULL if none.
2130	*/	1854	*/
2131
2132	object *	1855	object *
2133	present_in_ob (unsigned char type, const object *op)	1856	present_in_ob (unsigned char type, const object *op)
2134	{	1857	{
2135	object *
2136	tmp;
2137
2138	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1858	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2139	if (tmp->type == type)	1859	if (tmp->type == type)
2140	return tmp;	1860	return tmp;
		1861
2141	return NULL;	1862	return NULL;
2142	}	1863	}
2143		1864
2144	/*	1865	/*
2145	* present_in_ob (type, str, object) searches for any objects with	1866	* present_in_ob (type, str, object) searches for any objects with
…		…
2153	* str is the string to match against. Note that we match against	1874	* str is the string to match against. Note that we match against
2154	* the object name, not the archetype name. this is so that the	1875	* the object name, not the archetype name. this is so that the
2155	* spell code can use one object type (force), but change it's name	1876	* spell code can use one object type (force), but change it's name
2156	* to be unique.	1877	* to be unique.
2157	*/	1878	*/
2158
2159	object *	1879	object *
2160	present_in_ob_by_name (int type, const char *str, const object *op)	1880	present_in_ob_by_name (int type, const char *str, const object *op)
2161	{	1881	{
2162	object *
2163	tmp;
2164
2165	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1882	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2166	{
2167	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1883	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2168	return tmp;	1884	return tmp;
2169	}	1885
2170	return NULL;	1886	return 0;
2171	}	1887	}
2172		1888
2173	/*	1889	/*
2174	* present_arch_in_ob(archetype, object) searches for any objects with	1890	* present_arch_in_ob(archetype, object) searches for any objects with
2175	* a matching archetype in the inventory of the given object.	1891	* a matching archetype in the inventory of the given object.
2176	* The first matching object is returned, or NULL if none.	1892	* The first matching object is returned, or NULL if none.
2177	*/	1893	*/
2178
2179	object *	1894	object *
2180	present_arch_in_ob (const archetype *at, const object *op)	1895	present_arch_in_ob (const archetype *at, const object *op)
2181	{	1896	{
2182	object *
2183	tmp;
2184
2185	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1897	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2186	if (tmp->arch == at)	1898	if (tmp->arch == at)
2187	return tmp;	1899	return tmp;
		1900
2188	return NULL;	1901	return NULL;
2189	}	1902	}
2190		1903
2191	/*	1904	/*
2192	* activate recursively a flag on an object inventory	1905	* activate recursively a flag on an object inventory
2193	*/	1906	*/
2194	void	1907	void
2195	flag_inv (object *op, int flag)	1908	flag_inv (object *op, int flag)
2196	{	1909	{
2197	object *
2198	tmp;
2199
2200	if (op->inv)	1910	if (op->inv)
2201	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1911	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2202	{	1912	{
2203	SET_FLAG (tmp, flag);	1913	SET_FLAG (tmp, flag);
2204	flag_inv (tmp, flag);	1914	flag_inv (tmp, flag);
2205	}	1915	}
2206	} /*	1916	}
		1917
		1918	/*
2207	* desactivate recursively a flag on an object inventory	1919	* deactivate recursively a flag on an object inventory
2208	*/	1920	*/
2209	void	1921	void
2210	unflag_inv (object *op, int flag)	1922	unflag_inv (object *op, int flag)
2211	{	1923	{
2212	object *
2213	tmp;
2214
2215	if (op->inv)	1924	if (op->inv)
2216	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1925	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2217	{	1926	{
2218	CLEAR_FLAG (tmp, flag);	1927	CLEAR_FLAG (tmp, flag);
2219	unflag_inv (tmp, flag);	1928	unflag_inv (tmp, flag);
2220	}	1929	}
2221	}	1930	}
…		…
2224	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1933	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2225	* all it's inventory (recursively).	1934	* all it's inventory (recursively).
2226	* If checksums are used, a player will get set_cheat called for	1935	* If checksums are used, a player will get set_cheat called for
2227	* him/her-self and all object carried by a call to this function.	1936	* him/her-self and all object carried by a call to this function.
2228	*/	1937	*/
2229
2230	void	1938	void
2231	set_cheat (object *op)	1939	set_cheat (object *op)
2232	{	1940	{
2233	SET_FLAG (op, FLAG_WAS_WIZ);	1941	SET_FLAG (op, FLAG_WAS_WIZ);
2234	flag_inv (op, FLAG_WAS_WIZ);	1942	flag_inv (op, FLAG_WAS_WIZ);
…		…
2253	* because arch_blocked (now ob_blocked) needs to know the movement type	1961	* because arch_blocked (now ob_blocked) needs to know the movement type
2254	* to know if the space in question will block the object. We can't use	1962	* to know if the space in question will block the object. We can't use
2255	* the archetype because that isn't correct if the monster has been	1963	* the archetype because that isn't correct if the monster has been
2256	* customized, changed states, etc.	1964	* customized, changed states, etc.
2257	*/	1965	*/
2258
2259	int	1966	int
2260	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	1967	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2261	{	1968	{
2262	int
2263	i,
2264	index = 0, flag;	1969	int index = 0, flag;
2265	static int
2266	altern[SIZEOFFREE];	1970	int altern[SIZEOFFREE];
2267		1971
2268	for (i = start; i < stop; i++)	1972	for (int i = start; i < stop; i++)
2269	{	1973	{
2270	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1974	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2271	if (!flag)	1975	if (!flag)
2272	altern[index++] = i;	1976	altern [index++] = i;
2273		1977
2274	/* Basically, if we find a wall on a space, we cut down the search size.	1978	/* Basically, if we find a wall on a space, we cut down the search size.
2275	* In this way, we won't return spaces that are on another side of a wall.	1979	* In this way, we won't return spaces that are on another side of a wall.
2276	* This mostly work, but it cuts down the search size in all directions -	1980	* This mostly work, but it cuts down the search size in all directions -
2277	* if the space being examined only has a wall to the north and empty	1981	* if the space being examined only has a wall to the north and empty
2278	* spaces in all the other directions, this will reduce the search space	1982	* spaces in all the other directions, this will reduce the search space
2279	* to only the spaces immediately surrounding the target area, and	1983	* to only the spaces immediately surrounding the target area, and
2280	* won't look 2 spaces south of the target space.	1984	* won't look 2 spaces south of the target space.
2281	*/	1985	*/
2282	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1986	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2283	stop = maxfree[i];	1987	stop = maxfree[i];
2284	}	1988	}
		1989
2285	if (!index)	1990	if (!index)
2286	return -1;	1991	return -1;
		1992
2287	return altern[RANDOM () % index];	1993	return altern[RANDOM () % index];
2288	}	1994	}
2289		1995
2290	/*	1996	/*
2291	* find_first_free_spot(archetype, mapstruct, x, y) works like	1997	* find_first_free_spot(archetype, maptile, x, y) works like
2292	* find_free_spot(), but it will search max number of squares.	1998	* find_free_spot(), but it will search max number of squares.
2293	* But it will return the first available spot, not a random choice.	1999	* But it will return the first available spot, not a random choice.
2294	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2000	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2295	*/	2001	*/
2296
2297	int	2002	int
2298	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2003	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2299	{	2004	{
2300	int
2301	i;
2302
2303	for (i = 0; i < SIZEOFFREE; i++)	2005	for (int i = 0; i < SIZEOFFREE; i++)
2304	{
2305	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2006	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2306	return i;	2007	return i;
2307	}	2008
2308	return -1;	2009	return -1;
2309	}	2010	}
2310		2011
2311	/*	2012	/*
2312	* The function permute(arr, begin, end) randomly reorders the array	2013	* The function permute(arr, begin, end) randomly reorders the array
2313	* arr[begin..end-1].	2014	* arr[begin..end-1].
		2015	* now uses a fisher-yates shuffle, old permute was broken
2314	*/	2016	*/
2315	static void	2017	static void
2316	permute (int *arr, int begin, int end)	2018	permute (int *arr, int begin, int end)
2317	{	2019	{
2318	int	2020	arr += begin;
2319	i,
2320	j,
2321	tmp,
2322	len;
2323
2324	len = end - begin;	2021	end -= begin;
2325	for (i = begin; i < end; i++)
2326	{
2327	j = begin + RANDOM () % len;
2328		2022
2329	tmp = arr[i];	2023	while (--end)
2330	arr[i] = arr[j];	2024	swap (arr [end], arr [RANDOM () % (end + 1)]);
2331	arr[j] = tmp;
2332	}
2333	}	2025	}
2334		2026
2335	/* new function to make monster searching more efficient, and effective!	2027	/* new function to make monster searching more efficient, and effective!
2336	* This basically returns a randomized array (in the passed pointer) of	2028	* This basically returns a randomized array (in the passed pointer) of
2337	* the spaces to find monsters. In this way, it won't always look for	2029	* the spaces to find monsters. In this way, it won't always look for
…		…
2340	* the 3x3 area will be searched, just not in a predictable order.	2032	* the 3x3 area will be searched, just not in a predictable order.
2341	*/	2033	*/
2342	void	2034	void
2343	get_search_arr (int *search_arr)	2035	get_search_arr (int *search_arr)
2344	{	2036	{
2345	int	2037	int i;
2346	i;
2347		2038
2348	for (i = 0; i < SIZEOFFREE; i++)	2039	for (i = 0; i < SIZEOFFREE; i++)
2349	{
2350	search_arr[i] = i;	2040	search_arr[i] = i;
2351	}
2352		2041
2353	permute (search_arr, 1, SIZEOFFREE1 + 1);	2042	permute (search_arr, 1, SIZEOFFREE1 + 1);
2354	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2043	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2355	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2044	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2356	}	2045	}
…		…
2365	* Perhaps incorrectly, but I'm making the assumption that exclude	2054	* Perhaps incorrectly, but I'm making the assumption that exclude
2366	* is actually want is going to try and move there. We need this info	2055	* is actually want is going to try and move there. We need this info
2367	* because we have to know what movement the thing looking to move	2056	* because we have to know what movement the thing looking to move
2368	* there is capable of.	2057	* there is capable of.
2369	*/	2058	*/
2370
2371	int	2059	int
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2060	find_dir (maptile *m, int x, int y, object *exclude)
2373	{	2061	{
2374	int
2375	i,
2376	max = SIZEOFFREE, mflags;	2062	int i, max = SIZEOFFREE, mflags;
2377	sint16	2063
2378	nx,	2064	sint16 nx, ny;
2379	ny;
2380	object *	2065	object *tmp;
2381	tmp;	2066	maptile *mp;
2382	mapstruct *	2067
2383	mp;	2068	MoveType blocked, move_type;
2384	MoveType
2385	blocked,
2386	move_type;
2387		2069
2388	if (exclude && exclude->head)	2070	if (exclude && exclude->head)
2389	{	2071	{
2390	exclude = exclude->head;	2072	exclude = exclude->head;
2391	move_type = exclude->move_type;	2073	move_type = exclude->move_type;
…		…
2401	mp = m;	2083	mp = m;
2402	nx = x + freearr_x[i];	2084	nx = x + freearr_x[i];
2403	ny = y + freearr_y[i];	2085	ny = y + freearr_y[i];
2404		2086
2405	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2087	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2088
2406	if (mflags & P_OUT_OF_MAP)	2089	if (mflags & P_OUT_OF_MAP)
2407	{
2408	max = maxfree[i];	2090	max = maxfree[i];
2409	}
2410	else	2091	else
2411	{	2092	{
2412	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2093	mapspace &ms = mp->at (nx, ny);
		2094
		2095	blocked = ms.move_block;
2413		2096
2414	if ((move_type & blocked) == move_type)	2097	if ((move_type & blocked) == move_type)
2415	{
2416	max = maxfree[i];	2098	max = maxfree[i];
2417	}
2418	else if (mflags & P_IS_ALIVE)	2099	else if (mflags & P_IS_ALIVE)
2419	{	2100	{
2420	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2101	for (tmp = ms.bot; tmp; tmp = tmp->above)
2421	{	2102	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2422	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2103	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2423	{
2424	break;	2104	break;
2425	}	2105
2426	}
2427	if (tmp)	2106	if (tmp)
2428	{
2429	return freedir[i];	2107	return freedir[i];
2430	}
2431	}	2108	}
2432	}	2109	}
2433	}	2110	}
		2111
2434	return 0;	2112	return 0;
2435	}	2113	}
2436		2114
2437	/*	2115	/*
2438	* distance(object 1, object 2) will return the square of the	2116	* distance(object 1, object 2) will return the square of the
2439	* distance between the two given objects.	2117	* distance between the two given objects.
2440	*/	2118	*/
2441
2442	int	2119	int
2443	distance (const object *ob1, const object *ob2)	2120	distance (const object *ob1, const object *ob2)
2444	{	2121	{
2445	int
2446	i;
2447
2448	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2122	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2449	return i;
2450	}	2123	}
2451		2124
2452	/*	2125	/*
2453	* find_dir_2(delta-x,delta-y) will return a direction in which	2126	* find_dir_2(delta-x,delta-y) will return a direction in which
2454	* an object which has subtracted the x and y coordinates of another	2127	* an object which has subtracted the x and y coordinates of another
2455	* object, needs to travel toward it.	2128	* object, needs to travel toward it.
2456	*/	2129	*/
2457
2458	int	2130	int
2459	find_dir_2 (int x, int y)	2131	find_dir_2 (int x, int y)
2460	{	2132	{
2461	int	2133	int q;
2462	q;
2463		2134
2464	if (y)	2135	if (y)
2465	q = x * 100 / y;	2136	q = x * 100 / y;
2466	else if (x)	2137	else if (x)
2467	q = -300 * x;	2138	q = -300 * x;
…		…
2492		2163
2493	return 3;	2164	return 3;
2494	}	2165	}
2495		2166
2496	/*	2167	/*
2497	* absdir(int): Returns a number between 1 and 8, which represent
2498	* the "absolute" direction of a number (it actually takes care of
2499	* "overflow" in previous calculations of a direction).
2500	*/
2501
2502	int
2503	absdir (int d)
2504	{
2505	while (d < 1)
2506	d += 8;
2507	while (d > 8)
2508	d -= 8;
2509	return d;
2510	}
2511
2512	/*
2513	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2168	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2514	* between two directions (which are expected to be absolute (see absdir())	2169	* between two directions (which are expected to be absolute (see absdir())
2515	*/	2170	*/
2516
2517	int	2171	int
2518	dirdiff (int dir1, int dir2)	2172	dirdiff (int dir1, int dir2)
2519	{	2173	{
2520	int	2174	int d;
2521	d;
2522		2175
2523	d = abs (dir1 - dir2);	2176	d = abs (dir1 - dir2);
2524	if (d > 4)	2177	if (d > 4)
2525	d = 8 - d;	2178	d = 8 - d;
		2179
2526	return d;	2180	return d;
2527	}	2181	}
2528		2182
2529	/* peterm:	2183	/* peterm:
2530	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2184	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2533	* This basically means that if direction is 15, then it could either go	2187	* This basically means that if direction is 15, then it could either go
2534	* direction 4, 14, or 16 to get back to where we are.	2188	* direction 4, 14, or 16 to get back to where we are.
2535	* Moved from spell_util.c to object.c with the other related direction	2189	* Moved from spell_util.c to object.c with the other related direction
2536	* functions.	2190	* functions.
2537	*/	2191	*/
2538
2539	int
2540	reduction_dir[SIZEOFFREE][3] = {	2192	int reduction_dir[SIZEOFFREE][3] = {
2541	{0, 0, 0}, /* 0 */	2193	{0, 0, 0}, /* 0 */
2542	{0, 0, 0}, /* 1 */	2194	{0, 0, 0}, /* 1 */
2543	{0, 0, 0}, /* 2 */	2195	{0, 0, 0}, /* 2 */
2544	{0, 0, 0}, /* 3 */	2196	{0, 0, 0}, /* 3 */
2545	{0, 0, 0}, /* 4 */	2197	{0, 0, 0}, /* 4 */
…		…
2593	* find a path to that monster that we found. If not,	2245	* find a path to that monster that we found. If not,
2594	* we don't bother going toward it. Returns 1 if we	2246	* we don't bother going toward it. Returns 1 if we
2595	* can see a direct way to get it	2247	* can see a direct way to get it
2596	* Modified to be map tile aware -.MSW	2248	* Modified to be map tile aware -.MSW
2597	*/	2249	*/
2598
2599
2600	int	2250	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2251	can_see_monsterP (maptile *m, int x, int y, int dir)
2602	{	2252	{
2603	sint16	2253	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int
2607	mflags;	2254	int mflags;
2608		2255
2609	if (dir < 0)	2256	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2257	return 0; /* exit condition: invalid direction */
2611		2258
2612	dx = x + freearr_x[dir];	2259	dx = x + freearr_x[dir];
…		…
2625	return 0;	2272	return 0;
2626		2273
2627	/* yes, can see. */	2274	/* yes, can see. */
2628	if (dir < 9)	2275	if (dir < 9)
2629	return 1;	2276	return 1;
		2277
2630	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2278	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2631	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2279	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2280	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2632	}	2281	}
2633
2634
2635		2282
2636	/*	2283	/*
2637	* can_pick(picker, item): finds out if an object is possible to be	2284	* can_pick(picker, item): finds out if an object is possible to be
2638	* picked up by the picker. Returnes 1 if it can be	2285	* picked up by the picker. Returnes 1 if it can be
2639	* picked up, otherwise 0.	2286	* picked up, otherwise 0.
…		…
2650	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2297	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2651	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2298	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2652	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2299	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2653	}	2300	}
2654		2301
2655
2656	/*	2302	/*
2657	* create clone from object to another	2303	* create clone from object to another
2658	*/	2304	*/
2659	object *	2305	object *
2660	object_create_clone (object *asrc)	2306	object_create_clone (object *asrc)
2661	{	2307	{
2662	object *
2663	dst = NULL, *tmp, *src, *part, *prev, *item;	2308	object *dst = 0, *tmp, *src, *part, *prev, *item;
2664		2309
2665	if (!asrc)	2310	if (!asrc)
2666	return NULL;	2311	return 0;
		2312
2667	src = asrc;	2313	src = asrc;
2668	if (src->head)	2314	if (src->head)
2669	src = src->head;	2315	src = src->head;
2670		2316
2671	prev = NULL;	2317	prev = 0;
2672	for (part = src; part; part = part->more)	2318	for (part = src; part; part = part->more)
2673	{	2319	{
2674	tmp = get_object ();	2320	tmp = part->clone ();
2675	copy_object (part, tmp);
2676	tmp->x -= src->x;	2321	tmp->x -= src->x;
2677	tmp->y -= src->y;	2322	tmp->y -= src->y;
		2323
2678	if (!part->head)	2324	if (!part->head)
2679	{	2325	{
2680	dst = tmp;	2326	dst = tmp;
2681	tmp->head = NULL;	2327	tmp->head = 0;
2682	}	2328	}
2683	else	2329	else
2684	{
2685	tmp->head = dst;	2330	tmp->head = dst;
2686	}	2331
2687	tmp->more = NULL;	2332	tmp->more = 0;
		2333
2688	if (prev)	2334	if (prev)
2689	prev->more = tmp;	2335	prev->more = tmp;
		2336
2690	prev = tmp;	2337	prev = tmp;
2691	}	2338	}
2692		2339
2693	/*** copy inventory ***/
2694	for (item = src->inv; item; item = item->below)	2340	for (item = src->inv; item; item = item->below)
2695	{
2696	(void) insert_ob_in_ob (object_create_clone (item), dst);	2341	insert_ob_in_ob (object_create_clone (item), dst);
2697	}
2698		2342
2699	return dst;	2343	return dst;
2700	}	2344	}
2701		2345
2702	/* return true if the object was destroyed, 0 otherwise */
2703	int
2704	was_destroyed (const object *op, tag_t old_tag)
2705	{
2706	/* checking for FLAG_FREED isn't necessary, but makes this function more
2707	* robust */
2708	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709	}
2710
2711	/* GROS - Creates an object using a string representing its content. */	2346	/* GROS - Creates an object using a string representing its content. */
2712
2713	/* Basically, we save the content of the string to a temp file, then call */	2347	/* Basically, we save the content of the string to a temp file, then call */
2714
2715	/* load_object on it. I admit it is a highly inefficient way to make things, */	2348	/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717	/* but it was simple to make and allows reusing the load_object function. */	2349	/* but it was simple to make and allows reusing the load_object function. */
2718
2719	/* Remember not to use load_object_str in a time-critical situation. */	2350	/* Remember not to use load_object_str in a time-critical situation. */
2720
2721	/* Also remember that multiparts objects are not supported for now. */	2351	/* Also remember that multiparts objects are not supported for now. */
2722
2723	object *	2352	object *
2724	load_object_str (const char *obstr)	2353	load_object_str (const char *obstr)
2725	{	2354	{
2726	object *	2355	object *op;
2727	op;
2728	char
2729	filename[MAX_BUF];	2356	char filename[MAX_BUF];
2730		2357
2731	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2358	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732		2359
2733	FILE *
2734	tempfile = fopen (filename, "w");	2360	FILE *tempfile = fopen (filename, "w");
2735		2361
2736	if (tempfile == NULL)	2362	if (tempfile == NULL)
2737	{	2363	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");	2364	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;	2365	return NULL;
2740	};	2366	}
		2367
2741	fprintf (tempfile, obstr);	2368	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2369	fclose (tempfile);
2743		2370
2744	op = get_object ();	2371	op = object::create ();
2745		2372
2746	object_thawer	2373	object_thawer thawer (filename);
2747	thawer (filename);
2748		2374
2749	if (thawer)	2375	if (thawer)
2750	load_object (thawer, op, 0);	2376	load_object (thawer, op, 0);
2751		2377
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2378	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2760	* returns NULL if no match.	2386	* returns NULL if no match.
2761	*/	2387	*/
2762	object *	2388	object *
2763	find_obj_by_type_subtype (const object *who, int type, int subtype)	2389	find_obj_by_type_subtype (const object *who, int type, int subtype)
2764	{	2390	{
2765	object *
2766	tmp;
2767
2768	for (tmp = who->inv; tmp; tmp = tmp->below)	2391	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2769	if (tmp->type == type && tmp->subtype == subtype)	2392	if (tmp->type == type && tmp->subtype == subtype)
2770	return tmp;	2393	return tmp;
2771		2394
2772	return NULL;	2395	return 0;
2773	}	2396	}
2774		2397
2775	/* If ob has a field named key, return the link from the list,	2398	/* If ob has a field named key, return the link from the list,
2776	* otherwise return NULL.	2399	* otherwise return NULL.
2777	*	2400	*
…		…
2779	* do the desired thing.	2402	* do the desired thing.
2780	*/	2403	*/
2781	key_value *	2404	key_value *
2782	get_ob_key_link (const object *ob, const char *key)	2405	get_ob_key_link (const object *ob, const char *key)
2783	{	2406	{
2784	key_value *
2785	link;
2786
2787	for (link = ob->key_values; link != NULL; link = link->next)	2407	for (key_value *link = ob->key_values; link; link = link->next)
2788	{
2789	if (link->key == key)	2408	if (link->key == key)
2790	{
2791	return link;	2409	return link;
2792	}
2793	}
2794		2410
2795	return NULL;	2411	return 0;
2796	}	2412	}
2797		2413
2798	/*	2414	/*
2799	* Returns the value of op has an extra_field for key, or NULL.	2415	* Returns the value of op has an extra_field for key, or NULL.
2800	*	2416	*
…		…
2803	* The returned string is shared.	2419	* The returned string is shared.
2804	*/	2420	*/
2805	const char *	2421	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2422	get_ob_key_value (const object *op, const char *const key)
2807	{	2423	{
2808	key_value *	2424	key_value *link;
2809	link;	2425	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2426
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2427	if (!canonical_key)
2816	{	2428	{
2817	/* 1. There being a field named key on any object	2429	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2430	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2431	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2432	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2433	*/
2822	return NULL;	2434	return 0;
2823	}	2435	}
2824		2436
2825	/* This is copied from get_ob_key_link() above -	2437	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2438	* only 4 lines, and saves the function call overhead.
2827	*/	2439	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2440	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2441	if (link->key == canonical_key)
2831	{
2832	return link->value;	2442	return link->value;
2833	}	2443
2834	}
2835	return NULL;	2444	return 0;
2836	}	2445	}
2837		2446
2838		2447
2839	/*	2448	/*
2840	* Updates the canonical_key in op to value.	2449	* Updates the canonical_key in op to value.
…		…
2847	* Returns TRUE on success.	2456	* Returns TRUE on success.
2848	*/	2457	*/
2849	int	2458	int
2850	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2459	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2851	{	2460	{
2852	key_value *
2853	field = NULL, *last = NULL;	2461	key_value *field = NULL, *last = NULL;
2854		2462
2855	for (field = op->key_values; field != NULL; field = field->next)	2463	for (field = op->key_values; field != NULL; field = field->next)
2856	{	2464	{
2857	if (field->key != canonical_key)	2465	if (field->key != canonical_key)
2858	{	2466	{
…		…
2876	if (last)	2484	if (last)
2877	last->next = field->next;	2485	last->next = field->next;
2878	else	2486	else
2879	op->key_values = field->next;	2487	op->key_values = field->next;
2880		2488
2881	delete
2882	field;	2489	delete field;
2883	}	2490	}
2884	}	2491	}
2885	return TRUE;	2492	return TRUE;
2886	}	2493	}
2887	/* IF we get here, key doesn't exist */	2494	/* IF we get here, key doesn't exist */
2888		2495
2889	/* No field, we'll have to add it. */	2496	/* No field, we'll have to add it. */
2890		2497
2891	if (!add_key)	2498	if (!add_key)
2892	{
2893	return FALSE;	2499	return FALSE;
2894	}	2500
2895	/* There isn't any good reason to store a null	2501	/* There isn't any good reason to store a null
2896	* value in the key/value list. If the archetype has	2502	* value in the key/value list. If the archetype has
2897	* this key, then we should also have it, so shouldn't	2503	* this key, then we should also have it, so shouldn't
2898	* be here. If user wants to store empty strings,	2504	* be here. If user wants to store empty strings,
2899	* should pass in ""	2505	* should pass in ""
…		…
2922	* Returns TRUE on success.	2528	* Returns TRUE on success.
2923	*/	2529	*/
2924	int	2530	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2531	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2532	{
2927	shstr
2928	key_ (key);	2533	shstr key_ (key);
2929		2534
2930	return set_ob_key_value_s (op, key_, value, add_key);	2535	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2536	}
		2537
		2538	object::depth_iterator::depth_iterator (object *container)
		2539	: iterator_base (container)
		2540	{
		2541	while (item->inv)
		2542	item = item->inv;
		2543	}
		2544
		2545	void
		2546	object::depth_iterator::next ()
		2547	{
		2548	if (item->below)
		2549	{
		2550	item = item->below;
		2551
		2552	while (item->inv)
		2553	item = item->inv;
		2554	}
		2555	else
		2556	item = item->env;
		2557	}
		2558
		2559
		2560	const char *
		2561	object::flag_desc (char *desc, int len) const
		2562	{
		2563	char *p = desc;
		2564	bool first = true;
		2565
		2566	*p = 0;
		2567
		2568	for (int i = 0; i < NUM_FLAGS; i++)
		2569	{
		2570	if (len <= 10) // magic constant!
		2571	{
		2572	snprintf (p, len, ",...");
		2573	break;
		2574	}
		2575
		2576	if (flag [i])
		2577	{
		2578	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2579	len -= cnt;
		2580	p += cnt;
		2581	first = false;
		2582	}
		2583	}
		2584
		2585	return desc;
		2586	}
		2587
		2588	// return a suitable string describing an object in enough detail to find it
		2589	const char *
		2590	object::debug_desc (char *info) const
		2591	{
		2592	char flagdesc[512];
		2593	char info2[256 * 4];
		2594	char *p = info;
		2595
		2596	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
		2597	count, uuid.seq,
		2598	&name,
		2599	title ? "\",title:" : "",
		2600	title ? (const char *)title : "",
		2601	flag_desc (flagdesc, 512), type);
		2602
		2603	if (env)
		2604	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2605
		2606	if (map)
		2607	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
		2608
		2609	return info;
		2610	}
		2611
		2612	const char *
		2613	object::debug_desc () const
		2614	{
		2615	static char info[256 * 4];
		2616	return debug_desc (info);
		2617	}
		2618
		2619	const char *
		2620	object::debug_desc2 () const
		2621	{
		2622	static char info[256 * 4];
		2623	return debug_desc (info);
		2624	}
		2625

Diff Legend

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