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.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.66 by root, Wed Dec 13 03:28:42 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.25 2006/09/11 01:16:20 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
22		16
23	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
28	*/	22	*/
29		23
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
32	variable. */	26	variable. */
33	#include <global.h>	27	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	28	#include <stdio.h>
36	# include <sys/types.h>	29	#include <sys/types.h>
37	# include <sys/uio.h>	30	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	31	#include <object.h>
40	#include <funcpoint.h>	32	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	33	#include <loader.h>
		34
43	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
44		38
45	object *objects; /* Pointer to the list of used objects */
46	object *active_objects; /* List of active objects that need to be processed */	39	object *active_objects; /* List of active objects that need to be processed */
47		40
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,	41	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	42	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	};	43	};
…		…
57	int freedir[SIZEOFFREE] = {	50	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,	51	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	52	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	};	53	};
61		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
		131
62	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
63	static int	133	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	135	{
66	key_value *wants_field;	136	key_value *wants_field;
…		…
113	*	183	*
114	* Note that this function appears a lot longer than the macro it	184	* Note that this function appears a lot longer than the macro it
115	* replaces - this is mostly for clarity - a decent compiler should hopefully	185	* replaces - this is mostly for clarity - a decent compiler should hopefully
116	* reduce this to the same efficiency.	186	* reduce this to the same efficiency.
117	*	187	*
118	* Check nrof variable *before* calling CAN_MERGE()	188	* Check nrof variable *before* calling can_merge()
119	*	189	*
120	* Improvements made with merge: Better checking on potion, and also	190	* Improvements made with merge: Better checking on potion, and also
121	* check weight	191	* check weight
122	*/	192	*/
123		193
124	bool object::can_merge (object *ob1, object *ob2)	194	bool object::can_merge_slow (object *ob1, object *ob2)
125	{	195	{
126	/* A couple quicksanity checks */	196	/* A couple quicksanity checks */
127	if ((ob1 == ob2) || (ob1->type != ob2->type))	197	if (ob1 == ob2
		198	|| ob1->type != ob2->type
		199	|| ob1->speed != ob2->speed
		200	|| ob1->value != ob2->value
		201	|| ob1->name != ob2->name)
128	return 0;	202	return 0;
129		203
130	if (ob1->speed != ob2->speed)	204	//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	205	/* 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	206	* value could not be stored in a sint32 (which unfortunately sometimes is
135	* used to store nrof).	207	* used to store nrof).
136	*/	208	*/
137	if (ob1->nrof + ob2->nrof >= 1UL << 31)	209	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
190	/* if one object has inventory but the other doesn't, not equiv */	262	/* if one object has inventory but the other doesn't, not equiv */
191	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	263	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
192	return 0;	264	return 0;
193		265
194	/* Now check to see if the two inventory objects could merge */	266	/* Now check to see if the two inventory objects could merge */
195	if (!CAN_MERGE (ob1->inv, ob2->inv))	267	if (!object::can_merge (ob1->inv, ob2->inv))
196	return 0;	268	return 0;
197		269
198	/* inventory ok - still need to check rest of this object to see	270	/* inventory ok - still need to check rest of this object to see
199	* if it is valid.	271	* if it is valid.
200	*/	272	*/
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	286	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	287	return 0;
216		288
217	switch (ob1->type)	289	switch (ob1->type)
218	{	290	{
219	case SCROLL:	291	case SCROLL:
220	if (ob1->level != ob2->level)	292	if (ob1->level != ob2->level)
221	return 0;	293	return 0;
222	break;	294	break;
223	}	295	}
224		296
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	297	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	298	{
227	/* At least one of these has key_values. */	299	/* At least one of these has key_values. */
…		…
249	/*	321	/*
250	* sum_weight() is a recursive function which calculates the weight	322	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	323	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	324	* containers are carrying, and sums it up.
253	*/	325	*/
254	signed long	326	long
255	sum_weight (object *op)	327	sum_weight (object *op)
256	{	328	{
257	signed long sum;	329	long sum;
258	object *inv;	330	object *inv;
259		331
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	332	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	333	{
262	if (inv->inv)	334	if (inv->inv)
263	sum_weight (inv);	335	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	336	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	337	}
		338
266	if (op->type == CONTAINER && op->stats.Str)	339	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	340	sum = (sum * (100 - op->stats.Str)) / 100;
		341
268	if (op->carrying != sum)	342	if (op->carrying != sum)
269	op->carrying = sum;	343	op->carrying = sum;
		344
270	return sum;	345	return sum;
271	}	346	}
272		347
273	/**	348	/**
274	* Return the outermost environment object for a given object.	349	* Return the outermost environment object for a given object.
…		…
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	376	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	377	* Some error messages.
303	* The result of the dump is stored in the static global errmsg array.	378	* The result of the dump is stored in the static global errmsg array.
304	*/	379	*/
305		380
306	void	381	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)	382	dump_object (object *op)
362	{	383	{
363	if (op == NULL)	384	if (!op)
364	{	385	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		386
372	void	387	object_freezer freezer;
373	dump_all_objects (void)	388	save_object (freezer, op, 3);
374	{	389	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	}	390	}
383		391
384	/*	392	/*
385	* get_nearest_part(multi-object, object 2) returns the part of the	393	* get_nearest_part(multi-object, object 2) returns the part of the
386	* multi-object 1 which is closest to the second object.	394	* multi-object 1 which is closest to the second object.
…		…
406	*/	414	*/
407		415
408	object *	416	object *
409	find_object (tag_t i)	417	find_object (tag_t i)
410	{	418	{
411	object *op;	419	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	420	if (op->count == i)
415	break;	421	return op;
		422
416	return op;	423	return 0;
417	}	424	}
418		425
419	/*	426	/*
420	* Returns the first object which has a name equal to the argument.	427	* Returns the first object which has a name equal to the argument.
421	* Used only by the patch command, but not all that useful.	428	* Used only by the patch command, but not all that useful.
…		…
423	*/	430	*/
424		431
425	object *	432	object *
426	find_object_name (const char *str)	433	find_object_name (const char *str)
427	{	434	{
428	const char *name = shstr::find (str);	435	shstr_cmp str_ (str);
429	object *op;	436	object *op;
430		437
431	for (op = objects; op != NULL; op = op->next)	438	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	439	if (op->name == str_)
433	break;	440	break;
434		441
435	return op;	442	return op;
436	}	443	}
437		444
…		…
440	{	447	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	448	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	449	}
443		450
444	/*	451	/*
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	452	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	453	* skill and experience objects.
485	*/	454	*/
486	void	455	void
487	set_owner (object *op, object *owner)	456	object::set_owner (object *owner)
488	{	457	{
489	if (owner == NULL || op == NULL)	458	if (!owner)
490	return;	459	return;
491		460
492	/* next line added to allow objects which own objects */	461	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	462	/* 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	463	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	464	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	465	* 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.	466	* didn't match, this check is valid and I believe that cause is valid.
498	*/	467	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	468	while (owner->owner)
500	owner = owner->owner;	469	owner = owner->owner;
501		470
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;	471	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object *op, object *clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	472	}
542		473
543	/* Zero the key_values on op, decrementing the shared-string	474	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	475	* refcounts and freeing the links.
545	*/	476	*/
…		…
561	{	492	{
562	attachable_base::clear ();	493	attachable_base::clear ();
563		494
564	free_key_values (this);	495	free_key_values (this);
565		496
566	clear_owner (this);	497	owner = 0;
567
568	name = 0;	498	name = 0;
569	name_pl = 0;	499	name_pl = 0;
570	title = 0;	500	title = 0;
571	race = 0;	501	race = 0;
572	slaying = 0;	502	slaying = 0;
573	skill = 0;	503	skill = 0;
574	msg = 0;	504	msg = 0;
575	lore = 0;	505	lore = 0;
576	custom_name = 0;	506	custom_name = 0;
577	materialname = 0;	507	materialname = 0;
		508	contr = 0;
		509	below = 0;
		510	above = 0;
		511	inv = 0;
		512	container = 0;
		513	env = 0;
		514	more = 0;
		515	head = 0;
		516	map = 0;
		517	active_next = 0;
		518	active_prev = 0;
578		519
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		521
581	SET_FLAG (this, FLAG_REMOVED);	522	SET_FLAG (this, FLAG_REMOVED);
582	}
583		523
584	void object::clone (object *destination)
585	{
586	*(object_copy *) destination = *this;
587	*(object_pod *) destination = *this;
588
589	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */	524	/* What is not cleared is next, prev, and count */
616		525
617	op->expmul = 1.0;	526	expmul = 1.0;
618	op->face = blank_face;	527	face = blank_face;
619	op->attacked_by_count = -1;
620		528
621	if (settings.casting_time)	529	if (settings.casting_time)
622	op->casting_time = -1;	530	casting_time = -1;
623	}	531	}
624		532
625	/*	533	/*
626	* copy object first frees everything allocated by the second object,	534	* copy_to first frees everything allocated by the dst object,
627	* and then copies the contends of the first object into the second	535	* and then copies the contents of itself into the second
628	* object, allocating what needs to be allocated. Basically, any	536	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	537	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
630	* if the first object is freed, the pointers in the new object	538	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	539	* will point at garbage.
632	*/	540	*/
633
634	void	541	void
635	copy_object (object *op2, object *op)	542	object::copy_to (object *dst)
636	{	543	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	544	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	545	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
639		546
640	op2->clone (op);	547	*(object_copy *)dst = *this;
		548	*(object_pod *)dst = *this;
		549
		550	if (self || cb)
		551	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
641		552
642	if (is_freed)	553	if (is_freed)
643	SET_FLAG (op, FLAG_FREED);	554	SET_FLAG (dst, FLAG_FREED);
		555
644	if (is_removed)	556	if (is_removed)
645	SET_FLAG (op, FLAG_REMOVED);	557	SET_FLAG (dst, FLAG_REMOVED);
646		558
647	if (op2->speed < 0)	559	if (speed < 0)
648	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	560	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
649		561
650	/* Copy over key_values, if any. */	562	/* Copy over key_values, if any. */
651	if (op2->key_values)	563	if (key_values)
652	{	564	{
653	key_value *tail = 0;	565	key_value *tail = 0;
654	key_value *i;	566	key_value *i;
655		567
656	op->key_values = 0;	568	dst->key_values = 0;
657		569
658	for (i = op2->key_values; i; i = i->next)	570	for (i = key_values; i; i = i->next)
659	{	571	{
660	key_value *new_link = new key_value;	572	key_value *new_link = new key_value;
661		573
662	new_link->next = 0;	574	new_link->next = 0;
663	new_link->key = i->key;	575	new_link->key = i->key;
664	new_link->value = i->value;	576	new_link->value = i->value;
665		577
666	/* Try and be clever here, too. */	578	/* Try and be clever here, too. */
667	if (!op->key_values)	579	if (!dst->key_values)
668	{	580	{
669	op->key_values = new_link;	581	dst->key_values = new_link;
670	tail = new_link;	582	tail = new_link;
671	}	583	}
672	else	584	else
673	{	585	{
674	tail->next = new_link;	586	tail->next = new_link;
675	tail = new_link;	587	tail = new_link;
676	}	588	}
677	}	589	}
678	}	590	}
679		591
680	update_ob_speed (op);	592	update_ob_speed (dst);
		593	}
		594
		595	object *
		596	object::clone ()
		597	{
		598	object *neu = create ();
		599	copy_to (neu);
		600	return neu;
681	}	601	}
682		602
683	/*	603	/*
684	* If an object with the IS_TURNABLE() flag needs to be turned due	604	* If an object with the IS_TURNABLE() flag needs to be turned due
685	* to the closest player being on the other side, this function can	605	* to the closest player being on the other side, this function can
…		…
698	/*	618	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	619	* Updates the speed of an object. If the speed changes from 0 to another
700	* value, or vice versa, then add/remove the object from the active list.	620	* value, or vice versa, then add/remove the object from the active list.
701	* This function needs to be called whenever the speed of an object changes.	621	* This function needs to be called whenever the speed of an object changes.
702	*/	622	*/
703
704	void	623	void
705	update_ob_speed (object *op)	624	update_ob_speed (object *op)
706	{	625	{
707	extern int arch_init;	626	extern int arch_init;
708		627
…		…
717	abort ();	636	abort ();
718	#else	637	#else
719	op->speed = 0;	638	op->speed = 0;
720	#endif	639	#endif
721	}	640	}
		641
722	if (arch_init)	642	if (arch_init)
723	{
724	return;	643	return;
725	}	644
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	645	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	646	{
728	/* If already on active list, don't do anything */	647	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	648	if (op->active_next || op->active_prev || op == active_objects)
730	return;	649	return;
731		650
732	/* process_events() expects us to insert the object at the beginning	651	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	652	* of the list. */
734	op->active_next = active_objects;	653	op->active_next = active_objects;
		654
735	if (op->active_next != NULL)	655	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	656	op->active_next->active_prev = op;
		657
737	active_objects = op;	658	active_objects = op;
738	}	659	}
739	else	660	else
740	{	661	{
741	/* If not on the active list, nothing needs to be done */	662	/* If not on the active list, nothing needs to be done */
…		…
743	return;	664	return;
744		665
745	if (op->active_prev == NULL)	666	if (op->active_prev == NULL)
746	{	667	{
747	active_objects = op->active_next;	668	active_objects = op->active_next;
		669
748	if (op->active_next != NULL)	670	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	671	op->active_next->active_prev = NULL;
750	}	672	}
751	else	673	else
752	{	674	{
753	op->active_prev->active_next = op->active_next;	675	op->active_prev->active_next = op->active_next;
		676
754	if (op->active_next)	677	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	678	op->active_next->active_prev = op->active_prev;
756	}	679	}
		680
757	op->active_next = NULL;	681	op->active_next = NULL;
758	op->active_prev = NULL;	682	op->active_prev = NULL;
759	}	683	}
760	}	684	}
761		685
…		…
886	update_now = 1;	810	update_now = 1;
887		811
888	if ((move_slow | op->move_slow) != move_slow)	812	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;	813	update_now = 1;
890	}	814	}
		815
891	/* if the object is being removed, we can't make intelligent	816	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	817	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	818	* that is being removed.
894	*/	819	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	820	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	821	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	822	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	823	/* Nothing to do for that case */ ;
902	}
903	else	824	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	825	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		826
908	if (update_now)	827	if (update_now)
909	{	828	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	829	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	830	update_position (op->map, op->x, op->y);
…		…
913		832
914	if (op->more != NULL)	833	if (op->more != NULL)
915	update_object (op->more, action);	834	update_object (op->more, action);
916	}	835	}
917		836
918	static unordered_vector<object *> mortals;	837	object::vector object::mortals;
919	static std::vector<object *> freed;	838	object::vector object::objects; // not yet used
		839	object *object::first;
920		840
921	void object::free_mortals ()	841	void object::free_mortals ()
922	{	842	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	843	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	844	if ((*i)->refcnt)
		845	++i; // further delay freeing
		846	else
925	{	847	{
926	freed.push_back (*i);	848	delete *i;
927	mortals.erase (i);	849	mortals.erase (i);
928	}	850	}
929	else
930	++i;
931	}	851	}
932		852
933	object::object ()	853	object::object ()
934	{	854	{
935	SET_FLAG (this, FLAG_REMOVED);	855	SET_FLAG (this, FLAG_REMOVED);
936		856
937	expmul = 1.0;	857	expmul = 1.0;
938	face = blank_face;	858	face = blank_face;
939	attacked_by_count = -1;
940	}	859	}
941		860
942	object::~object ()	861	object::~object ()
943	{	862	{
944	free_key_values (this);	863	free_key_values (this);
945	}	864	}
946		865
947	void object::link ()	866	void object::link ()
948	{	867	{
949	count = ++ob_count;	868	count = ++ob_count;
		869	uuid = gen_uuid ();
950		870
951	prev = 0;	871	prev = 0;
952	next = objects;	872	next = object::first;
953		873
954	if (objects)	874	if (object::first)
955	objects->prev = this;	875	object::first->prev = this;
956		876
957	objects = this;	877	object::first = this;
958	}	878	}
959		879
960	void object::unlink ()	880	void object::unlink ()
961	{	881	{
962	count = 0;	882	if (this == object::first)
		883	object::first = next;
963		884
964	/* Remove this object from the list of used objects */	885	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	886	if (prev) prev->next = next;
		887	if (next) next->prev = prev;
		888
968	prev = 0;	889	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	890	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	891	}
980		892
981	object *object::create ()	893	object *object::create ()
982	{	894	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	895	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	896	op->link ();
996	return op;	897	return op;
997	}	898	}
998		899
999	/*	900	/*
…		…
1001	* it from the list of used objects, and puts it on the list of	902	* it from the list of used objects, and puts it on the list of
1002	* free objects. The IS_FREED() flag is set in the object.	903	* free objects. The IS_FREED() flag is set in the object.
1003	* The object must have been removed by remove_ob() first for	904	* The object must have been removed by remove_ob() first for
1004	* this function to succeed.	905	* this function to succeed.
1005	*	906	*
1006	* If free_inventory is set, free inventory as well. Else drop items in	907	* If destroy_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	908	* inventory to the ground.
1008	*/	909	*/
1009	void object::free (bool free_inventory)	910	void object::destroy (bool destroy_inventory)
1010	{	911	{
		912	if (QUERY_FLAG (this, FLAG_FREED))
		913	return;
		914
		915	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		916	remove_friendly_object (this);
		917
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	918	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	919	remove ();
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		920
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	921	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		922
1033	if (more)	923	if (more)
1034	{	924	{
1035	more->free (free_inventory);	925	more->destroy (destroy_inventory);
1036	more = 0;	926	more = 0;
1037	}	927	}
1038		928
1039	if (inv)	929	if (inv)
1040	{	930	{
1041	/* Only if the space blocks everything do we not process -	931	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	932	* if some form of movement is allowed, let objects
1043	* drop on that space.	933	* drop on that space.
1044	*/	934	*/
1045	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	935	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046	{	936	{
1047	object *	937	object *op = inv;
1048	op = inv;
1049		938
1050	while (op)	939	while (op)
1051	{	940	{
1052	object *
1053	tmp = op->below;	941	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	942	op->destroy (destroy_inventory);
1057	op = tmp;	943	op = tmp;
1058	}	944	}
1059	}	945	}
1060	else	946	else
1061	{ /* Put objects in inventory onto this space */	947	{ /* Put objects in inventory onto this space */
1062	object *	948	object *op = inv;
1063	op = inv;
1064		949
1065	while (op)	950	while (op)
1066	{	951	{
1067	object *
1068	tmp = op->below;	952	object *tmp = op->below;
1069		953
1070	remove_ob (op);	954	op->remove ();
1071		955
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	956	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	957	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1074	free_object (op);	958	op->destroy ();
1075	else	959	else
1076	{	960	{
1077	op->x = x;	961	op->x = x;
1078	op->y = y;	962	op->y = y;
1079	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	963	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1082	op = tmp;	966	op = tmp;
1083	}	967	}
1084	}	968	}
1085	}	969	}
1086		970
1087	clear_owner (this);	971	// hack to ensure that freed objects still have a valid map
		972	{
		973	static maptile *freed_map; // freed objects are moved here to avoid crashes
		974
		975	if (!freed_map)
		976	{
		977	freed_map = new maptile;
		978
		979	freed_map->name = "/internal/freed_objects_map";
		980	freed_map->width = 3;
		981	freed_map->height = 3;
		982
		983	freed_map->allocate ();
		984	}
		985
		986	map = freed_map;
		987	x = 1;
		988	y = 1;
		989	}
		990
		991	// clear those pointers that likely might have circular references to us
		992	owner = 0;
		993	enemy = 0;
		994	attacked_by = 0;
		995
		996	// only relevant for players(?), but make sure of it anyways
		997	contr = 0;
1088		998
1089	/* Remove object from the active list */	999	/* Remove object from the active list */
1090	speed = 0;	1000	speed = 0;
1091	update_ob_speed (this);	1001	update_ob_speed (this);
1092		1002
1093	unlink ();	1003	unlink ();
1094		1004
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	1005	mortals.push_back (this);
1098	}	1006	}
1099		1007
1100	/*	1008	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	1009	* sub_weight() recursively (outwards) subtracts a number from the
1102	* weight of an object (and what is carried by it's environment(s)).	1010	* weight of an object (and what is carried by it's environment(s)).
1103	*/	1011	*/
1104
1105	void	1012	void
1106	sub_weight (object *op, signed long weight)	1013	sub_weight (object *op, signed long weight)
1107	{	1014	{
1108	while (op != NULL)	1015	while (op != NULL)
1109	{	1016	{
1110	if (op->type == CONTAINER)	1017	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1018	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1019
1114	op->carrying -= weight;	1020	op->carrying -= weight;
1115	op = op->env;	1021	op = op->env;
1116	}	1022	}
1117	}	1023	}
1118		1024
1119	/* remove_ob(op):	1025	/* op->remove ():
1120	* This function removes the object op from the linked list of objects	1026	* This function removes the object op from the linked list of objects
1121	* which it is currently tied to. When this function is done, the	1027	* which it is currently tied to. When this function is done, the
1122	* object will have no environment. If the object previously had an	1028	* object will have no environment. If the object previously had an
1123	* environment, the x and y coordinates will be updated to	1029	* environment, the x and y coordinates will be updated to
1124	* the previous environment.	1030	* the previous environment.
1125	* Beware: This function is called from the editor as well!	1031	* Beware: This function is called from the editor as well!
1126	*/	1032	*/
1127
1128	void	1033	void
1129	remove_ob (object *op)	1034	object::remove ()
1130	{	1035	{
		1036	object *tmp, *last = 0;
1131	object *	1037	object *otmp;
1132	tmp, *	1038
1133	last = NULL;
1134	object *
1135	otmp;
1136	tag_t
1137	tag;
1138	int
1139	check_walk_off;	1039	int check_walk_off;
1140	mapstruct *
1141	m;
1142	sint16
1143	x,
1144	y;
1145		1040
1146
1147	if (QUERY_FLAG (op, FLAG_REMOVED))	1041	if (QUERY_FLAG (this, FLAG_REMOVED))
1148	{	1042	return;
1149	dump_object (op);
1150	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151		1043
1152	/* Changed it to always dump core in this case. As has been learned
1153	* in the past, trying to recover from errors almost always
1154	* make things worse, and this is a real error here - something
1155	* that should not happen.
1156	* Yes, if this was a mission critical app, trying to do something
1157	* to recover may make sense, but that is because failure of the app
1158	* may have other disastrous problems. Cf runs out of a script
1159	* so is easily enough restarted without any real problems.
1160	* MSW 2001-07-01
1161	*/
1162	abort ();
1163	}
1164	if (op->more != NULL)
1165	remove_ob (op->more);
1166
1167	SET_FLAG (op, FLAG_REMOVED);	1044	SET_FLAG (this, FLAG_REMOVED);
		1045
		1046	if (more)
		1047	more->remove ();
1168		1048
1169	/*	1049	/*
1170	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
1171	* inventory.	1051	* inventory.
1172	*/	1052	*/
1173	if (op->env != NULL)	1053	if (env)
1174	{	1054	{
1175	if (op->nrof)	1055	if (nrof)
1176	sub_weight (op->env, op->weight * op->nrof);	1056	sub_weight (env, weight * nrof);
1177	else	1057	else
1178	sub_weight (op->env, op->weight + op->carrying);	1058	sub_weight (env, weight + carrying);
1179		1059
1180	/* NO_FIX_PLAYER is set when a great many changes are being	1060	/* NO_FIX_PLAYER is set when a great many changes are being
1181	* made to players inventory. If set, avoiding the call	1061	* made to players inventory. If set, avoiding the call
1182	* to save cpu time.	1062	* to save cpu time.
1183	*/	1063	*/
1184	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1064	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1185	fix_player (otmp);	1065	fix_player (otmp);
1186		1066
1187	if (op->above != NULL)	1067	if (above != NULL)
1188	op->above->below = op->below;	1068	above->below = below;
1189	else	1069	else
1190	op->env->inv = op->below;	1070	env->inv = below;
1191		1071
1192	if (op->below != NULL)	1072	if (below != NULL)
1193	op->below->above = op->above;	1073	below->above = above;
1194		1074
1195	/* we set up values so that it could be inserted into	1075	/* we set up values so that it could be inserted into
1196	* the map, but we don't actually do that - it is up	1076	* the map, but we don't actually do that - it is up
1197	* to the caller to decide what we want to do.	1077	* to the caller to decide what we want to do.
1198	*/	1078	*/
1199	op->x = op->env->x, op->y = op->env->y;	1079	x = env->x, y = env->y;
1200	op->map = op->env->map;	1080	map = env->map;
1201	op->above = NULL, op->below = NULL;	1081	above = 0, below = 0;
1202	op->env = NULL;	1082	env = 0;
1203	return;
1204	}
1205
1206	/* If we get here, we are removing it from a map */
1207	if (op->map == NULL)
1208	return;
1209
1210	x = op->x;
1211	y = op->y;
1212	m = get_map_from_coord (op->map, &x, &y);
1213
1214	if (!m)
1215	{	1083	}
1216	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1084	else if (map)
1217	op->map->path, op->x, op->y);	1085	{
1218	/* in old days, we used to set x and y to 0 and continue.	1086	/* Re did the following section of code - it looks like it had
1219	* it seems if we get into this case, something is probablye	1087	* lots of logic for things we no longer care about
1220	* screwed up and should be fixed.
1221	*/	1088	*/
1222	abort ();
1223	}
1224	if (op->map != m)
1225	{
1226	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227	op->map->path, m->path, op->x, op->y, x, y);
1228	}
1229		1089
1230	/* Re did the following section of code - it looks like it had
1231	* lots of logic for things we no longer care about
1232	*/
1233
1234	/* link the object above us */	1090	/* link the object above us */
1235	if (op->above)	1091	if (above)
1236	op->above->below = op->below;	1092	above->below = below;
1237	else	1093	else
1238	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1094	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1239		1095
1240	/* Relink the object below us, if there is one */	1096	/* Relink the object below us, if there is one */
1241	if (op->below)	1097	if (below)
1242	{
1243	op->below->above = op->above;	1098	below->above = above;
1244	}
1245	else	1099	else
1246	{	1100	{
1247	/* Nothing below, which means we need to relink map object for this space	1101	/* Nothing below, which means we need to relink map object for this space
1248	* use translated coordinates in case some oddness with map tiling is	1102	* use translated coordinates in case some oddness with map tiling is
1249	* evident	1103	* evident
1250	*/
1251	if (GET_MAP_OB (m, x, y) != op)
1252	{
1253	dump_object (op);
1254	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",
1255	errmsg);
1256	dump_object (GET_MAP_OB (m, x, y));
1257	LOG (llevError, "%s\n", errmsg);
1258	}
1259	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260	}
1261	op->above = NULL;
1262	op->below = NULL;
1263
1264	if (op->map->in_memory == MAP_SAVING)
1265	return;
1266
1267	tag = op->count;
1268	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1269	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1270	{
1271	/* No point updating the players look faces if he is the object
1272	* being removed.
1273	*/
1274
1275	if (tmp->type == PLAYER && tmp != op)
1276	{
1277	/* If a container that the player is currently using somehow gets
1278	* removed (most likely destroyed), update the player view
1279	* appropriately.
1280	*/	1104	*/
1281	if (tmp->container == op)	1105	if (GET_MAP_OB (map, x, y) != this)
1282	{	1106	{
1283	CLEAR_FLAG (op, FLAG_APPLIED);	1107	char *dump = dump_object (this);
1284	tmp->container = NULL;	1108	LOG (llevError,
		1109	"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);
		1110	free (dump);
		1111	dump = dump_object (GET_MAP_OB (map, x, y));
		1112	LOG (llevError, "%s\n", dump);
		1113	free (dump);
1285	}	1114	}
1286	tmp->contr->socket.update_look = 1;	1115
1287	}	1116	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1288	/* See if player moving off should effect something */
1289	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290	{	1117	}
1291		1118
1292	move_apply (tmp, op, NULL);	1119	above = 0;
1293	if (was_destroyed (op, tag))	1120	below = 0;
		1121
		1122	if (map->in_memory == MAP_SAVING)
		1123	return;
		1124
		1125	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1126
		1127	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1128	{
		1129	/* No point updating the players look faces if he is the object
		1130	* being removed.
		1131	*/
		1132
		1133	if (tmp->type == PLAYER && tmp != this)
1294	{	1134	{
1295	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1135	/* If a container that the player is currently using somehow gets
		1136	* removed (most likely destroyed), update the player view
		1137	* appropriately.
		1138	*/
		1139	if (tmp->container == this)
		1140	{
		1141	CLEAR_FLAG (this, FLAG_APPLIED);
		1142	tmp->container = 0;
		1143	}
		1144
		1145	tmp->contr->socket.update_look = 1;
1296	}	1146	}
		1147
		1148	/* See if player moving off should effect something */
		1149	if (check_walk_off
		1150	&& ((move_type & tmp->move_off)
		1151	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1152	{
		1153	move_apply (tmp, this, 0);
		1154
		1155	if (destroyed ())
		1156	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1297	}	1157	}
1298		1158
1299	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1159	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300		1160
1301	if (tmp->above == tmp)	1161	if (tmp->above == tmp)
1302	tmp->above = NULL;	1162	tmp->above = 0;
		1163
1303	last = tmp;	1164	last = tmp;
1304	}	1165	}
		1166
1305	/* last == NULL of there are no objects on this space */	1167	/* last == NULL of there are no objects on this space */
1306	if (last == NULL)	1168	if (!last)
1307	{	1169	{
1308	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1170	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1171	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1310	* those out anyways, and if there are any flags set right now, they won't	1172	* those out anyways, and if there are any flags set right now, they won't
1311	* be correct anyways.	1173	* be correct anyways.
1312	*/	1174	*/
1313	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1175	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1314	update_position (op->map, op->x, op->y);	1176	update_position (map, x, y);
1315	}	1177	}
1316	else	1178	else
1317	update_object (last, UP_OBJ_REMOVE);	1179	update_object (last, UP_OBJ_REMOVE);
1318		1180
1319	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1181	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1320	update_all_los (op->map, op->x, op->y);	1182	update_all_los (map, x, y);
1321		1183	}
1322	}	1184	}
1323		1185
1324	/*	1186	/*
1325	* merge_ob(op,top):	1187	* merge_ob(op,top):
1326	*	1188	*
1327	* This function goes through all objects below and including top, and	1189	* This function goes through all objects below and including top, and
1328	* merges op to the first matching object.	1190	* merges op to the first matching object.
1329	* If top is NULL, it is calculated.	1191	* If top is NULL, it is calculated.
1330	* Returns pointer to object if it succeded in the merge, otherwise NULL	1192	* Returns pointer to object if it succeded in the merge, otherwise NULL
1331	*/	1193	*/
1332
1333	object *	1194	object *
1334	merge_ob (object *op, object *top)	1195	merge_ob (object *op, object *top)
1335	{	1196	{
1336	if (!op->nrof)	1197	if (!op->nrof)
1337	return 0;	1198	return 0;
		1199
1338	if (top == NULL)	1200	if (top == NULL)
1339	for (top = op; top != NULL && top->above != NULL; top = top->above);	1201	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1202
1340	for (; top != NULL; top = top->below)	1203	for (; top != NULL; top = top->below)
1341	{	1204	{
1342	if (top == op)	1205	if (top == op)
1343	continue;	1206	continue;
1344	if (CAN_MERGE (op, top))	1207
		1208	if (object::can_merge (op, top))
1345	{	1209	{
1346	top->nrof += op->nrof;	1210	top->nrof += op->nrof;
1347		1211
1348	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1212	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1349	op->weight = 0; /* Don't want any adjustements now */	1213	op->weight = 0; /* Don't want any adjustements now */
1350	remove_ob (op);	1214	op->destroy ();
1351	free_object (op);
1352	return top;	1215	return top;
1353	}	1216	}
1354	}	1217	}
		1218
1355	return NULL;	1219	return 0;
1356	}	1220	}
1357		1221
1358	/*	1222	/*
1359	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1223	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1360	* job preparing multi-part monsters	1224	* job preparing multi-part monsters
1361	*/	1225	*/
1362	object *	1226	object *
1363	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1227	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1364	{	1228	{
1365	object *	1229	object *tmp;
1366	tmp;
1367		1230
1368	if (op->head)	1231	if (op->head)
1369	op = op->head;	1232	op = op->head;
		1233
1370	for (tmp = op; tmp; tmp = tmp->more)	1234	for (tmp = op; tmp; tmp = tmp->more)
1371	{	1235	{
1372	tmp->x = x + tmp->arch->clone.x;	1236	tmp->x = x + tmp->arch->clone.x;
1373	tmp->y = y + tmp->arch->clone.y;	1237	tmp->y = y + tmp->arch->clone.y;
1374	}	1238	}
		1239
1375	return insert_ob_in_map (op, m, originator, flag);	1240	return insert_ob_in_map (op, m, originator, flag);
1376	}	1241	}
1377		1242
1378	/*	1243	/*
1379	* insert_ob_in_map (op, map, originator, flag):	1244	* insert_ob_in_map (op, map, originator, flag):
…		…
1395	* NULL if 'op' was destroyed	1260	* NULL if 'op' was destroyed
1396	* just 'op' otherwise	1261	* just 'op' otherwise
1397	*/	1262	*/
1398		1263
1399	object *	1264	object *
1400	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1265	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1401	{	1266	{
1402	object *tmp, *top, *floor = NULL;	1267	object *tmp, *top, *floor = NULL;
1403	sint16 x, y;	1268	sint16 x, y;
1404		1269
1405	if (QUERY_FLAG (op, FLAG_FREED))	1270	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1408	return NULL;	1273	return NULL;
1409	}	1274	}
1410		1275
1411	if (m == NULL)	1276	if (m == NULL)
1412	{	1277	{
1413	dump_object (op);	1278	char *dump = dump_object (op);
1414	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1279	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1280	free (dump);
1415	return op;	1281	return op;
1416	}	1282	}
1417		1283
1418	if (out_of_map (m, op->x, op->y))	1284	if (out_of_map (m, op->x, op->y))
1419	{	1285	{
1420	dump_object (op);	1286	char *dump = dump_object (op);
1421	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1287	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1422	#ifdef MANY_CORES	1288	#ifdef MANY_CORES
1423	/* Better to catch this here, as otherwise the next use of this object	1289	/* Better to catch this here, as otherwise the next use of this object
1424	* is likely to cause a crash. Better to find out where it is getting	1290	* is likely to cause a crash. Better to find out where it is getting
1425	* improperly inserted.	1291	* improperly inserted.
1426	*/	1292	*/
1427	abort ();	1293	abort ();
1428	#endif	1294	#endif
		1295	free (dump);
1429	return op;	1296	return op;
1430	}	1297	}
1431		1298
1432	if (!QUERY_FLAG (op, FLAG_REMOVED))	1299	if (!QUERY_FLAG (op, FLAG_REMOVED))
1433	{	1300	{
1434	dump_object (op);	1301	char *dump = dump_object (op);
1435	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1302	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1303	free (dump);
1436	return op;	1304	return op;
1437	}	1305	}
1438		1306
1439	if (op->more != NULL)	1307	if (op->more != NULL)
1440	{	1308	{
1441	/* The part may be on a different map. */	1309	/* The part may be on a different map. */
1442		1310
1443	object *
1444	more = op->more;	1311	object *more = op->more;
1445		1312
1446	/* We really need the caller to normalize coordinates - if	1313	/* We really need the caller to normalize coordinates - if
1447	* we set the map, that doesn't work if the location is within	1314	* we set the map, that doesn't work if the location is within
1448	* a map and this is straddling an edge. So only if coordinate	1315	* a map and this is straddling an edge. So only if coordinate
1449	* is clear wrong do we normalize it.	1316	* is clear wrong do we normalize it.
1450	*/	1317	*/
1451	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1318	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452	{
1453	more->map = get_map_from_coord (m, &more->x, &more->y);	1319	more->map = get_map_from_coord (m, &more->x, &more->y);
1454	}
1455	else if (!more->map)	1320	else if (!more->map)
1456	{	1321	{
1457	/* For backwards compatibility - when not dealing with tiled maps,	1322	/* For backwards compatibility - when not dealing with tiled maps,
1458	* more->map should always point to the parent.	1323	* more->map should always point to the parent.
1459	*/	1324	*/
…		…
1462		1327
1463	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1328	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464	{	1329	{
1465	if (!op->head)	1330	if (!op->head)
1466	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1331	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1332
1467	return NULL;	1333	return NULL;
1468	}	1334	}
1469	}	1335	}
1470		1336
1471	CLEAR_FLAG (op, FLAG_REMOVED);	1337	CLEAR_FLAG (op, FLAG_REMOVED);
…		…
1480		1346
1481	/* this has to be done after we translate the coordinates.	1347	/* this has to be done after we translate the coordinates.
1482	*/	1348	*/
1483	if (op->nrof && !(flag & INS_NO_MERGE))	1349	if (op->nrof && !(flag & INS_NO_MERGE))
1484	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1350	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1485	if (CAN_MERGE (op, tmp))	1351	if (object::can_merge (op, tmp))
1486	{	1352	{
1487	op->nrof += tmp->nrof;	1353	op->nrof += tmp->nrof;
1488	remove_ob (tmp);	1354	tmp->destroy ();
1489	free_object (tmp);
1490	}	1355	}
1491		1356
1492	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1357	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1493	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1358	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1494		1359
…		…
1536		1401
1537	while (top != NULL)	1402	while (top != NULL)
1538	{	1403	{
1539	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1404	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540	floor = top;	1405	floor = top;
		1406
1541	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1407	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542	{	1408	{
1543	/* We insert above top, so we want this object below this */	1409	/* We insert above top, so we want this object below this */
1544	top = top->below;	1410	top = top->below;
1545	break;	1411	break;
1546	}	1412	}
		1413
1547	last = top;	1414	last = top;
1548	top = top->above;	1415	top = top->above;
1549	}	1416	}
		1417
1550	/* Don't want top to be NULL, so set it to the last valid object */	1418	/* Don't want top to be NULL, so set it to the last valid object */
1551	top = last;	1419	top = last;
1552		1420
1553	/* We let update_position deal with figuring out what the space	1421	/* We let update_position deal with figuring out what the space
1554	* looks like instead of lots of conditions here.	1422	* looks like instead of lots of conditions here.
…		…
1633	* of effect may be sufficient.	1501	* of effect may be sufficient.
1634	*/	1502	*/
1635	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1503	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636	update_all_los (op->map, op->x, op->y);	1504	update_all_los (op->map, op->x, op->y);
1637		1505
1638
1639	/* updates flags (blocked, alive, no magic, etc) for this map space */	1506	/* updates flags (blocked, alive, no magic, etc) for this map space */
1640	update_object (op, UP_OBJ_INSERT);	1507	update_object (op, UP_OBJ_INSERT);
1641
1642		1508
1643	/* Don't know if moving this to the end will break anything. However,	1509	/* Don't know if moving this to the end will break anything. However,
1644	* we want to have update_look set above before calling this.	1510	* we want to have update_look set above before calling this.
1645	*	1511	*
1646	* check_move_on() must be after this because code called from	1512	* check_move_on() must be after this because code called from
…		…
1671	* op is the object to insert it under: supplies x and the map.	1537	* op is the object to insert it under: supplies x and the map.
1672	*/	1538	*/
1673	void	1539	void
1674	replace_insert_ob_in_map (const char *arch_string, object *op)	1540	replace_insert_ob_in_map (const char *arch_string, object *op)
1675	{	1541	{
1676	object *tmp;	1542	object *
		1543	tmp;
1677	object *tmp1;	1544	object *
		1545	tmp1;
1678		1546
1679	/* first search for itself and remove any old instances */	1547	/* first search for itself and remove any old instances */
1680		1548
1681	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1549	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1682	{
1683	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1550	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1684	{	1551	tmp->destroy ();
1685	remove_ob (tmp);
1686	free_object (tmp);
1687	}
1688	}
1689		1552
1690	tmp1 = arch_to_object (find_archetype (arch_string));	1553	tmp1 = arch_to_object (archetype::find (arch_string));
1691		1554
1692	tmp1->x = op->x;	1555	tmp1->x = op->x;
1693	tmp1->y = op->y;	1556	tmp1->y = op->y;
1694	insert_ob_in_map (tmp1, op->map, op, 0);	1557	insert_ob_in_map (tmp1, op->map, op, 0);
1695	}	1558	}
…		…
1703	*/	1566	*/
1704		1567
1705	object *	1568	object *
1706	get_split_ob (object *orig_ob, uint32 nr)	1569	get_split_ob (object *orig_ob, uint32 nr)
1707	{	1570	{
1708	object *	1571	object *newob;
1709	newob;
1710	int
1711	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1572	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1712		1573
1713	if (orig_ob->nrof < nr)	1574	if (orig_ob->nrof < nr)
1714	{	1575	{
1715	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1576	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1716	return NULL;	1577	return NULL;
1717	}	1578	}
		1579
1718	newob = object_create_clone (orig_ob);	1580	newob = object_create_clone (orig_ob);
		1581
1719	if ((orig_ob->nrof -= nr) < 1)	1582	if ((orig_ob->nrof -= nr) < 1)
1720	{	1583	orig_ob->destroy (1);
1721	if (!is_removed)
1722	remove_ob (orig_ob);
1723	free_object2 (orig_ob, 1);
1724	}
1725	else if (!is_removed)	1584	else if (!is_removed)
1726	{	1585	{
1727	if (orig_ob->env != NULL)	1586	if (orig_ob->env != NULL)
1728	sub_weight (orig_ob->env, orig_ob->weight * nr);	1587	sub_weight (orig_ob->env, orig_ob->weight * nr);
1729	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1588	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1731	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1590	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1591	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733	return NULL;	1592	return NULL;
1734	}	1593	}
1735	}	1594	}
		1595
1736	newob->nrof = nr;	1596	newob->nrof = nr;
1737		1597
1738	return newob;	1598	return newob;
1739	}	1599	}
1740		1600
…		…
1747	*/	1607	*/
1748		1608
1749	object *	1609	object *
1750	decrease_ob_nr (object *op, uint32 i)	1610	decrease_ob_nr (object *op, uint32 i)
1751	{	1611	{
1752	object *	1612	object *tmp;
1753	tmp;
1754	player *	1613	player *pl;
1755	pl;
1756		1614
1757	if (i == 0) /* objects with op->nrof require this check */	1615	if (i == 0) /* objects with op->nrof require this check */
1758	return op;	1616	return op;
1759		1617
1760	if (i > op->nrof)	1618	if (i > op->nrof)
1761	i = op->nrof;	1619	i = op->nrof;
1762		1620
1763	if (QUERY_FLAG (op, FLAG_REMOVED))	1621	if (QUERY_FLAG (op, FLAG_REMOVED))
1764	{
1765	op->nrof -= i;	1622	op->nrof -= i;
1766	}
1767	else if (op->env != NULL)	1623	else if (op->env != NULL)
1768	{	1624	{
1769	/* is this object in the players inventory, or sub container	1625	/* is this object in the players inventory, or sub container
1770	* therein?	1626	* therein?
1771	*/	1627	*/
…		…
1796	esrv_send_item (tmp, op);	1652	esrv_send_item (tmp, op);
1797	}	1653	}
1798	}	1654	}
1799	else	1655	else
1800	{	1656	{
1801	remove_ob (op);	1657	op->remove ();
1802	op->nrof = 0;	1658	op->nrof = 0;
1803	if (tmp)	1659	if (tmp)
1804	{	1660	{
1805	esrv_del_item (tmp->contr, op->count);	1661	esrv_del_item (tmp->contr, op->count);
1806	}	1662	}
1807	}	1663	}
1808	}	1664	}
1809	else	1665	else
1810	{	1666	{
1811	object *
1812	above = op->above;	1667	object *above = op->above;
1813		1668
1814	if (i < op->nrof)	1669	if (i < op->nrof)
1815	{
1816	op->nrof -= i;	1670	op->nrof -= i;
1817	}
1818	else	1671	else
1819	{	1672	{
1820	remove_ob (op);	1673	op->remove ();
1821	op->nrof = 0;	1674	op->nrof = 0;
1822	}	1675	}
		1676
1823	/* Since we just removed op, op->above is null */	1677	/* Since we just removed op, op->above is null */
1824	for (tmp = above; tmp != NULL; tmp = tmp->above)	1678	for (tmp = above; tmp != NULL; tmp = tmp->above)
1825	if (tmp->type == PLAYER)	1679	if (tmp->type == PLAYER)
1826	{	1680	{
1827	if (op->nrof)	1681	if (op->nrof)
…		…
1830	esrv_del_item (tmp->contr, op->count);	1684	esrv_del_item (tmp->contr, op->count);
1831	}	1685	}
1832	}	1686	}
1833		1687
1834	if (op->nrof)	1688	if (op->nrof)
1835	{
1836	return op;	1689	return op;
1837	}
1838	else	1690	else
1839	{	1691	{
1840	free_object (op);	1692	op->destroy ();
1841	return NULL;	1693	return NULL;
1842	}	1694	}
1843	}	1695	}
1844		1696
1845	/*	1697	/*
…		…
1851	add_weight (object *op, signed long weight)	1703	add_weight (object *op, signed long weight)
1852	{	1704	{
1853	while (op != NULL)	1705	while (op != NULL)
1854	{	1706	{
1855	if (op->type == CONTAINER)	1707	if (op->type == CONTAINER)
1856	{
1857	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1708	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858	}	1709
1859	op->carrying += weight;	1710	op->carrying += weight;
1860	op = op->env;	1711	op = op->env;
1861	}	1712	}
1862	}	1713	}
1863		1714
		1715	object *
		1716	insert_ob_in_ob (object *op, object *where)
		1717	{
		1718	if (!where)
		1719	{
		1720	char *dump = dump_object (op);
		1721	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1722	free (dump);
		1723	return op;
		1724	}
		1725
		1726	if (where->head)
		1727	{
		1728	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1729	where = where->head;
		1730	}
		1731
		1732	return where->insert (op);
		1733	}
		1734
1864	/*	1735	/*
1865	* insert_ob_in_ob(op,environment):	1736	* env->insert (op)
1866	* This function inserts the object op in the linked list	1737	* This function inserts the object op in the linked list
1867	* inside the object environment.	1738	* inside the object environment.
1868	*	1739	*
1869	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1870	* the inventory at the last position or next to other objects of the same
1871	* type.
1872	* Frank: Now sorted by type, archetype and magic!
1873	*
1874	* The function returns now pointer to inserted item, and return value can	1740	* The function returns now pointer to inserted item, and return value can
1875	* be != op, if items are merged. -Tero	1741	* be != op, if items are merged. -Tero
1876	*/	1742	*/
1877		1743
1878	object *	1744	object *
1879	insert_ob_in_ob (object *op, object *where)	1745	object::insert (object *op)
1880	{	1746	{
1881	object *	1747	object *tmp, *otmp;
1882	tmp, *
1883	otmp;
1884		1748
1885	if (!QUERY_FLAG (op, FLAG_REMOVED))	1749	if (!QUERY_FLAG (op, FLAG_REMOVED))
1886	{	1750	op->remove ();
1887	dump_object (op);	1751
1888	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1889	return op;
1890	}
1891	if (where == NULL)
1892	{
1893	dump_object (op);
1894	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1895	return op;
1896	}
1897	if (where->head)
1898	{
1899	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900	where = where->head;
1901	}
1902	if (op->more)	1752	if (op->more)
1903	{	1753	{
1904	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1754	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905	return op;	1755	return op;
1906	}	1756	}
		1757
1907	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1758	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1759	CLEAR_FLAG (op, FLAG_REMOVED);
1909	if (op->nrof)	1760	if (op->nrof)
1910	{	1761	{
1911	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1762	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1912	if (CAN_MERGE (tmp, op))	1763	if (object::can_merge (tmp, op))
1913	{	1764	{
1914	/* return the original object and remove inserted object	1765	/* return the original object and remove inserted object
1915	(client needs the original object) */	1766	(client needs the original object) */
1916	tmp->nrof += op->nrof;	1767	tmp->nrof += op->nrof;
1917	/* Weight handling gets pretty funky. Since we are adding to	1768	/* Weight handling gets pretty funky. Since we are adding to
1918	* tmp->nrof, we need to increase the weight.	1769	* tmp->nrof, we need to increase the weight.
1919	*/	1770	*/
1920	add_weight (where, op->weight * op->nrof);	1771	add_weight (this, op->weight * op->nrof);
1921	SET_FLAG (op, FLAG_REMOVED);	1772	SET_FLAG (op, FLAG_REMOVED);
1922	free_object (op); /* free the inserted object */	1773	op->destroy (); /* free the inserted object */
1923	op = tmp;	1774	op = tmp;
1924	remove_ob (op); /* and fix old object's links */	1775	op->remove (); /* and fix old object's links */
1925	CLEAR_FLAG (op, FLAG_REMOVED);	1776	CLEAR_FLAG (op, FLAG_REMOVED);
1926	break;	1777	break;
1927	}	1778	}
1928		1779
1929	/* I assume combined objects have no inventory	1780	/* I assume combined objects have no inventory
1930	* We add the weight - this object could have just been removed	1781	* We add the weight - this object could have just been removed
1931	* (if it was possible to merge). calling remove_ob will subtract	1782	* (if it was possible to merge). calling remove_ob will subtract
1932	* the weight, so we need to add it in again, since we actually do	1783	* the weight, so we need to add it in again, since we actually do
1933	* the linking below	1784	* the linking below
1934	*/	1785	*/
1935	add_weight (where, op->weight * op->nrof);	1786	add_weight (this, op->weight * op->nrof);
1936	}	1787	}
1937	else	1788	else
1938	add_weight (where, (op->weight + op->carrying));	1789	add_weight (this, (op->weight + op->carrying));
1939		1790
1940	otmp = is_player_inv (where);	1791	otmp = is_player_inv (this);
1941	if (otmp && otmp->contr != NULL)	1792	if (otmp && otmp->contr)
1942	{
1943	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1793	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1944	fix_player (otmp);	1794	fix_player (otmp);
1945	}
1946		1795
1947	op->map = NULL;	1796	op->map = NULL;
1948	op->env = where;	1797	op->env = this;
1949	op->above = NULL;	1798	op->above = NULL;
1950	op->below = NULL;	1799	op->below = NULL;
1951	op->x = 0, op->y = 0;	1800	op->x = 0, op->y = 0;
1952		1801
1953	/* reset the light list and los of the players on the map */	1802	/* reset the light list and los of the players on the map */
1954	if ((op->glow_radius != 0) && where->map)	1803	if ((op->glow_radius != 0) && map)
1955	{	1804	{
1956	#ifdef DEBUG_LIGHTS	1805	#ifdef DEBUG_LIGHTS
1957	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1806	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1958	#endif /* DEBUG_LIGHTS */	1807	#endif /* DEBUG_LIGHTS */
1959	if (MAP_DARKNESS (where->map))	1808	if (MAP_DARKNESS (map))
1960	update_all_los (where->map, where->x, where->y);	1809	update_all_los (map, x, y);
1961	}	1810	}
1962		1811
1963	/* Client has no idea of ordering so lets not bother ordering it here.	1812	/* Client has no idea of ordering so lets not bother ordering it here.
1964	* It sure simplifies this function...	1813	* It sure simplifies this function...
1965	*/	1814	*/
1966	if (where->inv == NULL)	1815	if (!inv)
1967	where->inv = op;	1816	inv = op;
1968	else	1817	else
1969	{	1818	{
1970	op->below = where->inv;	1819	op->below = inv;
1971	op->below->above = op;	1820	op->below->above = op;
1972	where->inv = op;	1821	inv = op;
1973	}	1822	}
		1823
1974	return op;	1824	return op;
1975	}	1825	}
1976		1826
1977	/*	1827	/*
1978	* Checks if any objects has a move_type that matches objects	1828	* Checks if any objects has a move_type that matches objects
…		…
1996	*/	1846	*/
1997		1847
1998	int	1848	int
1999	check_move_on (object *op, object *originator)	1849	check_move_on (object *op, object *originator)
2000	{	1850	{
2001	object *	1851	object *tmp;
2002	tmp;	1852	maptile *m = op->map;
2003	tag_t
2004	tag;
2005	mapstruct *
2006	m = op->map;
2007	int
2008	x = op->x, y = op->y;	1853	int x = op->x, y = op->y;
2009	MoveType	1854
2010	move_on,	1855	MoveType move_on, move_slow, move_block;
2011	move_slow,
2012	move_block;
2013		1856
2014	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1857	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2015	return 0;	1858	return 0;
2016
2017	tag = op->count;
2018		1859
2019	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1860	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2020	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1861	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2021	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1862	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2022		1863
…		…
2047	* we don't need to check all of them.	1888	* we don't need to check all of them.
2048	*/	1889	*/
2049	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1890	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050	break;	1891	break;
2051	}	1892	}
		1893
2052	for (; tmp != NULL; tmp = tmp->below)	1894	for (; tmp; tmp = tmp->below)
2053	{	1895	{
2054	if (tmp == op)	1896	if (tmp == op)
2055	continue; /* Can't apply yourself */	1897	continue; /* Can't apply yourself */
2056		1898
2057	/* Check to see if one of the movement types should be slowed down.	1899	/* Check to see if one of the movement types should be slowed down.
…		…
2065	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1907	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2066	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1908	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067	{	1909	{
2068		1910
2069	float	1911	float
2070	diff;
2071
2072	diff = tmp->move_slow_penalty * FABS (op->speed);	1912	diff = tmp->move_slow_penalty * FABS (op->speed);
		1913
2073	if (op->type == PLAYER)	1914	if (op->type == PLAYER)
2074	{
2075	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1915	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2076	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1916	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077	{
2078	diff /= 4.0;	1917	diff /= 4.0;
2079	}	1918
2080	}
2081	op->speed_left -= diff;	1919	op->speed_left -= diff;
2082	}	1920	}
2083	}	1921	}
2084		1922
2085	/* Basically same logic as above, except now for actual apply. */	1923	/* Basically same logic as above, except now for actual apply. */
2086	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1924	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2087	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1925	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088	{	1926	{
2089
2090	move_apply (tmp, op, originator);	1927	move_apply (tmp, op, originator);
		1928
2091	if (was_destroyed (op, tag))	1929	if (op->destroyed ())
2092	return 1;	1930	return 1;
2093		1931
2094	/* what the person/creature stepped onto has moved the object	1932	/* what the person/creature stepped onto has moved the object
2095	* someplace new. Don't process any further - if we did,	1933	* someplace new. Don't process any further - if we did,
2096	* have a feeling strange problems would result.	1934	* have a feeling strange problems would result.
2097	*/	1935	*/
2098	if (op->map != m || op->x != x || op->y != y)	1936	if (op->map != m || op->x != x || op->y != y)
2099	return 0;	1937	return 0;
2100	}	1938	}
2101	}	1939	}
		1940
2102	return 0;	1941	return 0;
2103	}	1942	}
2104		1943
2105	/*	1944	/*
2106	* present_arch(arch, map, x, y) searches for any objects with	1945	* present_arch(arch, map, x, y) searches for any objects with
2107	* a matching archetype at the given map and coordinates.	1946	* a matching archetype at the given map and coordinates.
2108	* The first matching object is returned, or NULL if none.	1947	* The first matching object is returned, or NULL if none.
2109	*/	1948	*/
2110		1949
2111	object *	1950	object *
2112	present_arch (const archetype *at, mapstruct *m, int x, int y)	1951	present_arch (const archetype *at, maptile *m, int x, int y)
2113	{	1952	{
2114	object *	1953	object *
2115	tmp;	1954	tmp;
2116		1955
2117	if (m == NULL || out_of_map (m, x, y))	1956	if (m == NULL || out_of_map (m, x, y))
…		…
2130	* a matching type variable at the given map and coordinates.	1969	* a matching type variable at the given map and coordinates.
2131	* The first matching object is returned, or NULL if none.	1970	* The first matching object is returned, or NULL if none.
2132	*/	1971	*/
2133		1972
2134	object *	1973	object *
2135	present (unsigned char type, mapstruct *m, int x, int y)	1974	present (unsigned char type, maptile *m, int x, int y)
2136	{	1975	{
2137	object *	1976	object *
2138	tmp;	1977	tmp;
2139		1978
2140	if (out_of_map (m, x, y))	1979	if (out_of_map (m, x, y))
…		…
2280	* the archetype because that isn't correct if the monster has been	2119	* the archetype because that isn't correct if the monster has been
2281	* customized, changed states, etc.	2120	* customized, changed states, etc.
2282	*/	2121	*/
2283		2122
2284	int	2123	int
2285	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2124	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2286	{	2125	{
2287	int	2126	int
2288	i,	2127	i,
2289	index = 0, flag;	2128	index = 0, flag;
2290	static int	2129	static int
…		…
2311	return -1;	2150	return -1;
2312	return altern[RANDOM () % index];	2151	return altern[RANDOM () % index];
2313	}	2152	}
2314		2153
2315	/*	2154	/*
2316	* find_first_free_spot(archetype, mapstruct, x, y) works like	2155	* find_first_free_spot(archetype, maptile, x, y) works like
2317	* find_free_spot(), but it will search max number of squares.	2156	* find_free_spot(), but it will search max number of squares.
2318	* But it will return the first available spot, not a random choice.	2157	* But it will return the first available spot, not a random choice.
2319	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2158	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2320	*/	2159	*/
2321		2160
2322	int	2161	int
2323	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2162	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2324	{	2163	{
2325	int	2164	int
2326	i;	2165	i;
2327		2166
2328	for (i = 0; i < SIZEOFFREE; i++)	2167	for (i = 0; i < SIZEOFFREE; i++)
…		…
2392	* because we have to know what movement the thing looking to move	2231	* because we have to know what movement the thing looking to move
2393	* there is capable of.	2232	* there is capable of.
2394	*/	2233	*/
2395		2234
2396	int	2235	int
2397	find_dir (mapstruct *m, int x, int y, object *exclude)	2236	find_dir (maptile *m, int x, int y, object *exclude)
2398	{	2237	{
2399	int	2238	int
2400	i,	2239	i,
2401	max = SIZEOFFREE, mflags;	2240	max = SIZEOFFREE, mflags;
2402	sint16	2241
2403	nx,	2242	sint16 nx, ny;
2404	ny;
2405	object *	2243	object *
2406	tmp;	2244	tmp;
2407	mapstruct *	2245	maptile *
2408	mp;	2246	mp;
2409	MoveType	2247
2410	blocked,	2248	MoveType blocked, move_type;
2411	move_type;
2412		2249
2413	if (exclude && exclude->head)	2250	if (exclude && exclude->head)
2414	{	2251	{
2415	exclude = exclude->head;	2252	exclude = exclude->head;
2416	move_type = exclude->move_type;	2253	move_type = exclude->move_type;
…		…
2621	* Modified to be map tile aware -.MSW	2458	* Modified to be map tile aware -.MSW
2622	*/	2459	*/
2623		2460
2624		2461
2625	int	2462	int
2626	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2463	can_see_monsterP (maptile *m, int x, int y, int dir)
2627	{	2464	{
2628	sint16	2465	sint16 dx, dy;
2629	dx,
2630	dy;
2631	int	2466	int
2632	mflags;	2467	mflags;
2633		2468
2634	if (dir < 0)	2469	if (dir < 0)
2635	return 0; /* exit condition: invalid direction */	2470	return 0; /* exit condition: invalid direction */
…		…
2682	* create clone from object to another	2517	* create clone from object to another
2683	*/	2518	*/
2684	object *	2519	object *
2685	object_create_clone (object *asrc)	2520	object_create_clone (object *asrc)
2686	{	2521	{
2687	object *
2688	dst = NULL, *tmp, *src, *part, *prev, *item;	2522	object *dst = 0, *tmp, *src, *part, *prev, *item;
2689		2523
2690	if (!asrc)	2524	if (!asrc)
2691	return NULL;	2525	return 0;
		2526
2692	src = asrc;	2527	src = asrc;
2693	if (src->head)	2528	if (src->head)
2694	src = src->head;	2529	src = src->head;
2695		2530
2696	prev = NULL;	2531	prev = 0;
2697	for (part = src; part; part = part->more)	2532	for (part = src; part; part = part->more)
2698	{	2533	{
2699	tmp = get_object ();	2534	tmp = part->clone ();
2700	copy_object (part, tmp);
2701	tmp->x -= src->x;	2535	tmp->x -= src->x;
2702	tmp->y -= src->y;	2536	tmp->y -= src->y;
		2537
2703	if (!part->head)	2538	if (!part->head)
2704	{	2539	{
2705	dst = tmp;	2540	dst = tmp;
2706	tmp->head = NULL;	2541	tmp->head = 0;
2707	}	2542	}
2708	else	2543	else
2709	{	2544	{
2710	tmp->head = dst;	2545	tmp->head = dst;
2711	}	2546	}
		2547
2712	tmp->more = NULL;	2548	tmp->more = 0;
		2549
2713	if (prev)	2550	if (prev)
2714	prev->more = tmp;	2551	prev->more = tmp;
		2552
2715	prev = tmp;	2553	prev = tmp;
2716	}	2554	}
2717		2555
2718	/*** copy inventory ***/
2719	for (item = src->inv; item; item = item->below)	2556	for (item = src->inv; item; item = item->below)
2720	{
2721	(void) insert_ob_in_ob (object_create_clone (item), dst);	2557	insert_ob_in_ob (object_create_clone (item), dst);
2722	}
2723		2558
2724	return dst;	2559	return dst;
2725	}	2560	}
2726		2561
2727	/* return true if the object was destroyed, 0 otherwise */
2728	int
2729	was_destroyed (const object *op, tag_t old_tag)
2730	{
2731	/* checking for FLAG_FREED isn't necessary, but makes this function more
2732	* robust */
2733	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2734	}
2735
2736	/* GROS - Creates an object using a string representing its content. */	2562	/* GROS - Creates an object using a string representing its content. */
2737
2738	/* Basically, we save the content of the string to a temp file, then call */	2563	/* Basically, we save the content of the string to a temp file, then call */
2739
2740	/* load_object on it. I admit it is a highly inefficient way to make things, */	2564	/* load_object on it. I admit it is a highly inefficient way to make things, */
2741
2742	/* but it was simple to make and allows reusing the load_object function. */	2565	/* but it was simple to make and allows reusing the load_object function. */
2743
2744	/* Remember not to use load_object_str in a time-critical situation. */	2566	/* Remember not to use load_object_str in a time-critical situation. */
2745
2746	/* Also remember that multiparts objects are not supported for now. */	2567	/* Also remember that multiparts objects are not supported for now. */
2747		2568
2748	object *	2569	object *
2749	load_object_str (const char *obstr)	2570	load_object_str (const char *obstr)
2750	{	2571	{
2751	object *	2572	object *op;
2752	op;
2753	char
2754	filename[MAX_BUF];	2573	char filename[MAX_BUF];
2755		2574
2756	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2575	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2757		2576
2758	FILE *
2759	tempfile = fopen (filename, "w");	2577	FILE *tempfile = fopen (filename, "w");
2760		2578
2761	if (tempfile == NULL)	2579	if (tempfile == NULL)
2762	{	2580	{
2763	LOG (llevError, "Error - Unable to access load object temp file\n");	2581	LOG (llevError, "Error - Unable to access load object temp file\n");
2764	return NULL;	2582	return NULL;
2765	};	2583	}
		2584
2766	fprintf (tempfile, obstr);	2585	fprintf (tempfile, obstr);
2767	fclose (tempfile);	2586	fclose (tempfile);
2768		2587
2769	op = get_object ();	2588	op = object::create ();
2770		2589
2771	object_thawer	2590	object_thawer thawer (filename);
2772	thawer (filename);
2773		2591
2774	if (thawer)	2592	if (thawer)
2775	load_object (thawer, op, 0);	2593	load_object (thawer, op, 0);
2776		2594
2777	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2595	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2785	* returns NULL if no match.	2603	* returns NULL if no match.
2786	*/	2604	*/
2787	object *	2605	object *
2788	find_obj_by_type_subtype (const object *who, int type, int subtype)	2606	find_obj_by_type_subtype (const object *who, int type, int subtype)
2789	{	2607	{
2790	object *	2608	object *tmp;
2791	tmp;
2792		2609
2793	for (tmp = who->inv; tmp; tmp = tmp->below)	2610	for (tmp = who->inv; tmp; tmp = tmp->below)
2794	if (tmp->type == type && tmp->subtype == subtype)	2611	if (tmp->type == type && tmp->subtype == subtype)
2795	return tmp;	2612	return tmp;
2796		2613
…		…
2804	* do the desired thing.	2621	* do the desired thing.
2805	*/	2622	*/
2806	key_value *	2623	key_value *
2807	get_ob_key_link (const object *ob, const char *key)	2624	get_ob_key_link (const object *ob, const char *key)
2808	{	2625	{
2809	key_value *	2626	key_value *link;
2810	link;
2811		2627
2812	for (link = ob->key_values; link != NULL; link = link->next)	2628	for (link = ob->key_values; link != NULL; link = link->next)
2813	{
2814	if (link->key == key)	2629	if (link->key == key)
2815	{
2816	return link;	2630	return link;
2817	}
2818	}
2819		2631
2820	return NULL;	2632	return NULL;
2821	}	2633	}
2822		2634
2823	/*	2635	/*
…		…
2828	* The returned string is shared.	2640	* The returned string is shared.
2829	*/	2641	*/
2830	const char *	2642	const char *
2831	get_ob_key_value (const object *op, const char *const key)	2643	get_ob_key_value (const object *op, const char *const key)
2832	{	2644	{
2833	key_value *	2645	key_value *link;
2834	link;	2646	shstr_cmp canonical_key (key);
2835	const char *
2836	canonical_key;
2837		2647
2838	canonical_key = shstr::find (key);
2839
2840	if (canonical_key == NULL)	2648	if (!canonical_key)
2841	{	2649	{
2842	/* 1. There being a field named key on any object	2650	/* 1. There being a field named key on any object
2843	* implies there'd be a shared string to find.	2651	* implies there'd be a shared string to find.
2844	* 2. Since there isn't, no object has this field.	2652	* 2. Since there isn't, no object has this field.
2845	* 3. Therefore, *this* object doesn't have this field.	2653	* 3. Therefore, *this* object doesn't have this field.
2846	*/	2654	*/
2847	return NULL;	2655	return 0;
2848	}	2656	}
2849		2657
2850	/* This is copied from get_ob_key_link() above -	2658	/* This is copied from get_ob_key_link() above -
2851	* only 4 lines, and saves the function call overhead.	2659	* only 4 lines, and saves the function call overhead.
2852	*/	2660	*/
2853	for (link = op->key_values; link != NULL; link = link->next)	2661	for (link = op->key_values; link; link = link->next)
2854	{
2855	if (link->key == canonical_key)	2662	if (link->key == canonical_key)
2856	{
2857	return link->value;	2663	return link->value;
2858	}	2664
2859	}
2860	return NULL;	2665	return 0;
2861	}	2666	}
2862		2667
2863		2668
2864	/*	2669	/*
2865	* Updates the canonical_key in op to value.	2670	* Updates the canonical_key in op to value.
…		…
2901	if (last)	2706	if (last)
2902	last->next = field->next;	2707	last->next = field->next;
2903	else	2708	else
2904	op->key_values = field->next;	2709	op->key_values = field->next;
2905		2710
2906	delete
2907	field;	2711	delete field;
2908	}	2712	}
2909	}	2713	}
2910	return TRUE;	2714	return TRUE;
2911	}	2715	}
2912	/* IF we get here, key doesn't exist */	2716	/* IF we get here, key doesn't exist */
…		…
2947	* Returns TRUE on success.	2751	* Returns TRUE on success.
2948	*/	2752	*/
2949	int	2753	int
2950	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2754	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2951	{	2755	{
2952	shstr
2953	key_ (key);	2756	shstr key_ (key);
2954		2757
2955	return set_ob_key_value_s (op, key_, value, add_key);	2758	return set_ob_key_value_s (op, key_, value, add_key);
2956	}	2759	}
		2760
		2761	object::depth_iterator::depth_iterator (object *container)
		2762	: iterator_base (container)
		2763	{
		2764	while (item->inv)
		2765	item = item->inv;
		2766	}
		2767
		2768	void
		2769	object::depth_iterator::next ()
		2770	{
		2771	if (item->below)
		2772	{
		2773	item = item->below;
		2774
		2775	while (item->inv)
		2776	item = item->inv;
		2777	}
		2778	else
		2779	item = item->env;
		2780	}
		2781
		2782	// return a suitable string describing an objetc in enough detail to find it
		2783	const char *
		2784	object::debug_desc (char *info) const
		2785	{
		2786	char info2[256 * 3];
		2787	char *p = info;
		2788
		2789	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2790	count,
		2791	&name,
		2792	title ? " " : "",
		2793	title ? (const char *)title : "");
		2794
		2795	if (env)
		2796	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2797
		2798	if (map)
		2799	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2800
		2801	return info;
		2802	}
		2803
		2804	const char *
		2805	object::debug_desc () const
		2806	{
		2807	static char info[256 * 3];
		2808	return debug_desc (info);
		2809	}
		2810

Diff Legend

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