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.64 by root, Tue Dec 12 21:39:56 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);
675	}	591	}
676		592
677	/*	593	/*
678	* If an object with the IS_TURNABLE() flag needs to be turned due	594	* 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	595	* to the closest player being on the other side, this function can
…		…
692	/*	608	/*
693	* Updates the speed of an object. If the speed changes from 0 to another	609	* 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.	610	* 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.	611	* This function needs to be called whenever the speed of an object changes.
696	*/	612	*/
697
698	void	613	void
699	update_ob_speed (object *op)	614	update_ob_speed (object *op)
700	{	615	{
701	extern int arch_init;	616	extern int arch_init;
702		617
…		…
711	abort ();	626	abort ();
712	#else	627	#else
713	op->speed = 0;	628	op->speed = 0;
714	#endif	629	#endif
715	}	630	}
		631
716	if (arch_init)	632	if (arch_init)
717	{
718	return;	633	return;
719	}	634
720	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	635	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721	{	636	{
722	/* If already on active list, don't do anything */	637	/* If already on active list, don't do anything */
723	if (op->active_next || op->active_prev || op == active_objects)	638	if (op->active_next || op->active_prev || op == active_objects)
724	return;	639	return;
725		640
726	/* process_events() expects us to insert the object at the beginning	641	/* process_events() expects us to insert the object at the beginning
727	* of the list. */	642	* of the list. */
728	op->active_next = active_objects;	643	op->active_next = active_objects;
		644
729	if (op->active_next != NULL)	645	if (op->active_next != NULL)
730	op->active_next->active_prev = op;	646	op->active_next->active_prev = op;
		647
731	active_objects = op;	648	active_objects = op;
732	}	649	}
733	else	650	else
734	{	651	{
735	/* If not on the active list, nothing needs to be done */	652	/* If not on the active list, nothing needs to be done */
…		…
737	return;	654	return;
738		655
739	if (op->active_prev == NULL)	656	if (op->active_prev == NULL)
740	{	657	{
741	active_objects = op->active_next;	658	active_objects = op->active_next;
		659
742	if (op->active_next != NULL)	660	if (op->active_next != NULL)
743	op->active_next->active_prev = NULL;	661	op->active_next->active_prev = NULL;
744	}	662	}
745	else	663	else
746	{	664	{
747	op->active_prev->active_next = op->active_next;	665	op->active_prev->active_next = op->active_next;
		666
748	if (op->active_next)	667	if (op->active_next)
749	op->active_next->active_prev = op->active_prev;	668	op->active_next->active_prev = op->active_prev;
750	}	669	}
		670
751	op->active_next = NULL;	671	op->active_next = NULL;
752	op->active_prev = NULL;	672	op->active_prev = NULL;
753	}	673	}
754	}	674	}
755		675
…		…
880	update_now = 1;	800	update_now = 1;
881		801
882	if ((move_slow | op->move_slow) != move_slow)	802	if ((move_slow | op->move_slow) != move_slow)
883	update_now = 1;	803	update_now = 1;
884	}	804	}
		805
885	/* if the object is being removed, we can't make intelligent	806	/* if the object is being removed, we can't make intelligent
886	* decisions, because remove_ob can't really pass the object	807	* decisions, because remove_ob can't really pass the object
887	* that is being removed.	808	* that is being removed.
888	*/	809	*/
889	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	810	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
901		822
902	if (op->more != NULL)	823	if (op->more != NULL)
903	update_object (op->more, action);	824	update_object (op->more, action);
904	}	825	}
905		826
906	static unordered_vector < object *>mortals;	827	object::vector object::mortals;
907	static	828	object::vector object::objects; // not yet used
908	std::vector < object *>	829	object *object::first;
909	freed;
910		830
911	void object::free_mortals ()	831	void object::free_mortals ()
912	{	832	{
913	for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();)	833	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
914	if (!(*i)->refcount)	834	if ((*i)->refcnt)
		835	++i; // further delay freeing
		836	else
915	{	837	{
916	freed.push_back (*i);	838	delete *i;
917	mortals.erase (i);	839	mortals.erase (i);
918	}	840	}
919	else
920	++i;
921	}	841	}
922		842
923	object::object ()	843	object::object ()
924	{	844	{
925	SET_FLAG (this, FLAG_REMOVED);	845	SET_FLAG (this, FLAG_REMOVED);
926		846
927	expmul = 1.0;	847	expmul = 1.0;
928	face = blank_face;	848	face = blank_face;
929	attacked_by_count = -1;
930	}	849	}
931		850
932	object::~object ()	851	object::~object ()
933	{	852	{
934	free_key_values (this);	853	free_key_values (this);
935	}	854	}
936		855
937	void object::link ()	856	void object::link ()
938	{	857	{
939	count = ++ob_count;	858	count = ++ob_count;
		859	uuid = gen_uuid ();
940		860
941	prev = 0;	861	prev = 0;
942	next = objects;	862	next = object::first;
943		863
944	if (objects)	864	if (object::first)
945	objects->prev = this;	865	object::first->prev = this;
946		866
947	objects = this;	867	object::first = this;
948	}	868	}
949		869
950	void object::unlink ()	870	void object::unlink ()
951	{	871	{
952	count = 0;	872	if (this == object::first)
		873	object::first = next;
953		874
954	/* Remove this object from the list of used objects */	875	/* Remove this object from the list of used objects */
955	if (prev)
956	{
957	prev->next = next;	876	if (prev) prev->next = next;
		877	if (next) next->prev = prev;
		878
958	prev = 0;	879	prev = 0;
959	}
960
961	if (next)
962	{
963	next->prev = prev;
964	next = 0;	880	next = 0;
965	}
966
967	if (this == objects)
968	objects = next;
969	}	881	}
970		882
971	object *object::create ()	883	object *object::create ()
972	{	884	{
973	object *
974	op;
975
976	if (freed.empty ())
977	op = new object;	885	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 ();	886	op->link ();
989	return op;	887	return op;
990	}	888	}
991		889
992	/*	890	/*
…		…
994	* it from the list of used objects, and puts it on the list of	892	* 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.	893	* free objects. The IS_FREED() flag is set in the object.
996	* The object must have been removed by remove_ob() first for	894	* The object must have been removed by remove_ob() first for
997	* this function to succeed.	895	* this function to succeed.
998	*	896	*
999	* If free_inventory is set, free inventory as well. Else drop items in	897	* If destroy_inventory is set, free inventory as well. Else drop items in
1000	* inventory to the ground.	898	* inventory to the ground.
1001	*/	899	*/
1002	void object::free (bool free_inventory)	900	void object::destroy (bool destroy_inventory)
1003	{	901	{
1004	if (QUERY_FLAG (this, FLAG_FREED))	902	if (QUERY_FLAG (this, FLAG_FREED))
1005	return;	903	return;
1006		904
1007	if (!QUERY_FLAG (this, FLAG_REMOVED))
1008	remove_ob (this);
1009
1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))	905	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011	remove_friendly_object (this);	906	remove_friendly_object (this);
1012		907
		908	if (!QUERY_FLAG (this, FLAG_REMOVED))
		909	remove ();
		910
1013	SET_FLAG (this, FLAG_FREED);	911	SET_FLAG (this, FLAG_FREED);
1014		912
1015	if (more)	913	if (more)
1016	{	914	{
1017	more->free (free_inventory);	915	more->destroy (destroy_inventory);
1018	more = 0;	916	more = 0;
1019	}	917	}
1020		918
1021	if (inv)	919	if (inv)
1022	{	920	{
1023	/* Only if the space blocks everything do we not process -	921	/* Only if the space blocks everything do we not process -
1024	* if some form of movement is allowed, let objects	922	* if some form of movement is allowed, let objects
1025	* drop on that space.	923	* drop on that space.
1026	*/	924	*/
1027	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	925	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1028	{	926	{
1029	object *op = inv;	927	object *op = inv;
1030		928
1031	while (op)	929	while (op)
1032	{	930	{
1033	object *tmp = op->below;	931	object *tmp = op->below;
1034	op->free (free_inventory);	932	op->destroy (destroy_inventory);
1035	op = tmp;	933	op = tmp;
1036	}	934	}
1037	}	935	}
1038	else	936	else
1039	{ /* Put objects in inventory onto this space */	937	{ /* Put objects in inventory onto this space */
…		…
1041		939
1042	while (op)	940	while (op)
1043	{	941	{
1044	object *tmp = op->below;	942	object *tmp = op->below;
1045		943
1046	remove_ob (op);	944	op->remove ();
1047		945
1048	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	946	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))	947	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1050	free_object (op);	948	op->destroy ();
1051	else	949	else
1052	{	950	{
1053	op->x = x;	951	op->x = x;
1054	op->y = y;	952	op->y = y;
1055	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	953	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1058	op = tmp;	956	op = tmp;
1059	}	957	}
1060	}	958	}
1061	}	959	}
1062		960
1063	clear_owner (this);	961	// hack to ensure that freed objects still have a valid map
		962	{
		963	static maptile *freed_map; // freed objects are moved here to avoid crashes
		964
		965	if (!freed_map)
		966	{
		967	freed_map = new maptile;
		968
		969	freed_map->name = "/internal/freed_objects_map";
		970	freed_map->width = 3;
		971	freed_map->height = 3;
		972
		973	freed_map->allocate ();
		974	}
		975
		976	map = freed_map;
		977	x = 1;
		978	y = 1;
		979	}
		980
		981	// clear those pointers that likely might have circular references to us
		982	owner = 0;
		983	enemy = 0;
		984	attacked_by = 0;
		985
		986	// only relevant for players(?), but make sure of it anyways
		987	contr = 0;
1064		988
1065	/* Remove object from the active list */	989	/* Remove object from the active list */
1066	speed = 0;	990	speed = 0;
1067	update_ob_speed (this);	991	update_ob_speed (this);
1068		992
…		…
1073		997
1074	/*	998	/*
1075	* sub_weight() recursively (outwards) subtracts a number from the	999	* sub_weight() recursively (outwards) subtracts a number from the
1076	* weight of an object (and what is carried by it's environment(s)).	1000	* weight of an object (and what is carried by it's environment(s)).
1077	*/	1001	*/
1078
1079	void	1002	void
1080	sub_weight (object *op, signed long weight)	1003	sub_weight (object *op, signed long weight)
1081	{	1004	{
1082	while (op != NULL)	1005	while (op != NULL)
1083	{	1006	{
1084	if (op->type == CONTAINER)	1007	if (op->type == CONTAINER)
1085	{
1086	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1008	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087	}	1009
1088	op->carrying -= weight;	1010	op->carrying -= weight;
1089	op = op->env;	1011	op = op->env;
1090	}	1012	}
1091	}	1013	}
1092		1014
1093	/* remove_ob(op):	1015	/* op->remove ():
1094	* This function removes the object op from the linked list of objects	1016	* 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	1017	* which it is currently tied to. When this function is done, the
1096	* object will have no environment. If the object previously had an	1018	* object will have no environment. If the object previously had an
1097	* environment, the x and y coordinates will be updated to	1019	* environment, the x and y coordinates will be updated to
1098	* the previous environment.	1020	* the previous environment.
1099	* Beware: This function is called from the editor as well!	1021	* Beware: This function is called from the editor as well!
1100	*/	1022	*/
1101
1102	void	1023	void
1103	remove_ob (object *op)	1024	object::remove ()
1104	{	1025	{
		1026	object *tmp, *last = 0;
1105	object *	1027	object *otmp;
1106	tmp, *
1107	last = NULL;
1108	object *
1109	otmp;
1110		1028
1111	tag_t
1112	tag;
1113	int
1114	check_walk_off;	1029	int check_walk_off;
1115	mapstruct *
1116	m;
1117		1030
1118	sint16
1119	x,
1120	y;
1121
1122	if (QUERY_FLAG (op, FLAG_REMOVED))	1031	if (QUERY_FLAG (this, FLAG_REMOVED))
1123	return;	1032	return;
1124		1033
1125	SET_FLAG (op, FLAG_REMOVED);	1034	SET_FLAG (this, FLAG_REMOVED);
1126		1035
1127	if (op->more != NULL)	1036	if (more)
1128	remove_ob (op->more);	1037	more->remove ();
1129		1038
1130	/*	1039	/*
1131	* In this case, the object to be removed is in someones	1040	* In this case, the object to be removed is in someones
1132	* inventory.	1041	* inventory.
1133	*/	1042	*/
1134	if (op->env != NULL)	1043	if (env)
1135	{	1044	{
1136	if (op->nrof)	1045	if (nrof)
1137	sub_weight (op->env, op->weight * op->nrof);	1046	sub_weight (env, weight * nrof);
1138	else	1047	else
1139	sub_weight (op->env, op->weight + op->carrying);	1048	sub_weight (env, weight + carrying);
1140		1049
1141	/* NO_FIX_PLAYER is set when a great many changes are being	1050	/* NO_FIX_PLAYER is set when a great many changes are being
1142	* made to players inventory. If set, avoiding the call	1051	* made to players inventory. If set, avoiding the call
1143	* to save cpu time.	1052	* to save cpu time.
1144	*/	1053	*/
1145	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1054	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1146	fix_player (otmp);	1055	fix_player (otmp);
1147		1056
1148	if (op->above != NULL)	1057	if (above != NULL)
1149	op->above->below = op->below;	1058	above->below = below;
1150	else	1059	else
1151	op->env->inv = op->below;	1060	env->inv = below;
1152		1061
1153	if (op->below != NULL)	1062	if (below != NULL)
1154	op->below->above = op->above;	1063	below->above = above;
1155		1064
1156	/* we set up values so that it could be inserted into	1065	/* we set up values so that it could be inserted into
1157	* the map, but we don't actually do that - it is up	1066	* the map, but we don't actually do that - it is up
1158	* to the caller to decide what we want to do.	1067	* to the caller to decide what we want to do.
1159	*/	1068	*/
1160	op->x = op->env->x, op->y = op->env->y;	1069	x = env->x, y = env->y;
1161	op->map = op->env->map;	1070	map = env->map;
1162	op->above = NULL, op->below = NULL;	1071	above = 0, below = 0;
1163	op->env = NULL;	1072	env = 0;
1164	}	1073	}
1165	else if (op->map)	1074	else if (map)
1166	{	1075	{
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	1076	/* Re did the following section of code - it looks like it had
1187	* lots of logic for things we no longer care about	1077	* lots of logic for things we no longer care about
1188	*/	1078	*/
1189		1079
1190	/* link the object above us */	1080	/* link the object above us */
1191	if (op->above)	1081	if (above)
1192	op->above->below = op->below;	1082	above->below = below;
1193	else	1083	else
1194	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1084	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1195		1085
1196	/* Relink the object below us, if there is one */	1086	/* Relink the object below us, if there is one */
1197	if (op->below)	1087	if (below)
1198	op->below->above = op->above;	1088	below->above = above;
1199	else	1089	else
1200	{	1090	{
1201	/* Nothing below, which means we need to relink map object for this space	1091	/* 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	1092	* use translated coordinates in case some oddness with map tiling is
1203	* evident	1093	* evident
1204	*/	1094	*/
1205	if (GET_MAP_OB (m, x, y) != op)	1095	if (GET_MAP_OB (map, x, y) != this)
1206	{	1096	{
1207	dump_object (op);	1097	char *dump = dump_object (this);
1208	LOG (llevError,	1098	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);	1099	"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);
		1100	free (dump);
1210	dump_object (GET_MAP_OB (m, x, y));	1101	dump = dump_object (GET_MAP_OB (map, x, y));
1211	LOG (llevError, "%s\n", errmsg);	1102	LOG (llevError, "%s\n", dump);
		1103	free (dump);
1212	}	1104	}
1213		1105
1214	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1106	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1215	}	1107	}
1216		1108
1217	op->above = 0;	1109	above = 0;
1218	op->below = 0;	1110	below = 0;
1219		1111
1220	if (op->map->in_memory == MAP_SAVING)	1112	if (map->in_memory == MAP_SAVING)
1221	return;	1113	return;
1222		1114
1223	tag = op->count;
1224	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1115	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1225		1116
1226	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1117	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1227	{	1118	{
1228	/* No point updating the players look faces if he is the object	1119	/* No point updating the players look faces if he is the object
1229	* being removed.	1120	* being removed.
1230	*/	1121	*/
1231		1122
1232	if (tmp->type == PLAYER && tmp != op)	1123	if (tmp->type == PLAYER && tmp != this)
1233	{	1124	{
1234	/* If a container that the player is currently using somehow gets	1125	/* If a container that the player is currently using somehow gets
1235	* removed (most likely destroyed), update the player view	1126	* removed (most likely destroyed), update the player view
1236	* appropriately.	1127	* appropriately.
1237	*/	1128	*/
1238	if (tmp->container == op)	1129	if (tmp->container == this)
1239	{	1130	{
1240	CLEAR_FLAG (op, FLAG_APPLIED);	1131	CLEAR_FLAG (this, FLAG_APPLIED);
1241	tmp->container = NULL;	1132	tmp->container = 0;
1242	}	1133	}
1243		1134
1244	tmp->contr->socket.update_look = 1;	1135	tmp->contr->socket.update_look = 1;
1245	}	1136	}
1246		1137
1247	/* See if player moving off should effect something */	1138	/* 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))	1139	if (check_walk_off
		1140	&& ((move_type & tmp->move_off)
		1141	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1249	{	1142	{
1250	move_apply (tmp, op, NULL);	1143	move_apply (tmp, this, 0);
1251		1144
1252	if (was_destroyed (op, tag))	1145	if (destroyed ())
1253	{
1254	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1146	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1255	}
1256	}	1147	}
1257		1148
1258	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1149	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259		1150
1260	if (tmp->above == tmp)	1151	if (tmp->above == tmp)
1261	tmp->above = NULL;	1152	tmp->above = 0;
1262		1153
1263	last = tmp;	1154	last = tmp;
1264	}	1155	}
1265		1156
1266	/* last == NULL of there are no objects on this space */	1157	/* last == NULL of there are no objects on this space */
1267	if (last == NULL)	1158	if (!last)
1268	{	1159	{
1269	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1160	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1270	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1161	* 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	1162	* those out anyways, and if there are any flags set right now, they won't
1272	* be correct anyways.	1163	* be correct anyways.
1273	*/	1164	*/
1274	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1165	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1275	update_position (op->map, op->x, op->y);	1166	update_position (map, x, y);
1276	}	1167	}
1277	else	1168	else
1278	update_object (last, UP_OBJ_REMOVE);	1169	update_object (last, UP_OBJ_REMOVE);
1279		1170
1280	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1171	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1281	update_all_los (op->map, op->x, op->y);	1172	update_all_los (map, x, y);
1282	}	1173	}
1283	}	1174	}
1284		1175
1285	/*	1176	/*
1286	* merge_ob(op,top):	1177	* merge_ob(op,top):
…		…
1288	* This function goes through all objects below and including top, and	1179	* This function goes through all objects below and including top, and
1289	* merges op to the first matching object.	1180	* merges op to the first matching object.
1290	* If top is NULL, it is calculated.	1181	* If top is NULL, it is calculated.
1291	* Returns pointer to object if it succeded in the merge, otherwise NULL	1182	* Returns pointer to object if it succeded in the merge, otherwise NULL
1292	*/	1183	*/
1293
1294	object *	1184	object *
1295	merge_ob (object *op, object *top)	1185	merge_ob (object *op, object *top)
1296	{	1186	{
1297	if (!op->nrof)	1187	if (!op->nrof)
1298	return 0;	1188	return 0;
…		…
1308	{	1198	{
1309	top->nrof += op->nrof;	1199	top->nrof += op->nrof;
1310		1200
1311	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1201	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1312	op->weight = 0; /* Don't want any adjustements now */	1202	op->weight = 0; /* Don't want any adjustements now */
1313	remove_ob (op);	1203	op->destroy ();
1314	free_object (op);
1315	return top;	1204	return top;
1316	}	1205	}
1317	}	1206	}
1318		1207
1319	return NULL;	1208	return 0;
1320	}	1209	}
1321		1210
1322	/*	1211	/*
1323	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1212	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1324	* job preparing multi-part monsters	1213	* job preparing multi-part monsters
1325	*/	1214	*/
1326	object *	1215	object *
1327	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1216	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1328	{	1217	{
1329	object *tmp;	1218	object *tmp;
1330		1219
1331	if (op->head)	1220	if (op->head)
1332	op = op->head;	1221	op = op->head;
…		…
1360	* NULL if 'op' was destroyed	1249	* NULL if 'op' was destroyed
1361	* just 'op' otherwise	1250	* just 'op' otherwise
1362	*/	1251	*/
1363		1252
1364	object *	1253	object *
1365	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1254	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1366	{	1255	{
1367	object *tmp, *top, *floor = NULL;	1256	object *tmp, *top, *floor = NULL;
1368	sint16 x, y;	1257	sint16 x, y;
1369		1258
1370	if (QUERY_FLAG (op, FLAG_FREED))	1259	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1373	return NULL;	1262	return NULL;
1374	}	1263	}
1375		1264
1376	if (m == NULL)	1265	if (m == NULL)
1377	{	1266	{
1378	dump_object (op);	1267	char *dump = dump_object (op);
1379	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1268	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1269	free (dump);
1380	return op;	1270	return op;
1381	}	1271	}
1382		1272
1383	if (out_of_map (m, op->x, op->y))	1273	if (out_of_map (m, op->x, op->y))
1384	{	1274	{
1385	dump_object (op);	1275	char *dump = dump_object (op);
1386	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1276	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1387	#ifdef MANY_CORES	1277	#ifdef MANY_CORES
1388	/* Better to catch this here, as otherwise the next use of this object	1278	/* 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	1279	* is likely to cause a crash. Better to find out where it is getting
1390	* improperly inserted.	1280	* improperly inserted.
1391	*/	1281	*/
1392	abort ();	1282	abort ();
1393	#endif	1283	#endif
		1284	free (dump);
1394	return op;	1285	return op;
1395	}	1286	}
1396		1287
1397	if (!QUERY_FLAG (op, FLAG_REMOVED))	1288	if (!QUERY_FLAG (op, FLAG_REMOVED))
1398	{	1289	{
1399	dump_object (op);	1290	char *dump = dump_object (op);
1400	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1291	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1292	free (dump);
1401	return op;	1293	return op;
1402	}	1294	}
1403		1295
1404	if (op->more != NULL)	1296	if (op->more != NULL)
1405	{	1297	{
…		…
1446	if (op->nrof && !(flag & INS_NO_MERGE))	1338	if (op->nrof && !(flag & INS_NO_MERGE))
1447	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1339	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1448	if (CAN_MERGE (op, tmp))	1340	if (CAN_MERGE (op, tmp))
1449	{	1341	{
1450	op->nrof += tmp->nrof;	1342	op->nrof += tmp->nrof;
1451	remove_ob (tmp);	1343	tmp->destroy ();
1452	free_object (tmp);
1453	}	1344	}
1454		1345
1455	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1346	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1456	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1347	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1457		1348
…		…
1643	tmp1;	1534	tmp1;
1644		1535
1645	/* first search for itself and remove any old instances */	1536	/* first search for itself and remove any old instances */
1646		1537
1647	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1538	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 */	1539	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1650	{	1540	tmp->destroy ();
1651	remove_ob (tmp);
1652	free_object (tmp);
1653	}
1654	}
1655		1541
1656	tmp1 = arch_to_object (find_archetype (arch_string));	1542	tmp1 = arch_to_object (archetype::find (arch_string));
1657		1543
1658	tmp1->x = op->x;	1544	tmp1->x = op->x;
1659	tmp1->y = op->y;	1545	tmp1->y = op->y;
1660	insert_ob_in_map (tmp1, op->map, op, 0);	1546	insert_ob_in_map (tmp1, op->map, op, 0);
1661	}	1547	}
…		…
1669	*/	1555	*/
1670		1556
1671	object *	1557	object *
1672	get_split_ob (object *orig_ob, uint32 nr)	1558	get_split_ob (object *orig_ob, uint32 nr)
1673	{	1559	{
1674	object *	1560	object *newob;
1675	newob;
1676	int
1677	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1561	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1678		1562
1679	if (orig_ob->nrof < nr)	1563	if (orig_ob->nrof < nr)
1680	{	1564	{
1681	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1565	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1682	return NULL;	1566	return NULL;
1683	}	1567	}
1684		1568
1685	newob = object_create_clone (orig_ob);	1569	newob = object_create_clone (orig_ob);
1686		1570
1687	if ((orig_ob->nrof -= nr) < 1)	1571	if ((orig_ob->nrof -= nr) < 1)
1688	{	1572	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)	1573	else if (!is_removed)
1694	{	1574	{
1695	if (orig_ob->env != NULL)	1575	if (orig_ob->env != NULL)
1696	sub_weight (orig_ob->env, orig_ob->weight * nr);	1576	sub_weight (orig_ob->env, orig_ob->weight * nr);
1697	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1577	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1761	esrv_send_item (tmp, op);	1641	esrv_send_item (tmp, op);
1762	}	1642	}
1763	}	1643	}
1764	else	1644	else
1765	{	1645	{
1766	remove_ob (op);	1646	op->remove ();
1767	op->nrof = 0;	1647	op->nrof = 0;
1768	if (tmp)	1648	if (tmp)
1769	{	1649	{
1770	esrv_del_item (tmp->contr, op->count);	1650	esrv_del_item (tmp->contr, op->count);
1771	}	1651	}
…		…
1777		1657
1778	if (i < op->nrof)	1658	if (i < op->nrof)
1779	op->nrof -= i;	1659	op->nrof -= i;
1780	else	1660	else
1781	{	1661	{
1782	remove_ob (op);	1662	op->remove ();
1783	op->nrof = 0;	1663	op->nrof = 0;
1784	}	1664	}
1785		1665
1786	/* Since we just removed op, op->above is null */	1666	/* Since we just removed op, op->above is null */
1787	for (tmp = above; tmp != NULL; tmp = tmp->above)	1667	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1796		1676
1797	if (op->nrof)	1677	if (op->nrof)
1798	return op;	1678	return op;
1799	else	1679	else
1800	{	1680	{
1801	free_object (op);	1681	op->destroy ();
1802	return NULL;	1682	return NULL;
1803	}	1683	}
1804	}	1684	}
1805		1685
1806	/*	1686	/*
…		…
1819	op->carrying += weight;	1699	op->carrying += weight;
1820	op = op->env;	1700	op = op->env;
1821	}	1701	}
1822	}	1702	}
1823		1703
		1704	object *
		1705	insert_ob_in_ob (object *op, object *where)
		1706	{
		1707	if (!where)
		1708	{
		1709	char *dump = dump_object (op);
		1710	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1711	free (dump);
		1712	return op;
		1713	}
		1714
		1715	if (where->head)
		1716	{
		1717	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1718	where = where->head;
		1719	}
		1720
		1721	return where->insert (op);
		1722	}
		1723
1824	/*	1724	/*
1825	* insert_ob_in_ob(op,environment):	1725	* env->insert (op)
1826	* This function inserts the object op in the linked list	1726	* This function inserts the object op in the linked list
1827	* inside the object environment.	1727	* inside the object environment.
1828	*	1728	*
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	1729	* The function returns now pointer to inserted item, and return value can
1835	* be != op, if items are merged. -Tero	1730	* be != op, if items are merged. -Tero
1836	*/	1731	*/
1837		1732
1838	object *	1733	object *
1839	insert_ob_in_ob (object *op, object *where)	1734	object::insert (object *op)
1840	{	1735	{
1841	object *	1736	object *tmp, *otmp;
1842	tmp, *
1843	otmp;
1844		1737
1845	if (!QUERY_FLAG (op, FLAG_REMOVED))	1738	if (!QUERY_FLAG (op, FLAG_REMOVED))
1846	{	1739	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		1740
1865	if (op->more)	1741	if (op->more)
1866	{	1742	{
1867	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1743	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1868	return op;	1744	return op;
…		…
1870		1746
1871	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1747	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1872	CLEAR_FLAG (op, FLAG_REMOVED);	1748	CLEAR_FLAG (op, FLAG_REMOVED);
1873	if (op->nrof)	1749	if (op->nrof)
1874	{	1750	{
1875	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1751	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1876	if (CAN_MERGE (tmp, op))	1752	if (CAN_MERGE (tmp, op))
1877	{	1753	{
1878	/* return the original object and remove inserted object	1754	/* return the original object and remove inserted object
1879	(client needs the original object) */	1755	(client needs the original object) */
1880	tmp->nrof += op->nrof;	1756	tmp->nrof += op->nrof;
1881	/* Weight handling gets pretty funky. Since we are adding to	1757	/* Weight handling gets pretty funky. Since we are adding to
1882	* tmp->nrof, we need to increase the weight.	1758	* tmp->nrof, we need to increase the weight.
1883	*/	1759	*/
1884	add_weight (where, op->weight * op->nrof);	1760	add_weight (this, op->weight * op->nrof);
1885	SET_FLAG (op, FLAG_REMOVED);	1761	SET_FLAG (op, FLAG_REMOVED);
1886	free_object (op); /* free the inserted object */	1762	op->destroy (); /* free the inserted object */
1887	op = tmp;	1763	op = tmp;
1888	remove_ob (op); /* and fix old object's links */	1764	op->remove (); /* and fix old object's links */
1889	CLEAR_FLAG (op, FLAG_REMOVED);	1765	CLEAR_FLAG (op, FLAG_REMOVED);
1890	break;	1766	break;
1891	}	1767	}
1892		1768
1893	/* I assume combined objects have no inventory	1769	/* I assume combined objects have no inventory
1894	* We add the weight - this object could have just been removed	1770	* We add the weight - this object could have just been removed
1895	* (if it was possible to merge). calling remove_ob will subtract	1771	* (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	1772	* the weight, so we need to add it in again, since we actually do
1897	* the linking below	1773	* the linking below
1898	*/	1774	*/
1899	add_weight (where, op->weight * op->nrof);	1775	add_weight (this, op->weight * op->nrof);
1900	}	1776	}
1901	else	1777	else
1902	add_weight (where, (op->weight + op->carrying));	1778	add_weight (this, (op->weight + op->carrying));
1903		1779
1904	otmp = is_player_inv (where);	1780	otmp = is_player_inv (this);
1905	if (otmp && otmp->contr != NULL)	1781	if (otmp && otmp->contr)
1906	{
1907	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1782	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1908	fix_player (otmp);	1783	fix_player (otmp);
1909	}
1910		1784
1911	op->map = NULL;	1785	op->map = NULL;
1912	op->env = where;	1786	op->env = this;
1913	op->above = NULL;	1787	op->above = NULL;
1914	op->below = NULL;	1788	op->below = NULL;
1915	op->x = 0, op->y = 0;	1789	op->x = 0, op->y = 0;
1916		1790
1917	/* reset the light list and los of the players on the map */	1791	/* reset the light list and los of the players on the map */
1918	if ((op->glow_radius != 0) && where->map)	1792	if ((op->glow_radius != 0) && map)
1919	{	1793	{
1920	#ifdef DEBUG_LIGHTS	1794	#ifdef DEBUG_LIGHTS
1921	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1795	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1922	#endif /* DEBUG_LIGHTS */	1796	#endif /* DEBUG_LIGHTS */
1923	if (MAP_DARKNESS (where->map))	1797	if (MAP_DARKNESS (map))
1924	update_all_los (where->map, where->x, where->y);	1798	update_all_los (map, x, y);
1925	}	1799	}
1926		1800
1927	/* Client has no idea of ordering so lets not bother ordering it here.	1801	/* Client has no idea of ordering so lets not bother ordering it here.
1928	* It sure simplifies this function...	1802	* It sure simplifies this function...
1929	*/	1803	*/
1930	if (where->inv == NULL)	1804	if (!inv)
1931	where->inv = op;	1805	inv = op;
1932	else	1806	else
1933	{	1807	{
1934	op->below = where->inv;	1808	op->below = inv;
1935	op->below->above = op;	1809	op->below->above = op;
1936	where->inv = op;	1810	inv = op;
1937	}	1811	}
		1812
1938	return op;	1813	return op;
1939	}	1814	}
1940		1815
1941	/*	1816	/*
1942	* Checks if any objects has a move_type that matches objects	1817	* Checks if any objects has a move_type that matches objects
…		…
1960	*/	1835	*/
1961		1836
1962	int	1837	int
1963	check_move_on (object *op, object *originator)	1838	check_move_on (object *op, object *originator)
1964	{	1839	{
1965	object *	1840	object *tmp;
1966	tmp;	1841	maptile *m = op->map;
1967	tag_t
1968	tag;
1969	mapstruct *
1970	m = op->map;
1971	int
1972	x = op->x, y = op->y;	1842	int x = op->x, y = op->y;
1973		1843
1974	MoveType	1844	MoveType move_on, move_slow, move_block;
1975	move_on,
1976	move_slow,
1977	move_block;
1978		1845
1979	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1846	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980	return 0;	1847	return 0;
1981
1982	tag = op->count;
1983		1848
1984	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1849	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);	1850	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);	1851	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1987		1852
…		…
2048	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1913	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))	1914	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2050	{	1915	{
2051	move_apply (tmp, op, originator);	1916	move_apply (tmp, op, originator);
2052		1917
2053	if (was_destroyed (op, tag))	1918	if (op->destroyed ())
2054	return 1;	1919	return 1;
2055		1920
2056	/* what the person/creature stepped onto has moved the object	1921	/* what the person/creature stepped onto has moved the object
2057	* someplace new. Don't process any further - if we did,	1922	* someplace new. Don't process any further - if we did,
2058	* have a feeling strange problems would result.	1923	* have a feeling strange problems would result.
…		…
2070	* a matching archetype at the given map and coordinates.	1935	* a matching archetype at the given map and coordinates.
2071	* The first matching object is returned, or NULL if none.	1936	* The first matching object is returned, or NULL if none.
2072	*/	1937	*/
2073		1938
2074	object *	1939	object *
2075	present_arch (const archetype *at, mapstruct *m, int x, int y)	1940	present_arch (const archetype *at, maptile *m, int x, int y)
2076	{	1941	{
2077	object *	1942	object *
2078	tmp;	1943	tmp;
2079		1944
2080	if (m == NULL || out_of_map (m, x, y))	1945	if (m == NULL || out_of_map (m, x, y))
…		…
2093	* a matching type variable at the given map and coordinates.	1958	* a matching type variable at the given map and coordinates.
2094	* The first matching object is returned, or NULL if none.	1959	* The first matching object is returned, or NULL if none.
2095	*/	1960	*/
2096		1961
2097	object *	1962	object *
2098	present (unsigned char type, mapstruct *m, int x, int y)	1963	present (unsigned char type, maptile *m, int x, int y)
2099	{	1964	{
2100	object *	1965	object *
2101	tmp;	1966	tmp;
2102		1967
2103	if (out_of_map (m, x, y))	1968	if (out_of_map (m, x, y))
…		…
2243	* the archetype because that isn't correct if the monster has been	2108	* the archetype because that isn't correct if the monster has been
2244	* customized, changed states, etc.	2109	* customized, changed states, etc.
2245	*/	2110	*/
2246		2111
2247	int	2112	int
2248	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2113	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2249	{	2114	{
2250	int	2115	int
2251	i,	2116	i,
2252	index = 0, flag;	2117	index = 0, flag;
2253	static int	2118	static int
…		…
2274	return -1;	2139	return -1;
2275	return altern[RANDOM () % index];	2140	return altern[RANDOM () % index];
2276	}	2141	}
2277		2142
2278	/*	2143	/*
2279	* find_first_free_spot(archetype, mapstruct, x, y) works like	2144	* find_first_free_spot(archetype, maptile, x, y) works like
2280	* find_free_spot(), but it will search max number of squares.	2145	* find_free_spot(), but it will search max number of squares.
2281	* But it will return the first available spot, not a random choice.	2146	* 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.	2147	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2283	*/	2148	*/
2284		2149
2285	int	2150	int
2286	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2151	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2287	{	2152	{
2288	int	2153	int
2289	i;	2154	i;
2290		2155
2291	for (i = 0; i < SIZEOFFREE; i++)	2156	for (i = 0; i < SIZEOFFREE; i++)
…		…
2355	* because we have to know what movement the thing looking to move	2220	* because we have to know what movement the thing looking to move
2356	* there is capable of.	2221	* there is capable of.
2357	*/	2222	*/
2358		2223
2359	int	2224	int
2360	find_dir (mapstruct *m, int x, int y, object *exclude)	2225	find_dir (maptile *m, int x, int y, object *exclude)
2361	{	2226	{
2362	int	2227	int
2363	i,	2228	i,
2364	max = SIZEOFFREE, mflags;	2229	max = SIZEOFFREE, mflags;
2365		2230
2366	sint16 nx, ny;	2231	sint16 nx, ny;
2367	object *	2232	object *
2368	tmp;	2233	tmp;
2369	mapstruct *	2234	maptile *
2370	mp;	2235	mp;
2371		2236
2372	MoveType blocked, move_type;	2237	MoveType blocked, move_type;
2373		2238
2374	if (exclude && exclude->head)	2239	if (exclude && exclude->head)
…		…
2582	* Modified to be map tile aware -.MSW	2447	* Modified to be map tile aware -.MSW
2583	*/	2448	*/
2584		2449
2585		2450
2586	int	2451	int
2587	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2452	can_see_monsterP (maptile *m, int x, int y, int dir)
2588	{	2453	{
2589	sint16 dx, dy;	2454	sint16 dx, dy;
2590	int	2455	int
2591	mflags;	2456	mflags;
2592		2457
…		…
2641	* create clone from object to another	2506	* create clone from object to another
2642	*/	2507	*/
2643	object *	2508	object *
2644	object_create_clone (object *asrc)	2509	object_create_clone (object *asrc)
2645	{	2510	{
2646	object *
2647	dst = NULL, *tmp, *src, *part, *prev, *item;	2511	object *dst = 0, *tmp, *src, *part, *prev, *item;
2648		2512
2649	if (!asrc)	2513	if (!asrc)
2650	return NULL;	2514	return 0;
		2515
2651	src = asrc;	2516	src = asrc;
2652	if (src->head)	2517	if (src->head)
2653	src = src->head;	2518	src = src->head;
2654		2519
2655	prev = NULL;	2520	prev = 0;
2656	for (part = src; part; part = part->more)	2521	for (part = src; part; part = part->more)
2657	{	2522	{
2658	tmp = get_object ();	2523	tmp = object::create ();
2659	copy_object (part, tmp);	2524	part->copy_to (tmp);
2660	tmp->x -= src->x;	2525	tmp->x -= src->x;
2661	tmp->y -= src->y;	2526	tmp->y -= src->y;
		2527
2662	if (!part->head)	2528	if (!part->head)
2663	{	2529	{
2664	dst = tmp;	2530	dst = tmp;
2665	tmp->head = NULL;	2531	tmp->head = 0;
2666	}	2532	}
2667	else	2533	else
2668	{	2534	{
2669	tmp->head = dst;	2535	tmp->head = dst;
2670	}	2536	}
		2537
2671	tmp->more = NULL;	2538	tmp->more = 0;
		2539
2672	if (prev)	2540	if (prev)
2673	prev->more = tmp;	2541	prev->more = tmp;
		2542
2674	prev = tmp;	2543	prev = tmp;
2675	}	2544	}
2676		2545
2677	/*** copy inventory ***/
2678	for (item = src->inv; item; item = item->below)	2546	for (item = src->inv; item; item = item->below)
2679	{
2680	(void) insert_ob_in_ob (object_create_clone (item), dst);	2547	insert_ob_in_ob (object_create_clone (item), dst);
2681	}
2682		2548
2683	return dst;	2549	return dst;
2684	}	2550	}
2685		2551
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. */	2552	/* 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 */	2553	/* 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, */	2554	/* 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. */	2555	/* 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. */	2556	/* Remember not to use load_object_str in a time-critical situation. */
2704
2705	/* Also remember that multiparts objects are not supported for now. */	2557	/* Also remember that multiparts objects are not supported for now. */
2706		2558
2707	object *	2559	object *
2708	load_object_str (const char *obstr)	2560	load_object_str (const char *obstr)
2709	{	2561	{
2710	object *	2562	object *op;
2711	op;
2712	char
2713	filename[MAX_BUF];	2563	char filename[MAX_BUF];
2714		2564
2715	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2565	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716		2566
2717	FILE *
2718	tempfile = fopen (filename, "w");	2567	FILE *tempfile = fopen (filename, "w");
2719		2568
2720	if (tempfile == NULL)	2569	if (tempfile == NULL)
2721	{	2570	{
2722	LOG (llevError, "Error - Unable to access load object temp file\n");	2571	LOG (llevError, "Error - Unable to access load object temp file\n");
2723	return NULL;	2572	return NULL;
2724	};	2573	}
		2574
2725	fprintf (tempfile, obstr);	2575	fprintf (tempfile, obstr);
2726	fclose (tempfile);	2576	fclose (tempfile);
2727		2577
2728	op = get_object ();	2578	op = object::create ();
2729		2579
2730	object_thawer thawer (filename);	2580	object_thawer thawer (filename);
2731		2581
2732	if (thawer)	2582	if (thawer)
2733	load_object (thawer, op, 0);	2583	load_object (thawer, op, 0);
…		…
2743	* returns NULL if no match.	2593	* returns NULL if no match.
2744	*/	2594	*/
2745	object *	2595	object *
2746	find_obj_by_type_subtype (const object *who, int type, int subtype)	2596	find_obj_by_type_subtype (const object *who, int type, int subtype)
2747	{	2597	{
2748	object *	2598	object *tmp;
2749	tmp;
2750		2599
2751	for (tmp = who->inv; tmp; tmp = tmp->below)	2600	for (tmp = who->inv; tmp; tmp = tmp->below)
2752	if (tmp->type == type && tmp->subtype == subtype)	2601	if (tmp->type == type && tmp->subtype == subtype)
2753	return tmp;	2602	return tmp;
2754		2603
…		…
2762	* do the desired thing.	2611	* do the desired thing.
2763	*/	2612	*/
2764	key_value *	2613	key_value *
2765	get_ob_key_link (const object *ob, const char *key)	2614	get_ob_key_link (const object *ob, const char *key)
2766	{	2615	{
2767	key_value *	2616	key_value *link;
2768	link;
2769		2617
2770	for (link = ob->key_values; link != NULL; link = link->next)	2618	for (link = ob->key_values; link != NULL; link = link->next)
2771	{
2772	if (link->key == key)	2619	if (link->key == key)
2773	{
2774	return link;	2620	return link;
2775	}
2776	}
2777		2621
2778	return NULL;	2622	return NULL;
2779	}	2623	}
2780		2624
2781	/*	2625	/*
…		…
2786	* The returned string is shared.	2630	* The returned string is shared.
2787	*/	2631	*/
2788	const char *	2632	const char *
2789	get_ob_key_value (const object *op, const char *const key)	2633	get_ob_key_value (const object *op, const char *const key)
2790	{	2634	{
2791	key_value *	2635	key_value *link;
2792	link;	2636	shstr_cmp canonical_key (key);
2793	const char *
2794	canonical_key;
2795		2637
2796	canonical_key = shstr::find (key);
2797
2798	if (canonical_key == NULL)	2638	if (!canonical_key)
2799	{	2639	{
2800	/* 1. There being a field named key on any object	2640	/* 1. There being a field named key on any object
2801	* implies there'd be a shared string to find.	2641	* implies there'd be a shared string to find.
2802	* 2. Since there isn't, no object has this field.	2642	* 2. Since there isn't, no object has this field.
2803	* 3. Therefore, *this* object doesn't have this field.	2643	* 3. Therefore, *this* object doesn't have this field.
2804	*/	2644	*/
2805	return NULL;	2645	return 0;
2806	}	2646	}
2807		2647
2808	/* This is copied from get_ob_key_link() above -	2648	/* This is copied from get_ob_key_link() above -
2809	* only 4 lines, and saves the function call overhead.	2649	* only 4 lines, and saves the function call overhead.
2810	*/	2650	*/
2811	for (link = op->key_values; link != NULL; link = link->next)	2651	for (link = op->key_values; link; link = link->next)
2812	{
2813	if (link->key == canonical_key)	2652	if (link->key == canonical_key)
2814	{
2815	return link->value;	2653	return link->value;
2816	}	2654
2817	}
2818	return NULL;	2655	return 0;
2819	}	2656	}
2820		2657
2821		2658
2822	/*	2659	/*
2823	* Updates the canonical_key in op to value.	2660	* Updates the canonical_key in op to value.
…		…
2908	{	2745	{
2909	shstr key_ (key);	2746	shstr key_ (key);
2910		2747
2911	return set_ob_key_value_s (op, key_, value, add_key);	2748	return set_ob_key_value_s (op, key_, value, add_key);
2912	}	2749	}
		2750
		2751	object::depth_iterator::depth_iterator (object *container)
		2752	: iterator_base (container)
		2753	{
		2754	while (item->inv)
		2755	item = item->inv;
		2756	}
		2757
		2758	void
		2759	object::depth_iterator::next ()
		2760	{
		2761	if (item->below)
		2762	{
		2763	item = item->below;
		2764
		2765	while (item->inv)
		2766	item = item->inv;
		2767	}
		2768	else
		2769	item = item->env;
		2770	}
		2771
		2772	// return a suitable string describing an objetc in enough detail to find it
		2773	const char *
		2774	object::debug_desc (char *info) const
		2775	{
		2776	char info2[256 * 3];
		2777	char *p = info;
		2778
		2779	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2780	count,
		2781	&name,
		2782	title ? " " : "",
		2783	title ? (const char *)title : "");
		2784
		2785	if (env)
		2786	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2787
		2788	if (map)
		2789	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2790
		2791	return info;
		2792	}
		2793
		2794	const char *
		2795	object::debug_desc () const
		2796	{
		2797	static char info[256 * 3];
		2798	return debug_desc (info);
		2799	}
		2800

Diff Legend

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