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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.65 by root, Wed Dec 13 00:42:03 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	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
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	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>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <skills.h>
35	#include <loader.h>	33	#include <loader.h>
36		34
37	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
38		38
39	object *objects; /* Pointer to the list of used objects */
40	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 */
41		40
42	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,
43	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
44	};	43	};
…		…
50	};	49	};
51	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
52	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,
53	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
54	};	53	};
		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	}
55		131
56	/* 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. */
57	static int	133	static int
58	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
59	{	135	{
…		…
255	{	331	{
256	if (inv->inv)	332	if (inv->inv)
257	sum_weight (inv);	333	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	335	}
		336
260	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
262	if (op->carrying != sum)	340	if (op->carrying != sum)
263	op->carrying = sum;	341	op->carrying = sum;
		342
264	return sum;	343	return sum;
265	}	344	}
266		345
267	/**	346	/**
268	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	375	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	376	* The result of the dump is stored in the static global errmsg array.
298	*/	377	*/
299		378
300	void	379	char *
301	dump_object2 (object *op)
302	{
303	errmsg[0] = 0;
304	return;
305	//TODO//D#d#
306	#if 0
307	char *cp;
308
309	/* object *tmp;*/
310
311	if (op->arch != NULL)
312	{
313	strcat (errmsg, "arch ");
314	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315	strcat (errmsg, "\n");
316	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317	strcat (errmsg, cp);
318	# if 0
319	/* Don't dump player diffs - they are too long, mostly meaningless, and
320	* will overflow the buffer.
321	* Changed so that we don't dump inventory either. This may
322	* also overflow the buffer.
323	*/
324	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325	strcat (errmsg, cp);
326	for (tmp = op->inv; tmp; tmp = tmp->below)
327	dump_object2 (tmp);
328	# endif
329	strcat (errmsg, "end\n");
330	}
331	else
332	{
333	strcat (errmsg, "Object ");
334	if (op->name == NULL)
335	strcat (errmsg, "(null)");
336	else
337	strcat (errmsg, op->name);
338	strcat (errmsg, "\n");
339	# if 0
340	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341	strcat (errmsg, cp);
342	for (tmp = op->inv; tmp; tmp = tmp->below)
343	dump_object2 (tmp);
344	# endif
345	strcat (errmsg, "end\n");
346	}
347	#endif
348	}
349
350	/*
351	* Dumps an object. Returns output in the static global errmsg array.
352	*/
353
354	void
355	dump_object (object *op)	380	dump_object (object *op)
356	{	381	{
357	if (op == NULL)	382	if (!op)
358	{	383	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		384
366	void	385	object_freezer freezer;
367	dump_all_objects (void)	386	save_object (freezer, op, 3);
368	{	387	return freezer.as_string ();
369	object *op;
370
371	for (op = objects; op != NULL; op = op->next)
372	{
373	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375	}
376	}	388	}
377		389
378	/*	390	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	391	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
400	*/	412	*/
401		413
402	object *	414	object *
403	find_object (tag_t i)	415	find_object (tag_t i)
404	{	416	{
405	object *op;	417	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	418	if (op->count == i)
409	break;	419	return op;
		420
410	return op;	421	return 0;
411	}	422	}
412		423
413	/*	424	/*
414	* Returns the first object which has a name equal to the argument.	425	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
417	*/	428	*/
418		429
419	object *	430	object *
420	find_object_name (const char *str)	431	find_object_name (const char *str)
421	{	432	{
422	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
423	object *op;	434	object *op;
424		435
425	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	437	if (op->name == str_)
427	break;	438	break;
428		439
429	return op;	440	return op;
430	}	441	}
431		442
…		…
434	{	445	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}	447	}
437		448
438	/*	449	/*
439	* Returns the object which this object marks as being the owner.
440	* A id-scheme is used to avoid pointing to objects which have been
441	* freed and are now reused. If this is detected, the owner is
442	* set to NULL, and NULL is returned.
443	* Changed 2004-02-12 - if the player is setting at the play again
444	* prompt, he is removed, and we don't want to treat him as an owner of
445	* anything, so check removed flag. I don't expect that this should break
446	* anything - once an object is removed, it is basically dead anyways.
447	*/
448
449	object *
450	get_owner (object *op)
451	{
452	if (op->owner == NULL)
453	return NULL;
454
455	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
456	return op->owner;
457
458	op->owner = NULL;
459	op->ownercount = 0;
460	return NULL;
461	}
462
463	void
464	clear_owner (object *op)
465	{
466	if (!op)
467	return;
468
469	if (op->owner && op->ownercount == op->owner->count)
470	op->owner->refcount--;
471
472	op->owner = NULL;
473	op->ownercount = 0;
474	}
475
476	/*
477	* Sets the owner and sets the skill and exp pointers to owner's current	450	* Sets the owner and sets the skill and exp pointers to owner's current
478	* skill and experience objects.	451	* skill and experience objects.
479	*/	452	*/
480	void	453	void
481	set_owner (object *op, object *owner)	454	object::set_owner (object *owner)
482	{	455	{
483	if (owner == NULL || op == NULL)	456	if (!owner)
484	return;	457	return;
485		458
486	/* next line added to allow objects which own objects */	459	/* next line added to allow objects which own objects */
487	/* Add a check for ownercounts in here, as I got into an endless loop	460	/* Add a check for ownercounts in here, as I got into an endless loop
488	* with the fireball owning a poison cloud which then owned the	461	* with the fireball owning a poison cloud which then owned the
489	* fireball. I believe that was caused by one of the objects getting	462	* fireball. I believe that was caused by one of the objects getting
490	* freed and then another object replacing it. Since the ownercounts	463	* freed and then another object replacing it. Since the ownercounts
491	* didn't match, this check is valid and I believe that cause is valid.	464	* didn't match, this check is valid and I believe that cause is valid.
492	*/	465	*/
493	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	466	while (owner->owner)
494	owner = owner->owner;	467	owner = owner->owner;
495		468
496	/* IF the owner still has an owner, we did not resolve to a final owner.
497	* so lets not add to that.
498	*/
499	if (owner->owner)
500	return;
501
502	op->owner = owner;	469	this->owner = owner;
503
504	op->ownercount = owner->count;
505	owner->refcount++;
506	}
507
508	/* Set the owner to clone's current owner and set the skill and experience
509	* objects to clone's objects (typically those objects that where the owner's
510	* current skill and experience objects at the time when clone's owner was
511	* set - not the owner's current skill and experience objects).
512	*
513	* Use this function if player created an object (e.g. fire bullet, swarm
514	* spell), and this object creates further objects whose kills should be
515	* accounted for the player's original skill, even if player has changed
516	* skills meanwhile.
517	*/
518	void
519	copy_owner (object *op, object *clone)
520	{
521	object *owner = get_owner (clone);
522
523	if (owner == NULL)
524	{
525	/* players don't have owners - they own themselves. Update
526	* as appropriate.
527	*/
528	if (clone->type == PLAYER)
529	owner = clone;
530	else
531	return;
532	}
533
534	set_owner (op, owner);
535	}	470	}
536		471
537	/* Zero the key_values on op, decrementing the shared-string	472	/* Zero the key_values on op, decrementing the shared-string
538	* refcounts and freeing the links.	473	* refcounts and freeing the links.
539	*/	474	*/
…		…
555	{	490	{
556	attachable_base::clear ();	491	attachable_base::clear ();
557		492
558	free_key_values (this);	493	free_key_values (this);
559		494
560	clear_owner (this);	495	owner = 0;
561
562	name = 0;	496	name = 0;
563	name_pl = 0;	497	name_pl = 0;
564	title = 0;	498	title = 0;
565	race = 0;	499	race = 0;
566	slaying = 0;	500	slaying = 0;
567	skill = 0;	501	skill = 0;
568	msg = 0;	502	msg = 0;
569	lore = 0;	503	lore = 0;
570	custom_name = 0;	504	custom_name = 0;
571	materialname = 0;	505	materialname = 0;
		506	contr = 0;
		507	below = 0;
		508	above = 0;
		509	inv = 0;
		510	container = 0;
		511	env = 0;
		512	more = 0;
		513	head = 0;
		514	map = 0;
		515	active_next = 0;
		516	active_prev = 0;
572		517
573	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
574		519
575	SET_FLAG (this, FLAG_REMOVED);	520	SET_FLAG (this, FLAG_REMOVED);
576	}
577		521
578	void object::clone (object *destination)
579	{
580	*(object_copy *) destination = *this;
581	*(object_pod *) destination = *this;
582
583	if (self || cb)
584	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
585	}
586
587	/*
588	* clear_object() frees everything allocated by an object, and also
589	* clears all variables and flags to default settings.
590	*/
591
592	void
593	clear_object (object *op)
594	{
595	op->clear ();
596
597	op->contr = NULL;
598	op->below = NULL;
599	op->above = NULL;
600	op->inv = NULL;
601	op->container = NULL;
602	op->env = NULL;
603	op->more = NULL;
604	op->head = NULL;
605	op->map = NULL;
606	op->refcount = 0;
607	op->active_next = NULL;
608	op->active_prev = NULL;
609	/* What is not cleared is next, prev, and count */	522	/* What is not cleared is next, prev, and count */
610		523
611	op->expmul = 1.0;	524	expmul = 1.0;
612	op->face = blank_face;	525	face = blank_face;
613	op->attacked_by_count = -1;
614		526
615	if (settings.casting_time)	527	if (settings.casting_time)
616	op->casting_time = -1;	528	casting_time = -1;
617	}	529	}
618		530
619	/*	531	/*
620	* copy object first frees everything allocated by the second object,	532	* copy_to first frees everything allocated by the dst object,
621	* and then copies the contends of the first object into the second	533	* and then copies the contents of itself into the second
622	* object, allocating what needs to be allocated. Basically, any	534	* object, allocating what needs to be allocated. Basically, any
623	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	535	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
624	* if the first object is freed, the pointers in the new object	536	* if the first object is freed, the pointers in the new object
625	* will point at garbage.	537	* will point at garbage.
626	*/	538	*/
627
628	void	539	void
629	copy_object (object *op2, object *op)	540	object::copy_to (object *dst)
630	{	541	{
631	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
632	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
633		544
634	op2->clone (op);	545	*(object_copy *)dst = *this;
		546	*(object_pod *)dst = *this;
		547
		548	if (self || cb)
		549	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
635		550
636	if (is_freed)	551	if (is_freed)
637	SET_FLAG (op, FLAG_FREED);	552	SET_FLAG (dst, FLAG_FREED);
		553
638	if (is_removed)	554	if (is_removed)
639	SET_FLAG (op, FLAG_REMOVED);	555	SET_FLAG (dst, FLAG_REMOVED);
640		556
641	if (op2->speed < 0)	557	if (speed < 0)
642	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	558	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
643		559
644	/* Copy over key_values, if any. */	560	/* Copy over key_values, if any. */
645	if (op2->key_values)	561	if (key_values)
646	{	562	{
647	key_value *tail = 0;	563	key_value *tail = 0;
648	key_value *i;	564	key_value *i;
649		565
650	op->key_values = 0;	566	dst->key_values = 0;
651		567
652	for (i = op2->key_values; i; i = i->next)	568	for (i = key_values; i; i = i->next)
653	{	569	{
654	key_value *new_link = new key_value;	570	key_value *new_link = new key_value;
655		571
656	new_link->next = 0;	572	new_link->next = 0;
657	new_link->key = i->key;	573	new_link->key = i->key;
658	new_link->value = i->value;	574	new_link->value = i->value;
659		575
660	/* Try and be clever here, too. */	576	/* Try and be clever here, too. */
661	if (!op->key_values)	577	if (!dst->key_values)
662	{	578	{
663	op->key_values = new_link;	579	dst->key_values = new_link;
664	tail = new_link;	580	tail = new_link;
665	}	581	}
666	else	582	else
667	{	583	{
668	tail->next = new_link;	584	tail->next = new_link;
669	tail = new_link;	585	tail = new_link;
670	}	586	}
671	}	587	}
672	}	588	}
673		589
674	update_ob_speed (op);	590	update_ob_speed (dst);
		591	}
		592
		593	object *
		594	object::clone ()
		595	{
		596	object *neu = create ();
		597	copy_to (neu);
		598	return neu;
675	}	599	}
676		600
677	/*	601	/*
678	* If an object with the IS_TURNABLE() flag needs to be turned due	602	* If an object with the IS_TURNABLE() flag needs to be turned due
679	* to the closest player being on the other side, this function can	603	* to the closest player being on the other side, this function can
…		…
692	/*	616	/*
693	* Updates the speed of an object. If the speed changes from 0 to another	617	* Updates the speed of an object. If the speed changes from 0 to another
694	* value, or vice versa, then add/remove the object from the active list.	618	* value, or vice versa, then add/remove the object from the active list.
695	* This function needs to be called whenever the speed of an object changes.	619	* This function needs to be called whenever the speed of an object changes.
696	*/	620	*/
697
698	void	621	void
699	update_ob_speed (object *op)	622	update_ob_speed (object *op)
700	{	623	{
701	extern int arch_init;	624	extern int arch_init;
702		625
…		…
711	abort ();	634	abort ();
712	#else	635	#else
713	op->speed = 0;	636	op->speed = 0;
714	#endif	637	#endif
715	}	638	}
		639
716	if (arch_init)	640	if (arch_init)
717	{
718	return;	641	return;
719	}	642
720	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	643	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721	{	644	{
722	/* If already on active list, don't do anything */	645	/* If already on active list, don't do anything */
723	if (op->active_next || op->active_prev || op == active_objects)	646	if (op->active_next || op->active_prev || op == active_objects)
724	return;	647	return;
725		648
726	/* process_events() expects us to insert the object at the beginning	649	/* process_events() expects us to insert the object at the beginning
727	* of the list. */	650	* of the list. */
728	op->active_next = active_objects;	651	op->active_next = active_objects;
		652
729	if (op->active_next != NULL)	653	if (op->active_next != NULL)
730	op->active_next->active_prev = op;	654	op->active_next->active_prev = op;
		655
731	active_objects = op;	656	active_objects = op;
732	}	657	}
733	else	658	else
734	{	659	{
735	/* If not on the active list, nothing needs to be done */	660	/* If not on the active list, nothing needs to be done */
…		…
737	return;	662	return;
738		663
739	if (op->active_prev == NULL)	664	if (op->active_prev == NULL)
740	{	665	{
741	active_objects = op->active_next;	666	active_objects = op->active_next;
		667
742	if (op->active_next != NULL)	668	if (op->active_next != NULL)
743	op->active_next->active_prev = NULL;	669	op->active_next->active_prev = NULL;
744	}	670	}
745	else	671	else
746	{	672	{
747	op->active_prev->active_next = op->active_next;	673	op->active_prev->active_next = op->active_next;
		674
748	if (op->active_next)	675	if (op->active_next)
749	op->active_next->active_prev = op->active_prev;	676	op->active_next->active_prev = op->active_prev;
750	}	677	}
		678
751	op->active_next = NULL;	679	op->active_next = NULL;
752	op->active_prev = NULL;	680	op->active_prev = NULL;
753	}	681	}
754	}	682	}
755		683
…		…
880	update_now = 1;	808	update_now = 1;
881		809
882	if ((move_slow | op->move_slow) != move_slow)	810	if ((move_slow | op->move_slow) != move_slow)
883	update_now = 1;	811	update_now = 1;
884	}	812	}
		813
885	/* if the object is being removed, we can't make intelligent	814	/* if the object is being removed, we can't make intelligent
886	* decisions, because remove_ob can't really pass the object	815	* decisions, because remove_ob can't really pass the object
887	* that is being removed.	816	* that is being removed.
888	*/	817	*/
889	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	818	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
901		830
902	if (op->more != NULL)	831	if (op->more != NULL)
903	update_object (op->more, action);	832	update_object (op->more, action);
904	}	833	}
905		834
906	static unordered_vector < object *>mortals;	835	object::vector object::mortals;
907	static	836	object::vector object::objects; // not yet used
908	std::vector < object *>	837	object *object::first;
909	freed;
910		838
911	void object::free_mortals ()	839	void object::free_mortals ()
912	{	840	{
913	for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();)	841	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
914	if (!(*i)->refcount)	842	if ((*i)->refcnt)
		843	++i; // further delay freeing
		844	else
915	{	845	{
916	freed.push_back (*i);	846	delete *i;
917	mortals.erase (i);	847	mortals.erase (i);
918	}	848	}
919	else
920	++i;
921	}	849	}
922		850
923	object::object ()	851	object::object ()
924	{	852	{
925	SET_FLAG (this, FLAG_REMOVED);	853	SET_FLAG (this, FLAG_REMOVED);
926		854
927	expmul = 1.0;	855	expmul = 1.0;
928	face = blank_face;	856	face = blank_face;
929	attacked_by_count = -1;
930	}	857	}
931		858
932	object::~object ()	859	object::~object ()
933	{	860	{
934	free_key_values (this);	861	free_key_values (this);
935	}	862	}
936		863
937	void object::link ()	864	void object::link ()
938	{	865	{
939	count = ++ob_count;	866	count = ++ob_count;
		867	uuid = gen_uuid ();
940		868
941	prev = 0;	869	prev = 0;
942	next = objects;	870	next = object::first;
943		871
944	if (objects)	872	if (object::first)
945	objects->prev = this;	873	object::first->prev = this;
946		874
947	objects = this;	875	object::first = this;
948	}	876	}
949		877
950	void object::unlink ()	878	void object::unlink ()
951	{	879	{
952	count = 0;	880	if (this == object::first)
		881	object::first = next;
953		882
954	/* Remove this object from the list of used objects */	883	/* Remove this object from the list of used objects */
955	if (prev)
956	{
957	prev->next = next;	884	if (prev) prev->next = next;
		885	if (next) next->prev = prev;
		886
958	prev = 0;	887	prev = 0;
959	}
960
961	if (next)
962	{
963	next->prev = prev;
964	next = 0;	888	next = 0;
965	}
966
967	if (this == objects)
968	objects = next;
969	}	889	}
970		890
971	object *object::create ()	891	object *object::create ()
972	{	892	{
973	object *
974	op;
975
976	if (freed.empty ())
977	op = new object;	893	object *op = new object;
978
979	else
980	{
981	// highly annoying, but the only way to get it stable right now
982	op = freed.back ();
983	freed.pop_back ();
984	op->~object ();
985	new ((void *) op) object;
986	}
987
988	op->link ();	894	op->link ();
989	return op;	895	return op;
990	}	896	}
991		897
992	/*	898	/*
…		…
994	* it from the list of used objects, and puts it on the list of	900	* it from the list of used objects, and puts it on the list of
995	* free objects. The IS_FREED() flag is set in the object.	901	* free objects. The IS_FREED() flag is set in the object.
996	* The object must have been removed by remove_ob() first for	902	* The object must have been removed by remove_ob() first for
997	* this function to succeed.	903	* this function to succeed.
998	*	904	*
999	* If free_inventory is set, free inventory as well. Else drop items in	905	* If destroy_inventory is set, free inventory as well. Else drop items in
1000	* inventory to the ground.	906	* inventory to the ground.
1001	*/	907	*/
1002	void object::free (bool free_inventory)	908	void object::destroy (bool destroy_inventory)
1003	{	909	{
1004	if (QUERY_FLAG (this, FLAG_FREED))	910	if (QUERY_FLAG (this, FLAG_FREED))
1005	return;	911	return;
1006		912
1007	if (!QUERY_FLAG (this, FLAG_REMOVED))
1008	remove_ob (this);
1009
1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))	913	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011	remove_friendly_object (this);	914	remove_friendly_object (this);
1012		915
		916	if (!QUERY_FLAG (this, FLAG_REMOVED))
		917	remove ();
		918
1013	SET_FLAG (this, FLAG_FREED);	919	SET_FLAG (this, FLAG_FREED);
1014		920
1015	if (more)	921	if (more)
1016	{	922	{
1017	more->free (free_inventory);	923	more->destroy (destroy_inventory);
1018	more = 0;	924	more = 0;
1019	}	925	}
1020		926
1021	if (inv)	927	if (inv)
1022	{	928	{
1023	/* Only if the space blocks everything do we not process -	929	/* Only if the space blocks everything do we not process -
1024	* if some form of movement is allowed, let objects	930	* if some form of movement is allowed, let objects
1025	* drop on that space.	931	* drop on that space.
1026	*/	932	*/
1027	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	933	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1028	{	934	{
1029	object *op = inv;	935	object *op = inv;
1030		936
1031	while (op)	937	while (op)
1032	{	938	{
1033	object *tmp = op->below;	939	object *tmp = op->below;
1034	op->free (free_inventory);	940	op->destroy (destroy_inventory);
1035	op = tmp;	941	op = tmp;
1036	}	942	}
1037	}	943	}
1038	else	944	else
1039	{ /* Put objects in inventory onto this space */	945	{ /* Put objects in inventory onto this space */
…		…
1041		947
1042	while (op)	948	while (op)
1043	{	949	{
1044	object *tmp = op->below;	950	object *tmp = op->below;
1045		951
1046	remove_ob (op);	952	op->remove ();
1047		953
1048	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	954	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1049	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	955	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1050	free_object (op);	956	op->destroy ();
1051	else	957	else
1052	{	958	{
1053	op->x = x;	959	op->x = x;
1054	op->y = y;	960	op->y = y;
1055	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	961	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1058	op = tmp;	964	op = tmp;
1059	}	965	}
1060	}	966	}
1061	}	967	}
1062		968
1063	clear_owner (this);	969	// hack to ensure that freed objects still have a valid map
		970	{
		971	static maptile *freed_map; // freed objects are moved here to avoid crashes
		972
		973	if (!freed_map)
		974	{
		975	freed_map = new maptile;
		976
		977	freed_map->name = "/internal/freed_objects_map";
		978	freed_map->width = 3;
		979	freed_map->height = 3;
		980
		981	freed_map->allocate ();
		982	}
		983
		984	map = freed_map;
		985	x = 1;
		986	y = 1;
		987	}
		988
		989	// clear those pointers that likely might have circular references to us
		990	owner = 0;
		991	enemy = 0;
		992	attacked_by = 0;
		993
		994	// only relevant for players(?), but make sure of it anyways
		995	contr = 0;
1064		996
1065	/* Remove object from the active list */	997	/* Remove object from the active list */
1066	speed = 0;	998	speed = 0;
1067	update_ob_speed (this);	999	update_ob_speed (this);
1068		1000
…		…
1073		1005
1074	/*	1006	/*
1075	* sub_weight() recursively (outwards) subtracts a number from the	1007	* sub_weight() recursively (outwards) subtracts a number from the
1076	* weight of an object (and what is carried by it's environment(s)).	1008	* weight of an object (and what is carried by it's environment(s)).
1077	*/	1009	*/
1078
1079	void	1010	void
1080	sub_weight (object *op, signed long weight)	1011	sub_weight (object *op, signed long weight)
1081	{	1012	{
1082	while (op != NULL)	1013	while (op != NULL)
1083	{	1014	{
1084	if (op->type == CONTAINER)	1015	if (op->type == CONTAINER)
1085	{
1086	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1016	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087	}	1017
1088	op->carrying -= weight;	1018	op->carrying -= weight;
1089	op = op->env;	1019	op = op->env;
1090	}	1020	}
1091	}	1021	}
1092		1022
1093	/* remove_ob(op):	1023	/* op->remove ():
1094	* This function removes the object op from the linked list of objects	1024	* This function removes the object op from the linked list of objects
1095	* which it is currently tied to. When this function is done, the	1025	* which it is currently tied to. When this function is done, the
1096	* object will have no environment. If the object previously had an	1026	* object will have no environment. If the object previously had an
1097	* environment, the x and y coordinates will be updated to	1027	* environment, the x and y coordinates will be updated to
1098	* the previous environment.	1028	* the previous environment.
1099	* Beware: This function is called from the editor as well!	1029	* Beware: This function is called from the editor as well!
1100	*/	1030	*/
1101
1102	void	1031	void
1103	remove_ob (object *op)	1032	object::remove ()
1104	{	1033	{
		1034	object *tmp, *last = 0;
1105	object *	1035	object *otmp;
1106	tmp, *
1107	last = NULL;
1108	object *
1109	otmp;
1110		1036
1111	tag_t
1112	tag;
1113	int
1114	check_walk_off;	1037	int check_walk_off;
1115	mapstruct *
1116	m;
1117		1038
1118	sint16
1119	x,
1120	y;
1121
1122	if (QUERY_FLAG (op, FLAG_REMOVED))	1039	if (QUERY_FLAG (this, FLAG_REMOVED))
1123	return;	1040	return;
1124		1041
1125	SET_FLAG (op, FLAG_REMOVED);	1042	SET_FLAG (this, FLAG_REMOVED);
1126		1043
1127	if (op->more != NULL)	1044	if (more)
1128	remove_ob (op->more);	1045	more->remove ();
1129		1046
1130	/*	1047	/*
1131	* In this case, the object to be removed is in someones	1048	* In this case, the object to be removed is in someones
1132	* inventory.	1049	* inventory.
1133	*/	1050	*/
1134	if (op->env != NULL)	1051	if (env)
1135	{	1052	{
1136	if (op->nrof)	1053	if (nrof)
1137	sub_weight (op->env, op->weight * op->nrof);	1054	sub_weight (env, weight * nrof);
1138	else	1055	else
1139	sub_weight (op->env, op->weight + op->carrying);	1056	sub_weight (env, weight + carrying);
1140		1057
1141	/* NO_FIX_PLAYER is set when a great many changes are being	1058	/* NO_FIX_PLAYER is set when a great many changes are being
1142	* made to players inventory. If set, avoiding the call	1059	* made to players inventory. If set, avoiding the call
1143	* to save cpu time.	1060	* to save cpu time.
1144	*/	1061	*/
1145	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1062	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1146	fix_player (otmp);	1063	fix_player (otmp);
1147		1064
1148	if (op->above != NULL)	1065	if (above != NULL)
1149	op->above->below = op->below;	1066	above->below = below;
1150	else	1067	else
1151	op->env->inv = op->below;	1068	env->inv = below;
1152		1069
1153	if (op->below != NULL)	1070	if (below != NULL)
1154	op->below->above = op->above;	1071	below->above = above;
1155		1072
1156	/* we set up values so that it could be inserted into	1073	/* we set up values so that it could be inserted into
1157	* the map, but we don't actually do that - it is up	1074	* the map, but we don't actually do that - it is up
1158	* to the caller to decide what we want to do.	1075	* to the caller to decide what we want to do.
1159	*/	1076	*/
1160	op->x = op->env->x, op->y = op->env->y;	1077	x = env->x, y = env->y;
1161	op->map = op->env->map;	1078	map = env->map;
1162	op->above = NULL, op->below = NULL;	1079	above = 0, below = 0;
1163	op->env = NULL;	1080	env = 0;
1164	}	1081	}
1165	else if (op->map)	1082	else if (map)
1166	{	1083	{
1167	x = op->x;
1168	y = op->y;
1169	m = get_map_from_coord (op->map, &x, &y);
1170
1171	if (!m)
1172	{
1173	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1174	op->map->path, op->x, op->y);
1175	/* in old days, we used to set x and y to 0 and continue.
1176	* it seems if we get into this case, something is probablye
1177	* screwed up and should be fixed.
1178	*/
1179	abort ();
1180	}
1181
1182	if (op->map != m)
1183	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1184	op->map->path, m->path, op->x, op->y, x, y);
1185
1186	/* Re did the following section of code - it looks like it had	1084	/* Re did the following section of code - it looks like it had
1187	* lots of logic for things we no longer care about	1085	* lots of logic for things we no longer care about
1188	*/	1086	*/
1189		1087
1190	/* link the object above us */	1088	/* link the object above us */
1191	if (op->above)	1089	if (above)
1192	op->above->below = op->below;	1090	above->below = below;
1193	else	1091	else
1194	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1092	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1195		1093
1196	/* Relink the object below us, if there is one */	1094	/* Relink the object below us, if there is one */
1197	if (op->below)	1095	if (below)
1198	op->below->above = op->above;	1096	below->above = above;
1199	else	1097	else
1200	{	1098	{
1201	/* Nothing below, which means we need to relink map object for this space	1099	/* Nothing below, which means we need to relink map object for this space
1202	* use translated coordinates in case some oddness with map tiling is	1100	* use translated coordinates in case some oddness with map tiling is
1203	* evident	1101	* evident
1204	*/	1102	*/
1205	if (GET_MAP_OB (m, x, y) != op)	1103	if (GET_MAP_OB (map, x, y) != this)
1206	{	1104	{
1207	dump_object (op);	1105	char *dump = dump_object (this);
1208	LOG (llevError,	1106	LOG (llevError,
1209	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1107	"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);
		1108	free (dump);
1210	dump_object (GET_MAP_OB (m, x, y));	1109	dump = dump_object (GET_MAP_OB (map, x, y));
1211	LOG (llevError, "%s\n", errmsg);	1110	LOG (llevError, "%s\n", dump);
		1111	free (dump);
1212	}	1112	}
1213		1113
1214	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1114	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1215	}	1115	}
1216		1116
1217	op->above = 0;	1117	above = 0;
1218	op->below = 0;	1118	below = 0;
1219		1119
1220	if (op->map->in_memory == MAP_SAVING)	1120	if (map->in_memory == MAP_SAVING)
1221	return;	1121	return;
1222		1122
1223	tag = op->count;
1224	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1123	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1225		1124
1226	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1125	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1227	{	1126	{
1228	/* No point updating the players look faces if he is the object	1127	/* No point updating the players look faces if he is the object
1229	* being removed.	1128	* being removed.
1230	*/	1129	*/
1231		1130
1232	if (tmp->type == PLAYER && tmp != op)	1131	if (tmp->type == PLAYER && tmp != this)
1233	{	1132	{
1234	/* If a container that the player is currently using somehow gets	1133	/* If a container that the player is currently using somehow gets
1235	* removed (most likely destroyed), update the player view	1134	* removed (most likely destroyed), update the player view
1236	* appropriately.	1135	* appropriately.
1237	*/	1136	*/
1238	if (tmp->container == op)	1137	if (tmp->container == this)
1239	{	1138	{
1240	CLEAR_FLAG (op, FLAG_APPLIED);	1139	CLEAR_FLAG (this, FLAG_APPLIED);
1241	tmp->container = NULL;	1140	tmp->container = 0;
1242	}	1141	}
1243		1142
1244	tmp->contr->socket.update_look = 1;	1143	tmp->contr->socket.update_look = 1;
1245	}	1144	}
1246		1145
1247	/* See if player moving off should effect something */	1146	/* See if player moving off should effect something */
1248	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1147	if (check_walk_off
		1148	&& ((move_type & tmp->move_off)
		1149	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1249	{	1150	{
1250	move_apply (tmp, op, NULL);	1151	move_apply (tmp, this, 0);
1251		1152
1252	if (was_destroyed (op, tag))	1153	if (destroyed ())
1253	{
1254	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1154	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1255	}
1256	}	1155	}
1257		1156
1258	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1157	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259		1158
1260	if (tmp->above == tmp)	1159	if (tmp->above == tmp)
1261	tmp->above = NULL;	1160	tmp->above = 0;
1262		1161
1263	last = tmp;	1162	last = tmp;
1264	}	1163	}
1265		1164
1266	/* last == NULL of there are no objects on this space */	1165	/* last == NULL of there are no objects on this space */
1267	if (last == NULL)	1166	if (!last)
1268	{	1167	{
1269	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1168	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1270	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1169	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1271	* those out anyways, and if there are any flags set right now, they won't	1170	* those out anyways, and if there are any flags set right now, they won't
1272	* be correct anyways.	1171	* be correct anyways.
1273	*/	1172	*/
1274	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1173	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1275	update_position (op->map, op->x, op->y);	1174	update_position (map, x, y);
1276	}	1175	}
1277	else	1176	else
1278	update_object (last, UP_OBJ_REMOVE);	1177	update_object (last, UP_OBJ_REMOVE);
1279		1178
1280	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1179	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1281	update_all_los (op->map, op->x, op->y);	1180	update_all_los (map, x, y);
1282	}	1181	}
1283	}	1182	}
1284		1183
1285	/*	1184	/*
1286	* merge_ob(op,top):	1185	* merge_ob(op,top):
…		…
1288	* This function goes through all objects below and including top, and	1187	* This function goes through all objects below and including top, and
1289	* merges op to the first matching object.	1188	* merges op to the first matching object.
1290	* If top is NULL, it is calculated.	1189	* If top is NULL, it is calculated.
1291	* Returns pointer to object if it succeded in the merge, otherwise NULL	1190	* Returns pointer to object if it succeded in the merge, otherwise NULL
1292	*/	1191	*/
1293
1294	object *	1192	object *
1295	merge_ob (object *op, object *top)	1193	merge_ob (object *op, object *top)
1296	{	1194	{
1297	if (!op->nrof)	1195	if (!op->nrof)
1298	return 0;	1196	return 0;
…		…
1308	{	1206	{
1309	top->nrof += op->nrof;	1207	top->nrof += op->nrof;
1310		1208
1311	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1209	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1312	op->weight = 0; /* Don't want any adjustements now */	1210	op->weight = 0; /* Don't want any adjustements now */
1313	remove_ob (op);	1211	op->destroy ();
1314	free_object (op);
1315	return top;	1212	return top;
1316	}	1213	}
1317	}	1214	}
1318		1215
1319	return NULL;	1216	return 0;
1320	}	1217	}
1321		1218
1322	/*	1219	/*
1323	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1220	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1324	* job preparing multi-part monsters	1221	* job preparing multi-part monsters
1325	*/	1222	*/
1326	object *	1223	object *
1327	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1328	{	1225	{
1329	object *tmp;	1226	object *tmp;
1330		1227
1331	if (op->head)	1228	if (op->head)
1332	op = op->head;	1229	op = op->head;
…		…
1360	* NULL if 'op' was destroyed	1257	* NULL if 'op' was destroyed
1361	* just 'op' otherwise	1258	* just 'op' otherwise
1362	*/	1259	*/
1363		1260
1364	object *	1261	object *
1365	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1262	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1366	{	1263	{
1367	object *tmp, *top, *floor = NULL;	1264	object *tmp, *top, *floor = NULL;
1368	sint16 x, y;	1265	sint16 x, y;
1369		1266
1370	if (QUERY_FLAG (op, FLAG_FREED))	1267	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1373	return NULL;	1270	return NULL;
1374	}	1271	}
1375		1272
1376	if (m == NULL)	1273	if (m == NULL)
1377	{	1274	{
1378	dump_object (op);	1275	char *dump = dump_object (op);
1379	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1276	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1277	free (dump);
1380	return op;	1278	return op;
1381	}	1279	}
1382		1280
1383	if (out_of_map (m, op->x, op->y))	1281	if (out_of_map (m, op->x, op->y))
1384	{	1282	{
1385	dump_object (op);	1283	char *dump = dump_object (op);
1386	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1284	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1387	#ifdef MANY_CORES	1285	#ifdef MANY_CORES
1388	/* Better to catch this here, as otherwise the next use of this object	1286	/* Better to catch this here, as otherwise the next use of this object
1389	* is likely to cause a crash. Better to find out where it is getting	1287	* is likely to cause a crash. Better to find out where it is getting
1390	* improperly inserted.	1288	* improperly inserted.
1391	*/	1289	*/
1392	abort ();	1290	abort ();
1393	#endif	1291	#endif
		1292	free (dump);
1394	return op;	1293	return op;
1395	}	1294	}
1396		1295
1397	if (!QUERY_FLAG (op, FLAG_REMOVED))	1296	if (!QUERY_FLAG (op, FLAG_REMOVED))
1398	{	1297	{
1399	dump_object (op);	1298	char *dump = dump_object (op);
1400	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1299	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1300	free (dump);
1401	return op;	1301	return op;
1402	}	1302	}
1403		1303
1404	if (op->more != NULL)	1304	if (op->more != NULL)
1405	{	1305	{
…		…
1446	if (op->nrof && !(flag & INS_NO_MERGE))	1346	if (op->nrof && !(flag & INS_NO_MERGE))
1447	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1347	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1448	if (CAN_MERGE (op, tmp))	1348	if (CAN_MERGE (op, tmp))
1449	{	1349	{
1450	op->nrof += tmp->nrof;	1350	op->nrof += tmp->nrof;
1451	remove_ob (tmp);	1351	tmp->destroy ();
1452	free_object (tmp);
1453	}	1352	}
1454		1353
1455	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1354	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1456	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1355	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1457		1356
…		…
1643	tmp1;	1542	tmp1;
1644		1543
1645	/* first search for itself and remove any old instances */	1544	/* first search for itself and remove any old instances */
1646		1545
1647	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1546	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1648	{
1649	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1650	{	1548	tmp->destroy ();
1651	remove_ob (tmp);
1652	free_object (tmp);
1653	}
1654	}
1655		1549
1656	tmp1 = arch_to_object (find_archetype (arch_string));	1550	tmp1 = arch_to_object (archetype::find (arch_string));
1657		1551
1658	tmp1->x = op->x;	1552	tmp1->x = op->x;
1659	tmp1->y = op->y;	1553	tmp1->y = op->y;
1660	insert_ob_in_map (tmp1, op->map, op, 0);	1554	insert_ob_in_map (tmp1, op->map, op, 0);
1661	}	1555	}
…		…
1669	*/	1563	*/
1670		1564
1671	object *	1565	object *
1672	get_split_ob (object *orig_ob, uint32 nr)	1566	get_split_ob (object *orig_ob, uint32 nr)
1673	{	1567	{
1674	object *	1568	object *newob;
1675	newob;
1676	int
1677	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1569	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1678		1570
1679	if (orig_ob->nrof < nr)	1571	if (orig_ob->nrof < nr)
1680	{	1572	{
1681	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1573	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1682	return NULL;	1574	return NULL;
1683	}	1575	}
1684		1576
1685	newob = object_create_clone (orig_ob);	1577	newob = object_create_clone (orig_ob);
1686		1578
1687	if ((orig_ob->nrof -= nr) < 1)	1579	if ((orig_ob->nrof -= nr) < 1)
1688	{	1580	orig_ob->destroy (1);
1689	if (!is_removed)
1690	remove_ob (orig_ob);
1691	free_object2 (orig_ob, 1);
1692	}
1693	else if (!is_removed)	1581	else if (!is_removed)
1694	{	1582	{
1695	if (orig_ob->env != NULL)	1583	if (orig_ob->env != NULL)
1696	sub_weight (orig_ob->env, orig_ob->weight * nr);	1584	sub_weight (orig_ob->env, orig_ob->weight * nr);
1697	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1585	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1761	esrv_send_item (tmp, op);	1649	esrv_send_item (tmp, op);
1762	}	1650	}
1763	}	1651	}
1764	else	1652	else
1765	{	1653	{
1766	remove_ob (op);	1654	op->remove ();
1767	op->nrof = 0;	1655	op->nrof = 0;
1768	if (tmp)	1656	if (tmp)
1769	{	1657	{
1770	esrv_del_item (tmp->contr, op->count);	1658	esrv_del_item (tmp->contr, op->count);
1771	}	1659	}
…		…
1777		1665
1778	if (i < op->nrof)	1666	if (i < op->nrof)
1779	op->nrof -= i;	1667	op->nrof -= i;
1780	else	1668	else
1781	{	1669	{
1782	remove_ob (op);	1670	op->remove ();
1783	op->nrof = 0;	1671	op->nrof = 0;
1784	}	1672	}
1785		1673
1786	/* Since we just removed op, op->above is null */	1674	/* Since we just removed op, op->above is null */
1787	for (tmp = above; tmp != NULL; tmp = tmp->above)	1675	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1796		1684
1797	if (op->nrof)	1685	if (op->nrof)
1798	return op;	1686	return op;
1799	else	1687	else
1800	{	1688	{
1801	free_object (op);	1689	op->destroy ();
1802	return NULL;	1690	return NULL;
1803	}	1691	}
1804	}	1692	}
1805		1693
1806	/*	1694	/*
…		…
1819	op->carrying += weight;	1707	op->carrying += weight;
1820	op = op->env;	1708	op = op->env;
1821	}	1709	}
1822	}	1710	}
1823		1711
		1712	object *
		1713	insert_ob_in_ob (object *op, object *where)
		1714	{
		1715	if (!where)
		1716	{
		1717	char *dump = dump_object (op);
		1718	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1719	free (dump);
		1720	return op;
		1721	}
		1722
		1723	if (where->head)
		1724	{
		1725	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1726	where = where->head;
		1727	}
		1728
		1729	return where->insert (op);
		1730	}
		1731
1824	/*	1732	/*
1825	* insert_ob_in_ob(op,environment):	1733	* env->insert (op)
1826	* This function inserts the object op in the linked list	1734	* This function inserts the object op in the linked list
1827	* inside the object environment.	1735	* inside the object environment.
1828	*	1736	*
1829	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1830	* the inventory at the last position or next to other objects of the same
1831	* type.
1832	* Frank: Now sorted by type, archetype and magic!
1833	*
1834	* The function returns now pointer to inserted item, and return value can	1737	* The function returns now pointer to inserted item, and return value can
1835	* be != op, if items are merged. -Tero	1738	* be != op, if items are merged. -Tero
1836	*/	1739	*/
1837		1740
1838	object *	1741	object *
1839	insert_ob_in_ob (object *op, object *where)	1742	object::insert (object *op)
1840	{	1743	{
1841	object *	1744	object *tmp, *otmp;
1842	tmp, *
1843	otmp;
1844		1745
1845	if (!QUERY_FLAG (op, FLAG_REMOVED))	1746	if (!QUERY_FLAG (op, FLAG_REMOVED))
1846	{	1747	op->remove ();
1847	dump_object (op);
1848	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1849	return op;
1850	}
1851
1852	if (where == NULL)
1853	{
1854	dump_object (op);
1855	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1856	return op;
1857	}
1858
1859	if (where->head)
1860	{
1861	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1862	where = where->head;
1863	}
1864		1748
1865	if (op->more)	1749	if (op->more)
1866	{	1750	{
1867	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1751	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1868	return op;	1752	return op;
…		…
1870		1754
1871	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1755	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1872	CLEAR_FLAG (op, FLAG_REMOVED);	1756	CLEAR_FLAG (op, FLAG_REMOVED);
1873	if (op->nrof)	1757	if (op->nrof)
1874	{	1758	{
1875	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1759	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1876	if (CAN_MERGE (tmp, op))	1760	if (CAN_MERGE (tmp, op))
1877	{	1761	{
1878	/* return the original object and remove inserted object	1762	/* return the original object and remove inserted object
1879	(client needs the original object) */	1763	(client needs the original object) */
1880	tmp->nrof += op->nrof;	1764	tmp->nrof += op->nrof;
1881	/* Weight handling gets pretty funky. Since we are adding to	1765	/* Weight handling gets pretty funky. Since we are adding to
1882	* tmp->nrof, we need to increase the weight.	1766	* tmp->nrof, we need to increase the weight.
1883	*/	1767	*/
1884	add_weight (where, op->weight * op->nrof);	1768	add_weight (this, op->weight * op->nrof);
1885	SET_FLAG (op, FLAG_REMOVED);	1769	SET_FLAG (op, FLAG_REMOVED);
1886	free_object (op); /* free the inserted object */	1770	op->destroy (); /* free the inserted object */
1887	op = tmp;	1771	op = tmp;
1888	remove_ob (op); /* and fix old object's links */	1772	op->remove (); /* and fix old object's links */
1889	CLEAR_FLAG (op, FLAG_REMOVED);	1773	CLEAR_FLAG (op, FLAG_REMOVED);
1890	break;	1774	break;
1891	}	1775	}
1892		1776
1893	/* I assume combined objects have no inventory	1777	/* I assume combined objects have no inventory
1894	* We add the weight - this object could have just been removed	1778	* We add the weight - this object could have just been removed
1895	* (if it was possible to merge). calling remove_ob will subtract	1779	* (if it was possible to merge). calling remove_ob will subtract
1896	* the weight, so we need to add it in again, since we actually do	1780	* the weight, so we need to add it in again, since we actually do
1897	* the linking below	1781	* the linking below
1898	*/	1782	*/
1899	add_weight (where, op->weight * op->nrof);	1783	add_weight (this, op->weight * op->nrof);
1900	}	1784	}
1901	else	1785	else
1902	add_weight (where, (op->weight + op->carrying));	1786	add_weight (this, (op->weight + op->carrying));
1903		1787
1904	otmp = is_player_inv (where);	1788	otmp = is_player_inv (this);
1905	if (otmp && otmp->contr != NULL)	1789	if (otmp && otmp->contr)
1906	{
1907	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1790	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1908	fix_player (otmp);	1791	fix_player (otmp);
1909	}
1910		1792
1911	op->map = NULL;	1793	op->map = NULL;
1912	op->env = where;	1794	op->env = this;
1913	op->above = NULL;	1795	op->above = NULL;
1914	op->below = NULL;	1796	op->below = NULL;
1915	op->x = 0, op->y = 0;	1797	op->x = 0, op->y = 0;
1916		1798
1917	/* reset the light list and los of the players on the map */	1799	/* reset the light list and los of the players on the map */
1918	if ((op->glow_radius != 0) && where->map)	1800	if ((op->glow_radius != 0) && map)
1919	{	1801	{
1920	#ifdef DEBUG_LIGHTS	1802	#ifdef DEBUG_LIGHTS
1921	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1803	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1922	#endif /* DEBUG_LIGHTS */	1804	#endif /* DEBUG_LIGHTS */
1923	if (MAP_DARKNESS (where->map))	1805	if (MAP_DARKNESS (map))
1924	update_all_los (where->map, where->x, where->y);	1806	update_all_los (map, x, y);
1925	}	1807	}
1926		1808
1927	/* Client has no idea of ordering so lets not bother ordering it here.	1809	/* Client has no idea of ordering so lets not bother ordering it here.
1928	* It sure simplifies this function...	1810	* It sure simplifies this function...
1929	*/	1811	*/
1930	if (where->inv == NULL)	1812	if (!inv)
1931	where->inv = op;	1813	inv = op;
1932	else	1814	else
1933	{	1815	{
1934	op->below = where->inv;	1816	op->below = inv;
1935	op->below->above = op;	1817	op->below->above = op;
1936	where->inv = op;	1818	inv = op;
1937	}	1819	}
		1820
1938	return op;	1821	return op;
1939	}	1822	}
1940		1823
1941	/*	1824	/*
1942	* Checks if any objects has a move_type that matches objects	1825	* Checks if any objects has a move_type that matches objects
…		…
1960	*/	1843	*/
1961		1844
1962	int	1845	int
1963	check_move_on (object *op, object *originator)	1846	check_move_on (object *op, object *originator)
1964	{	1847	{
1965	object *	1848	object *tmp;
1966	tmp;	1849	maptile *m = op->map;
1967	tag_t
1968	tag;
1969	mapstruct *
1970	m = op->map;
1971	int
1972	x = op->x, y = op->y;	1850	int x = op->x, y = op->y;
1973		1851
1974	MoveType	1852	MoveType move_on, move_slow, move_block;
1975	move_on,
1976	move_slow,
1977	move_block;
1978		1853
1979	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1854	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980	return 0;	1855	return 0;
1981
1982	tag = op->count;
1983		1856
1984	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1857	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1985	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1858	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1986	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1859	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1987		1860
…		…
2048	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1921	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2049	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1922	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2050	{	1923	{
2051	move_apply (tmp, op, originator);	1924	move_apply (tmp, op, originator);
2052		1925
2053	if (was_destroyed (op, tag))	1926	if (op->destroyed ())
2054	return 1;	1927	return 1;
2055		1928
2056	/* what the person/creature stepped onto has moved the object	1929	/* what the person/creature stepped onto has moved the object
2057	* someplace new. Don't process any further - if we did,	1930	* someplace new. Don't process any further - if we did,
2058	* have a feeling strange problems would result.	1931	* have a feeling strange problems would result.
…		…
2070	* a matching archetype at the given map and coordinates.	1943	* a matching archetype at the given map and coordinates.
2071	* The first matching object is returned, or NULL if none.	1944	* The first matching object is returned, or NULL if none.
2072	*/	1945	*/
2073		1946
2074	object *	1947	object *
2075	present_arch (const archetype *at, mapstruct *m, int x, int y)	1948	present_arch (const archetype *at, maptile *m, int x, int y)
2076	{	1949	{
2077	object *	1950	object *
2078	tmp;	1951	tmp;
2079		1952
2080	if (m == NULL || out_of_map (m, x, y))	1953	if (m == NULL || out_of_map (m, x, y))
…		…
2093	* a matching type variable at the given map and coordinates.	1966	* a matching type variable at the given map and coordinates.
2094	* The first matching object is returned, or NULL if none.	1967	* The first matching object is returned, or NULL if none.
2095	*/	1968	*/
2096		1969
2097	object *	1970	object *
2098	present (unsigned char type, mapstruct *m, int x, int y)	1971	present (unsigned char type, maptile *m, int x, int y)
2099	{	1972	{
2100	object *	1973	object *
2101	tmp;	1974	tmp;
2102		1975
2103	if (out_of_map (m, x, y))	1976	if (out_of_map (m, x, y))
…		…
2243	* the archetype because that isn't correct if the monster has been	2116	* the archetype because that isn't correct if the monster has been
2244	* customized, changed states, etc.	2117	* customized, changed states, etc.
2245	*/	2118	*/
2246		2119
2247	int	2120	int
2248	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2121	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2249	{	2122	{
2250	int	2123	int
2251	i,	2124	i,
2252	index = 0, flag;	2125	index = 0, flag;
2253	static int	2126	static int
…		…
2274	return -1;	2147	return -1;
2275	return altern[RANDOM () % index];	2148	return altern[RANDOM () % index];
2276	}	2149	}
2277		2150
2278	/*	2151	/*
2279	* find_first_free_spot(archetype, mapstruct, x, y) works like	2152	* find_first_free_spot(archetype, maptile, x, y) works like
2280	* find_free_spot(), but it will search max number of squares.	2153	* find_free_spot(), but it will search max number of squares.
2281	* But it will return the first available spot, not a random choice.	2154	* But it will return the first available spot, not a random choice.
2282	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2155	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2283	*/	2156	*/
2284		2157
2285	int	2158	int
2286	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2159	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2287	{	2160	{
2288	int	2161	int
2289	i;	2162	i;
2290		2163
2291	for (i = 0; i < SIZEOFFREE; i++)	2164	for (i = 0; i < SIZEOFFREE; i++)
…		…
2355	* because we have to know what movement the thing looking to move	2228	* because we have to know what movement the thing looking to move
2356	* there is capable of.	2229	* there is capable of.
2357	*/	2230	*/
2358		2231
2359	int	2232	int
2360	find_dir (mapstruct *m, int x, int y, object *exclude)	2233	find_dir (maptile *m, int x, int y, object *exclude)
2361	{	2234	{
2362	int	2235	int
2363	i,	2236	i,
2364	max = SIZEOFFREE, mflags;	2237	max = SIZEOFFREE, mflags;
2365		2238
2366	sint16 nx, ny;	2239	sint16 nx, ny;
2367	object *	2240	object *
2368	tmp;	2241	tmp;
2369	mapstruct *	2242	maptile *
2370	mp;	2243	mp;
2371		2244
2372	MoveType blocked, move_type;	2245	MoveType blocked, move_type;
2373		2246
2374	if (exclude && exclude->head)	2247	if (exclude && exclude->head)
…		…
2582	* Modified to be map tile aware -.MSW	2455	* Modified to be map tile aware -.MSW
2583	*/	2456	*/
2584		2457
2585		2458
2586	int	2459	int
2587	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2460	can_see_monsterP (maptile *m, int x, int y, int dir)
2588	{	2461	{
2589	sint16 dx, dy;	2462	sint16 dx, dy;
2590	int	2463	int
2591	mflags;	2464	mflags;
2592		2465
…		…
2641	* create clone from object to another	2514	* create clone from object to another
2642	*/	2515	*/
2643	object *	2516	object *
2644	object_create_clone (object *asrc)	2517	object_create_clone (object *asrc)
2645	{	2518	{
2646	object *
2647	dst = NULL, *tmp, *src, *part, *prev, *item;	2519	object *dst = 0, *tmp, *src, *part, *prev, *item;
2648		2520
2649	if (!asrc)	2521	if (!asrc)
2650	return NULL;	2522	return 0;
		2523
2651	src = asrc;	2524	src = asrc;
2652	if (src->head)	2525	if (src->head)
2653	src = src->head;	2526	src = src->head;
2654		2527
2655	prev = NULL;	2528	prev = 0;
2656	for (part = src; part; part = part->more)	2529	for (part = src; part; part = part->more)
2657	{	2530	{
2658	tmp = get_object ();	2531	tmp = part->clone ();
2659	copy_object (part, tmp);
2660	tmp->x -= src->x;	2532	tmp->x -= src->x;
2661	tmp->y -= src->y;	2533	tmp->y -= src->y;
		2534
2662	if (!part->head)	2535	if (!part->head)
2663	{	2536	{
2664	dst = tmp;	2537	dst = tmp;
2665	tmp->head = NULL;	2538	tmp->head = 0;
2666	}	2539	}
2667	else	2540	else
2668	{	2541	{
2669	tmp->head = dst;	2542	tmp->head = dst;
2670	}	2543	}
		2544
2671	tmp->more = NULL;	2545	tmp->more = 0;
		2546
2672	if (prev)	2547	if (prev)
2673	prev->more = tmp;	2548	prev->more = tmp;
		2549
2674	prev = tmp;	2550	prev = tmp;
2675	}	2551	}
2676		2552
2677	/*** copy inventory ***/
2678	for (item = src->inv; item; item = item->below)	2553	for (item = src->inv; item; item = item->below)
2679	{
2680	(void) insert_ob_in_ob (object_create_clone (item), dst);	2554	insert_ob_in_ob (object_create_clone (item), dst);
2681	}
2682		2555
2683	return dst;	2556	return dst;
2684	}	2557	}
2685		2558
2686	/* return true if the object was destroyed, 0 otherwise */
2687	int
2688	was_destroyed (const object *op, tag_t old_tag)
2689	{
2690	/* checking for FLAG_FREED isn't necessary, but makes this function more
2691	* robust */
2692	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2693	}
2694
2695	/* GROS - Creates an object using a string representing its content. */	2559	/* GROS - Creates an object using a string representing its content. */
2696
2697	/* Basically, we save the content of the string to a temp file, then call */	2560	/* Basically, we save the content of the string to a temp file, then call */
2698
2699	/* load_object on it. I admit it is a highly inefficient way to make things, */	2561	/* load_object on it. I admit it is a highly inefficient way to make things, */
2700
2701	/* but it was simple to make and allows reusing the load_object function. */	2562	/* but it was simple to make and allows reusing the load_object function. */
2702
2703	/* Remember not to use load_object_str in a time-critical situation. */	2563	/* Remember not to use load_object_str in a time-critical situation. */
2704
2705	/* Also remember that multiparts objects are not supported for now. */	2564	/* Also remember that multiparts objects are not supported for now. */
2706		2565
2707	object *	2566	object *
2708	load_object_str (const char *obstr)	2567	load_object_str (const char *obstr)
2709	{	2568	{
2710	object *	2569	object *op;
2711	op;
2712	char
2713	filename[MAX_BUF];	2570	char filename[MAX_BUF];
2714		2571
2715	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2572	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716		2573
2717	FILE *
2718	tempfile = fopen (filename, "w");	2574	FILE *tempfile = fopen (filename, "w");
2719		2575
2720	if (tempfile == NULL)	2576	if (tempfile == NULL)
2721	{	2577	{
2722	LOG (llevError, "Error - Unable to access load object temp file\n");	2578	LOG (llevError, "Error - Unable to access load object temp file\n");
2723	return NULL;	2579	return NULL;
2724	};	2580	}
		2581
2725	fprintf (tempfile, obstr);	2582	fprintf (tempfile, obstr);
2726	fclose (tempfile);	2583	fclose (tempfile);
2727		2584
2728	op = get_object ();	2585	op = object::create ();
2729		2586
2730	object_thawer thawer (filename);	2587	object_thawer thawer (filename);
2731		2588
2732	if (thawer)	2589	if (thawer)
2733	load_object (thawer, op, 0);	2590	load_object (thawer, op, 0);
…		…
2743	* returns NULL if no match.	2600	* returns NULL if no match.
2744	*/	2601	*/
2745	object *	2602	object *
2746	find_obj_by_type_subtype (const object *who, int type, int subtype)	2603	find_obj_by_type_subtype (const object *who, int type, int subtype)
2747	{	2604	{
2748	object *	2605	object *tmp;
2749	tmp;
2750		2606
2751	for (tmp = who->inv; tmp; tmp = tmp->below)	2607	for (tmp = who->inv; tmp; tmp = tmp->below)
2752	if (tmp->type == type && tmp->subtype == subtype)	2608	if (tmp->type == type && tmp->subtype == subtype)
2753	return tmp;	2609	return tmp;
2754		2610
…		…
2762	* do the desired thing.	2618	* do the desired thing.
2763	*/	2619	*/
2764	key_value *	2620	key_value *
2765	get_ob_key_link (const object *ob, const char *key)	2621	get_ob_key_link (const object *ob, const char *key)
2766	{	2622	{
2767	key_value *	2623	key_value *link;
2768	link;
2769		2624
2770	for (link = ob->key_values; link != NULL; link = link->next)	2625	for (link = ob->key_values; link != NULL; link = link->next)
2771	{
2772	if (link->key == key)	2626	if (link->key == key)
2773	{
2774	return link;	2627	return link;
2775	}
2776	}
2777		2628
2778	return NULL;	2629	return NULL;
2779	}	2630	}
2780		2631
2781	/*	2632	/*
…		…
2786	* The returned string is shared.	2637	* The returned string is shared.
2787	*/	2638	*/
2788	const char *	2639	const char *
2789	get_ob_key_value (const object *op, const char *const key)	2640	get_ob_key_value (const object *op, const char *const key)
2790	{	2641	{
2791	key_value *	2642	key_value *link;
2792	link;	2643	shstr_cmp canonical_key (key);
2793	const char *
2794	canonical_key;
2795		2644
2796	canonical_key = shstr::find (key);
2797
2798	if (canonical_key == NULL)	2645	if (!canonical_key)
2799	{	2646	{
2800	/* 1. There being a field named key on any object	2647	/* 1. There being a field named key on any object
2801	* implies there'd be a shared string to find.	2648	* implies there'd be a shared string to find.
2802	* 2. Since there isn't, no object has this field.	2649	* 2. Since there isn't, no object has this field.
2803	* 3. Therefore, *this* object doesn't have this field.	2650	* 3. Therefore, *this* object doesn't have this field.
2804	*/	2651	*/
2805	return NULL;	2652	return 0;
2806	}	2653	}
2807		2654
2808	/* This is copied from get_ob_key_link() above -	2655	/* This is copied from get_ob_key_link() above -
2809	* only 4 lines, and saves the function call overhead.	2656	* only 4 lines, and saves the function call overhead.
2810	*/	2657	*/
2811	for (link = op->key_values; link != NULL; link = link->next)	2658	for (link = op->key_values; link; link = link->next)
2812	{
2813	if (link->key == canonical_key)	2659	if (link->key == canonical_key)
2814	{
2815	return link->value;	2660	return link->value;
2816	}	2661
2817	}
2818	return NULL;	2662	return 0;
2819	}	2663	}
2820		2664
2821		2665
2822	/*	2666	/*
2823	* Updates the canonical_key in op to value.	2667	* Updates the canonical_key in op to value.
…		…
2908	{	2752	{
2909	shstr key_ (key);	2753	shstr key_ (key);
2910		2754
2911	return set_ob_key_value_s (op, key_, value, add_key);	2755	return set_ob_key_value_s (op, key_, value, add_key);
2912	}	2756	}
		2757
		2758	object::depth_iterator::depth_iterator (object *container)
		2759	: iterator_base (container)
		2760	{
		2761	while (item->inv)
		2762	item = item->inv;
		2763	}
		2764
		2765	void
		2766	object::depth_iterator::next ()
		2767	{
		2768	if (item->below)
		2769	{
		2770	item = item->below;
		2771
		2772	while (item->inv)
		2773	item = item->inv;
		2774	}
		2775	else
		2776	item = item->env;
		2777	}
		2778
		2779	// return a suitable string describing an objetc in enough detail to find it
		2780	const char *
		2781	object::debug_desc (char *info) const
		2782	{
		2783	char info2[256 * 3];
		2784	char *p = info;
		2785
		2786	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2787	count,
		2788	&name,
		2789	title ? " " : "",
		2790	title ? (const char *)title : "");
		2791
		2792	if (env)
		2793	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2794
		2795	if (map)
		2796	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2797
		2798	return info;
		2799	}
		2800
		2801	const char *
		2802	object::debug_desc () const
		2803	{
		2804	static char info[256 * 3];
		2805	return debug_desc (info);
		2806	}
		2807

Diff Legend

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