ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.53 by root, Tue Nov 7 16:30:54 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.25 2006/09/11 01:16:20 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
22		16
23	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
28	*/	22	*/
29		23
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
32	variable. */	26	variable. */
33	#include <global.h>	27	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	28	#include <stdio.h>
36	# include <sys/types.h>	29	#include <sys/types.h>
37	# include <sys/uio.h>	30	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	31	#include <object.h>
40	#include <funcpoint.h>	32	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	33	#include <loader.h>
		34
43	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
44		38
45	object *objects; /* Pointer to the list of used objects */
46	object *active_objects; /* List of active objects that need to be processed */	39	object *active_objects; /* List of active objects that need to be processed */
47		40
48	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
49	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
50	};	43	};
…		…
56	};	49	};
57	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
58	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
59	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
60	};	53	};
		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: %lld\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	}
61		131
62	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
63	static int	133	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	135	{
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	285	return 0;
216		286
217	switch (ob1->type)	287	switch (ob1->type)
218	{	288	{
219	case SCROLL:	289	case SCROLL:
220	if (ob1->level != ob2->level)	290	if (ob1->level != ob2->level)
221	return 0;	291	return 0;
222	break;	292	break;
223	}	293	}
224		294
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	295	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	296	{
227	/* At least one of these has key_values. */	297	/* At least one of these has key_values. */
…		…
249	/*	319	/*
250	* sum_weight() is a recursive function which calculates the weight	320	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	321	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	322	* containers are carrying, and sums it up.
253	*/	323	*/
254	signed long	324	long
255	sum_weight (object *op)	325	sum_weight (object *op)
256	{	326	{
257	signed long sum;	327	long sum;
258	object *inv;	328	object *inv;
259		329
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	331	{
262	if (inv->inv)	332	if (inv->inv)
263	sum_weight (inv);	333	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	335	}
		336
266	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
268	if (op->carrying != sum)	340	if (op->carrying != sum)
269	op->carrying = sum;	341	op->carrying = sum;
		342
270	return sum;	343	return sum;
271	}	344	}
272		345
273	/**	346	/**
274	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	375	* Some error messages.
303	* 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.
304	*/	377	*/
305		378
306	void	379	char *
307	dump_object2 (object *op)
308	{
309	errmsg[0] = 0;
310	return;
311	//TODO//D#d#
312	#if 0
313	char *cp;
314
315	/* object *tmp;*/
316
317	if (op->arch != NULL)
318	{
319	strcat (errmsg, "arch ");
320	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
321	strcat (errmsg, "\n");
322	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
323	strcat (errmsg, cp);
324	# if 0
325	/* Don't dump player diffs - they are too long, mostly meaningless, and
326	* will overflow the buffer.
327	* Changed so that we don't dump inventory either. This may
328	* also overflow the buffer.
329	*/
330	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
331	strcat (errmsg, cp);
332	for (tmp = op->inv; tmp; tmp = tmp->below)
333	dump_object2 (tmp);
334	# endif
335	strcat (errmsg, "end\n");
336	}
337	else
338	{
339	strcat (errmsg, "Object ");
340	if (op->name == NULL)
341	strcat (errmsg, "(null)");
342	else
343	strcat (errmsg, op->name);
344	strcat (errmsg, "\n");
345	# if 0
346	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
347	strcat (errmsg, cp);
348	for (tmp = op->inv; tmp; tmp = tmp->below)
349	dump_object2 (tmp);
350	# endif
351	strcat (errmsg, "end\n");
352	}
353	#endif
354	}
355
356	/*
357	* Dumps an object. Returns output in the static global errmsg array.
358	*/
359
360	void
361	dump_object (object *op)	380	dump_object (object *op)
362	{	381	{
363	if (op == NULL)	382	if (!op)
364	{	383	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		384
372	void	385	object_freezer freezer;
373	dump_all_objects (void)	386	save_object (freezer, op, 3);
374	{	387	return freezer.as_string ();
375	object *op;
376
377	for (op = objects; op != NULL; op = op->next)
378	{
379	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}
382	}	388	}
383		389
384	/*	390	/*
385	* 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
386	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
408	object *	414	object *
409	find_object (tag_t i)	415	find_object (tag_t i)
410	{	416	{
411	object *op;	417	object *op;
412		418
413	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
414	if (op->count == i)	420	if (op->count == i)
415	break;	421	break;
		422
416	return op;	423	return op;
417	}	424	}
418		425
419	/*	426	/*
420	* Returns the first object which has a name equal to the argument.	427	* Returns the first object which has a name equal to the argument.
…		…
423	*/	430	*/
424		431
425	object *	432	object *
426	find_object_name (const char *str)	433	find_object_name (const char *str)
427	{	434	{
428	const char *name = shstr::find (str);	435	shstr_cmp str_ (str);
429	object *op;	436	object *op;
430		437
431	for (op = objects; op != NULL; op = op->next)	438	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	439	if (op->name == str_)
433	break;	440	break;
434		441
435	return op;	442	return op;
436	}	443	}
437		444
…		…
440	{	447	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	448	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	449	}
443		450
444	/*	451	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	452	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	453	* skill and experience objects.
485	*/	454	*/
486	void	455	void
487	set_owner (object *op, object *owner)	456	object::set_owner (object *owner)
488	{	457	{
489	if (owner == NULL || op == NULL)	458	if (!owner)
490	return;	459	return;
491		460
492	/* next line added to allow objects which own objects */	461	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	462	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	463	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	464	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	465	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	466	* didn't match, this check is valid and I believe that cause is valid.
498	*/	467	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	468	while (owner->owner)
500	owner = owner->owner;	469	owner = owner->owner;
501		470
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	471	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object *op, object *clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	472	}
542		473
543	/* Zero the key_values on op, decrementing the shared-string	474	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	475	* refcounts and freeing the links.
545	*/	476	*/
…		…
561	{	492	{
562	attachable_base::clear ();	493	attachable_base::clear ();
563		494
564	free_key_values (this);	495	free_key_values (this);
565		496
566	clear_owner (this);	497	owner = 0;
567
568	name = 0;	498	name = 0;
569	name_pl = 0;	499	name_pl = 0;
570	title = 0;	500	title = 0;
571	race = 0;	501	race = 0;
572	slaying = 0;	502	slaying = 0;
573	skill = 0;	503	skill = 0;
574	msg = 0;	504	msg = 0;
575	lore = 0;	505	lore = 0;
576	custom_name = 0;	506	custom_name = 0;
577	materialname = 0;	507	materialname = 0;
		508	contr = 0;
		509	below = 0;
		510	above = 0;
		511	inv = 0;
		512	container = 0;
		513	env = 0;
		514	more = 0;
		515	head = 0;
		516	map = 0;
		517	active_next = 0;
		518	active_prev = 0;
578		519
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		521
581	SET_FLAG (this, FLAG_REMOVED);	522	SET_FLAG (this, FLAG_REMOVED);
		523
		524	/* What is not cleared is next, prev, and count */
		525
		526	expmul = 1.0;
		527	face = blank_face;
		528
		529	if (settings.casting_time)
		530	casting_time = -1;
582	}	531	}
583		532
584	void object::clone (object *destination)	533	void object::clone (object *destination)
585	{	534	{
586	*(object_copy *) destination = *this;	535	*(object_copy *)destination = *this;
587	*(object_pod *) destination = *this;	536	*(object_pod *)destination = *this;
588		537
589	if (self || cb)	538	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	539	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */
616
617	op->expmul = 1.0;
618	op->face = blank_face;
619	op->attacked_by_count = -1;
620
621	if (settings.casting_time)
622	op->casting_time = -1;
623	}	540	}
624		541
625	/*	542	/*
626	* copy object first frees everything allocated by the second object,	543	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	544	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	545	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	546	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
630	* if the first object is freed, the pointers in the new object	547	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	548	* will point at garbage.
632	*/	549	*/
633
634	void	550	void
635	copy_object (object *op2, object *op)	551	copy_object (object *op2, object *op)
636	{	552	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	553	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	554	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	614	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	615	* Updates the speed of an object. If the speed changes from 0 to another
700	* value, or vice versa, then add/remove the object from the active list.	616	* value, or vice versa, then add/remove the object from the active list.
701	* This function needs to be called whenever the speed of an object changes.	617	* This function needs to be called whenever the speed of an object changes.
702	*/	618	*/
703
704	void	619	void
705	update_ob_speed (object *op)	620	update_ob_speed (object *op)
706	{	621	{
707	extern int arch_init;	622	extern int arch_init;
708		623
…		…
717	abort ();	632	abort ();
718	#else	633	#else
719	op->speed = 0;	634	op->speed = 0;
720	#endif	635	#endif
721	}	636	}
		637
722	if (arch_init)	638	if (arch_init)
723	{
724	return;	639	return;
725	}	640
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	642	{
728	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	644	if (op->active_next || op->active_prev || op == active_objects)
730	return;	645	return;
731		646
732	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	648	* of the list. */
734	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
735	if (op->active_next != NULL)	651	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
737	active_objects = op;	654	active_objects = op;
738	}	655	}
739	else	656	else
740	{	657	{
741	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
743	return;	660	return;
744		661
745	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
746	{	663	{
747	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
748	if (op->active_next != NULL)	666	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
750	}	668	}
751	else	669	else
752	{	670	{
753	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
754	if (op->active_next)	673	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
756	}	675	}
		676
757	op->active_next = NULL;	677	op->active_next = NULL;
758	op->active_prev = NULL;	678	op->active_prev = NULL;
759	}	679	}
760	}	680	}
761		681
…		…
891	/* if the object is being removed, we can't make intelligent	811	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	812	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	813	* that is being removed.
894	*/	814	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	816	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	817	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	818	/* Nothing to do for that case */ ;
902	}
903	else	819	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	820	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		821
908	if (update_now)	822	if (update_now)
909	{	823	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	824	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	825	update_position (op->map, op->x, op->y);
…		…
913		827
914	if (op->more != NULL)	828	if (op->more != NULL)
915	update_object (op->more, action);	829	update_object (op->more, action);
916	}	830	}
917		831
918	static unordered_vector<object *> mortals;	832	object::vector object::mortals;
919	static std::vector<object *> freed;	833	object::vector object::objects; // not yet used
		834	object *object::first;
920		835
921	void object::free_mortals ()	836	void object::free_mortals ()
922	{	837	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	839	if ((*i)->refcnt)
		840	++i; // further delay freeing
		841	else
925	{	842	{
926	freed.push_back (*i);	843	delete *i;
927	mortals.erase (i);	844	mortals.erase (i);
928	}	845	}
929	else	846
930	++i;	847	static int lastmortals = 0;//D
		848
		849	if (mortals.size() != lastmortals && lastmortals > 100)//D
		850	{
		851	lastmortals = mortals.size ();//D
		852	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		853	}
931	}	854	}
932		855
933	object::object ()	856	object::object ()
934	{	857	{
935	SET_FLAG (this, FLAG_REMOVED);	858	SET_FLAG (this, FLAG_REMOVED);
936		859
937	expmul = 1.0;	860	expmul = 1.0;
938	face = blank_face;	861	face = blank_face;
939	attacked_by_count = -1;
940	}	862	}
941		863
942	object::~object ()	864	object::~object ()
943	{	865	{
944	free_key_values (this);	866	free_key_values (this);
945	}	867	}
946		868
947	void object::link ()	869	void object::link ()
948	{	870	{
949	count = ++ob_count;	871	count = ++ob_count;
		872	uuid = gen_uuid ();
950		873
951	prev = 0;	874	prev = 0;
952	next = objects;	875	next = object::first;
953		876
954	if (objects)	877	if (object::first)
955	objects->prev = this;	878	object::first->prev = this;
956		879
957	objects = this;	880	object::first = this;
958	}	881	}
959		882
960	void object::unlink ()	883	void object::unlink ()
961	{	884	{
962	count = 0;	885	if (this == object::first)
		886	object::first = next;
963		887
964	/* Remove this object from the list of used objects */	888	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	889	if (prev) prev->next = next;
		890	if (next) next->prev = prev;
		891
968	prev = 0;	892	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	893	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	894	}
980		895
981	object *object::create ()	896	object *object::create ()
982	{	897	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	898	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	899	op->link ();
996	return op;	900	return op;
997	}	901	}
998		902
999	/*	903	/*
…		…
1001	* it from the list of used objects, and puts it on the list of	905	* it from the list of used objects, and puts it on the list of
1002	* free objects. The IS_FREED() flag is set in the object.	906	* free objects. The IS_FREED() flag is set in the object.
1003	* The object must have been removed by remove_ob() first for	907	* The object must have been removed by remove_ob() first for
1004	* this function to succeed.	908	* this function to succeed.
1005	*	909	*
1006	* If free_inventory is set, free inventory as well. Else drop items in	910	* If destroy_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	911	* inventory to the ground.
1008	*/	912	*/
1009	void object::free (bool free_inventory)	913	void object::destroy (bool destroy_inventory)
1010	{	914	{
		915	if (QUERY_FLAG (this, FLAG_FREED))
		916	return;
		917
		918	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		919	remove_friendly_object (this);
		920
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	921	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	922	remove_ob (this);
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		923
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	924	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		925
1033	if (more)	926	if (more)
1034	{	927	{
1035	more->free (free_inventory);	928	more->destroy (destroy_inventory);
1036	more = 0;	929	more = 0;
1037	}	930	}
1038		931
1039	if (inv)	932	if (inv)
1040	{	933	{
1041	/* Only if the space blocks everything do we not process -	934	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	935	* if some form of movement is allowed, let objects
1043	* drop on that space.	936	* drop on that space.
1044	*/	937	*/
1045	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	938	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046	{	939	{
1047	object *	940	object *op = inv;
1048	op = inv;
1049		941
1050	while (op)	942	while (op)
1051	{	943	{
1052	object *
1053	tmp = op->below;	944	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	945	op->destroy (destroy_inventory);
1057	op = tmp;	946	op = tmp;
1058	}	947	}
1059	}	948	}
1060	else	949	else
1061	{ /* Put objects in inventory onto this space */	950	{ /* Put objects in inventory onto this space */
1062	object *	951	object *op = inv;
1063	op = inv;
1064		952
1065	while (op)	953	while (op)
1066	{	954	{
1067	object *
1068	tmp = op->below;	955	object *tmp = op->below;
1069		956
1070	remove_ob (op);	957	remove_ob (op);
1071		958
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	959	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	960	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1082	op = tmp;	969	op = tmp;
1083	}	970	}
1084	}	971	}
1085	}	972	}
1086		973
1087	clear_owner (this);	974	// clear those pointers that likely might have circular references to us
		975	owner = 0;
		976	enemy = 0;
		977	attacked_by = 0;
		978
		979	// only relevant for players(?), but make sure of it anyways
		980	contr = 0;
1088		981
1089	/* Remove object from the active list */	982	/* Remove object from the active list */
1090	speed = 0;	983	speed = 0;
1091	update_ob_speed (this);	984	update_ob_speed (this);
1092		985
1093	unlink ();	986	unlink ();
1094		987
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	988	mortals.push_back (this);
1098	}	989	}
1099		990
1100	/*	991	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	992	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1106	sub_weight (object *op, signed long weight)	997	sub_weight (object *op, signed long weight)
1107	{	998	{
1108	while (op != NULL)	999	while (op != NULL)
1109	{	1000	{
1110	if (op->type == CONTAINER)	1001	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1002	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1003
1114	op->carrying -= weight;	1004	op->carrying -= weight;
1115	op = op->env;	1005	op = op->env;
1116	}	1006	}
1117	}	1007	}
1118		1008
…		…
1126	*/	1016	*/
1127		1017
1128	void	1018	void
1129	remove_ob (object *op)	1019	remove_ob (object *op)
1130	{	1020	{
		1021	object *tmp, *last = 0;
1131	object *	1022	object *otmp;
1132	tmp, *	1023
1133	last = NULL;
1134	object *
1135	otmp;
1136	tag_t
1137	tag;
1138	int
1139	check_walk_off;	1024	int check_walk_off;
1140	mapstruct *	1025	maptile *m;
1141	m;
1142	sint16
1143	x,
1144	y;
1145		1026
		1027	sint16 x, y;
1146		1028
1147	if (QUERY_FLAG (op, FLAG_REMOVED))	1029	if (QUERY_FLAG (op, FLAG_REMOVED))
1148	{	1030	return;
1149	dump_object (op);
1150	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151		1031
1152	/* Changed it to always dump core in this case. As has been learned	1032	SET_FLAG (op, FLAG_REMOVED);
1153	* in the past, trying to recover from errors almost always	1033
1154	* make things worse, and this is a real error here - something
1155	* that should not happen.
1156	* Yes, if this was a mission critical app, trying to do something
1157	* to recover may make sense, but that is because failure of the app
1158	* may have other disastrous problems. Cf runs out of a script
1159	* so is easily enough restarted without any real problems.
1160	* MSW 2001-07-01
1161	*/
1162	abort ();
1163	}
1164	if (op->more != NULL)	1034	if (op->more != NULL)
1165	remove_ob (op->more);	1035	remove_ob (op->more);
1166
1167	SET_FLAG (op, FLAG_REMOVED);
1168		1036
1169	/*	1037	/*
1170	* In this case, the object to be removed is in someones	1038	* In this case, the object to be removed is in someones
1171	* inventory.	1039	* inventory.
1172	*/	1040	*/
…		…
1198	*/	1066	*/
1199	op->x = op->env->x, op->y = op->env->y;	1067	op->x = op->env->x, op->y = op->env->y;
1200	op->map = op->env->map;	1068	op->map = op->env->map;
1201	op->above = NULL, op->below = NULL;	1069	op->above = NULL, op->below = NULL;
1202	op->env = NULL;	1070	op->env = NULL;
1203	return;	1071	}
		1072	else if (op->map)
1204	}	1073	{
1205
1206	/* If we get here, we are removing it from a map */
1207	if (op->map == NULL)
1208	return;
1209
1210	x = op->x;	1074	x = op->x;
1211	y = op->y;	1075	y = op->y;
1212	m = get_map_from_coord (op->map, &x, &y);	1076	m = get_map_from_coord (op->map, &x, &y);
1213		1077
1214	if (!m)	1078	if (!m)
1215	{	1079	{
1216	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1080	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1217	op->map->path, op->x, op->y);	1081	op->map->path, op->x, op->y);
1218	/* in old days, we used to set x and y to 0 and continue.	1082	/* in old days, we used to set x and y to 0 and continue.
1219	* it seems if we get into this case, something is probablye	1083	* it seems if we get into this case, something is probablye
1220	* screwed up and should be fixed.	1084	* screwed up and should be fixed.
		1085	*/
		1086	abort ();
		1087	}
		1088
		1089	if (op->map != m)
		1090	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1091	op->map->path, m->path, op->x, op->y, x, y);
		1092
		1093	/* Re did the following section of code - it looks like it had
		1094	* lots of logic for things we no longer care about
1221	*/	1095	*/
1222	abort ();
1223	}
1224	if (op->map != m)
1225	{
1226	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227	op->map->path, m->path, op->x, op->y, x, y);
1228	}
1229		1096
1230	/* Re did the following section of code - it looks like it had
1231	* lots of logic for things we no longer care about
1232	*/
1233
1234	/* link the object above us */	1097	/* link the object above us */
1235	if (op->above)	1098	if (op->above)
1236	op->above->below = op->below;	1099	op->above->below = op->below;
1237	else	1100	else
1238	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1101	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1239		1102
1240	/* Relink the object below us, if there is one */	1103	/* Relink the object below us, if there is one */
1241	if (op->below)	1104	if (op->below)
1242	{
1243	op->below->above = op->above;	1105	op->below->above = op->above;
1244	}
1245	else	1106	else
1246	{	1107	{
1247	/* Nothing below, which means we need to relink map object for this space	1108	/* Nothing below, which means we need to relink map object for this space
1248	* use translated coordinates in case some oddness with map tiling is	1109	* use translated coordinates in case some oddness with map tiling is
1249	* evident	1110	* evident
1250	*/
1251	if (GET_MAP_OB (m, x, y) != op)
1252	{
1253	dump_object (op);
1254	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1255	errmsg);
1256	dump_object (GET_MAP_OB (m, x, y));
1257	LOG (llevError, "%s\n", errmsg);
1258	}
1259	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260	}
1261	op->above = NULL;
1262	op->below = NULL;
1263
1264	if (op->map->in_memory == MAP_SAVING)
1265	return;
1266
1267	tag = op->count;
1268	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1269	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1270	{
1271	/* No point updating the players look faces if he is the object
1272	* being removed.
1273	*/
1274
1275	if (tmp->type == PLAYER && tmp != op)
1276	{
1277	/* If a container that the player is currently using somehow gets
1278	* removed (most likely destroyed), update the player view
1279	* appropriately.
1280	*/	1111	*/
1281	if (tmp->container == op)	1112	if (GET_MAP_OB (m, x, y) != op)
1282	{	1113	{
1283	CLEAR_FLAG (op, FLAG_APPLIED);	1114	char *dump = dump_object (op);
1284	tmp->container = NULL;	1115	LOG (llevError,
		1116	"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);
		1117	free (dump);
		1118	dump = dump_object (GET_MAP_OB (m, x, y));
		1119	LOG (llevError, "%s\n", dump);
		1120	free (dump);
1285	}	1121	}
1286	tmp->contr->socket.update_look = 1;	1122
1287	}	1123	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1288	/* See if player moving off should effect something */
1289	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290	{	1124	}
1291		1125
1292	move_apply (tmp, op, NULL);	1126	op->above = 0;
1293	if (was_destroyed (op, tag))	1127	op->below = 0;
		1128
		1129	if (op->map->in_memory == MAP_SAVING)
		1130	return;
		1131
		1132	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1133
		1134	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1135	{
		1136	/* No point updating the players look faces if he is the object
		1137	* being removed.
		1138	*/
		1139
		1140	if (tmp->type == PLAYER && tmp != op)
1294	{	1141	{
1295	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1142	/* If a container that the player is currently using somehow gets
		1143	* removed (most likely destroyed), update the player view
		1144	* appropriately.
		1145	*/
		1146	if (tmp->container == op)
		1147	{
		1148	CLEAR_FLAG (op, FLAG_APPLIED);
		1149	tmp->container = NULL;
		1150	}
		1151
		1152	tmp->contr->socket.update_look = 1;
1296	}	1153	}
		1154
		1155	/* See if player moving off should effect something */
		1156	if (check_walk_off
		1157	&& ((op->move_type & tmp->move_off)
		1158	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1159	{
		1160	move_apply (tmp, op, NULL);
		1161
		1162	if (op->destroyed ())
		1163	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1297	}	1164	}
1298		1165
1299	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1166	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300		1167
1301	if (tmp->above == tmp)	1168	if (tmp->above == tmp)
1302	tmp->above = NULL;	1169	tmp->above = NULL;
		1170
1303	last = tmp;	1171	last = tmp;
1304	}	1172	}
		1173
1305	/* last == NULL of there are no objects on this space */	1174	/* last == NULL of there are no objects on this space */
1306	if (last == NULL)	1175	if (last == NULL)
1307	{	1176	{
1308	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1177	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1178	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1310	* those out anyways, and if there are any flags set right now, they won't	1179	* those out anyways, and if there are any flags set right now, they won't
1311	* be correct anyways.	1180	* be correct anyways.
1312	*/	1181	*/
1313	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1182	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1314	update_position (op->map, op->x, op->y);	1183	update_position (op->map, op->x, op->y);
1315	}	1184	}
1316	else	1185	else
1317	update_object (last, UP_OBJ_REMOVE);	1186	update_object (last, UP_OBJ_REMOVE);
1318		1187
1319	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1188	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1320	update_all_los (op->map, op->x, op->y);	1189	update_all_los (op->map, op->x, op->y);
1321		1190	}
1322	}	1191	}
1323		1192
1324	/*	1193	/*
1325	* merge_ob(op,top):	1194	* merge_ob(op,top):
1326	*	1195	*
1327	* This function goes through all objects below and including top, and	1196	* This function goes through all objects below and including top, and
1328	* merges op to the first matching object.	1197	* merges op to the first matching object.
1329	* If top is NULL, it is calculated.	1198	* If top is NULL, it is calculated.
1330	* Returns pointer to object if it succeded in the merge, otherwise NULL	1199	* Returns pointer to object if it succeded in the merge, otherwise NULL
1331	*/	1200	*/
1332
1333	object *	1201	object *
1334	merge_ob (object *op, object *top)	1202	merge_ob (object *op, object *top)
1335	{	1203	{
1336	if (!op->nrof)	1204	if (!op->nrof)
1337	return 0;	1205	return 0;
		1206
1338	if (top == NULL)	1207	if (top == NULL)
1339	for (top = op; top != NULL && top->above != NULL; top = top->above);	1208	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1209
1340	for (; top != NULL; top = top->below)	1210	for (; top != NULL; top = top->below)
1341	{	1211	{
1342	if (top == op)	1212	if (top == op)
1343	continue;	1213	continue;
1344	if (CAN_MERGE (op, top))	1214	if (CAN_MERGE (op, top))
…		…
1350	remove_ob (op);	1220	remove_ob (op);
1351	free_object (op);	1221	free_object (op);
1352	return top;	1222	return top;
1353	}	1223	}
1354	}	1224	}
		1225
1355	return NULL;	1226	return 0;
1356	}	1227	}
1357		1228
1358	/*	1229	/*
1359	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1230	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1360	* job preparing multi-part monsters	1231	* job preparing multi-part monsters
1361	*/	1232	*/
1362	object *	1233	object *
1363	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1234	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1364	{	1235	{
1365	object *	1236	object *tmp;
1366	tmp;
1367		1237
1368	if (op->head)	1238	if (op->head)
1369	op = op->head;	1239	op = op->head;
		1240
1370	for (tmp = op; tmp; tmp = tmp->more)	1241	for (tmp = op; tmp; tmp = tmp->more)
1371	{	1242	{
1372	tmp->x = x + tmp->arch->clone.x;	1243	tmp->x = x + tmp->arch->clone.x;
1373	tmp->y = y + tmp->arch->clone.y;	1244	tmp->y = y + tmp->arch->clone.y;
1374	}	1245	}
		1246
1375	return insert_ob_in_map (op, m, originator, flag);	1247	return insert_ob_in_map (op, m, originator, flag);
1376	}	1248	}
1377		1249
1378	/*	1250	/*
1379	* insert_ob_in_map (op, map, originator, flag):	1251	* insert_ob_in_map (op, map, originator, flag):
…		…
1395	* NULL if 'op' was destroyed	1267	* NULL if 'op' was destroyed
1396	* just 'op' otherwise	1268	* just 'op' otherwise
1397	*/	1269	*/
1398		1270
1399	object *	1271	object *
1400	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1272	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1401	{	1273	{
1402	object *tmp, *top, *floor = NULL;	1274	object *tmp, *top, *floor = NULL;
1403	sint16 x, y;	1275	sint16 x, y;
1404		1276
1405	if (QUERY_FLAG (op, FLAG_FREED))	1277	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1408	return NULL;	1280	return NULL;
1409	}	1281	}
1410		1282
1411	if (m == NULL)	1283	if (m == NULL)
1412	{	1284	{
1413	dump_object (op);	1285	char *dump = dump_object (op);
1414	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1286	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1287	free (dump);
1415	return op;	1288	return op;
1416	}	1289	}
1417		1290
1418	if (out_of_map (m, op->x, op->y))	1291	if (out_of_map (m, op->x, op->y))
1419	{	1292	{
1420	dump_object (op);	1293	char *dump = dump_object (op);
1421	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1294	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1422	#ifdef MANY_CORES	1295	#ifdef MANY_CORES
1423	/* Better to catch this here, as otherwise the next use of this object	1296	/* Better to catch this here, as otherwise the next use of this object
1424	* is likely to cause a crash. Better to find out where it is getting	1297	* is likely to cause a crash. Better to find out where it is getting
1425	* improperly inserted.	1298	* improperly inserted.
1426	*/	1299	*/
1427	abort ();	1300	abort ();
1428	#endif	1301	#endif
		1302	free (dump);
1429	return op;	1303	return op;
1430	}	1304	}
1431		1305
1432	if (!QUERY_FLAG (op, FLAG_REMOVED))	1306	if (!QUERY_FLAG (op, FLAG_REMOVED))
1433	{	1307	{
1434	dump_object (op);	1308	char *dump = dump_object (op);
1435	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1309	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1310	free (dump);
1436	return op;	1311	return op;
1437	}	1312	}
1438		1313
1439	if (op->more != NULL)	1314	if (op->more != NULL)
1440	{	1315	{
1441	/* The part may be on a different map. */	1316	/* The part may be on a different map. */
1442		1317
1443	object *
1444	more = op->more;	1318	object *more = op->more;
1445		1319
1446	/* We really need the caller to normalize coordinates - if	1320	/* We really need the caller to normalize coordinates - if
1447	* we set the map, that doesn't work if the location is within	1321	* we set the map, that doesn't work if the location is within
1448	* a map and this is straddling an edge. So only if coordinate	1322	* a map and this is straddling an edge. So only if coordinate
1449	* is clear wrong do we normalize it.	1323	* is clear wrong do we normalize it.
1450	*/	1324	*/
1451	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1325	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452	{
1453	more->map = get_map_from_coord (m, &more->x, &more->y);	1326	more->map = get_map_from_coord (m, &more->x, &more->y);
1454	}
1455	else if (!more->map)	1327	else if (!more->map)
1456	{	1328	{
1457	/* For backwards compatibility - when not dealing with tiled maps,	1329	/* For backwards compatibility - when not dealing with tiled maps,
1458	* more->map should always point to the parent.	1330	* more->map should always point to the parent.
1459	*/	1331	*/
…		…
1462		1334
1463	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1335	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464	{	1336	{
1465	if (!op->head)	1337	if (!op->head)
1466	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1338	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1339
1467	return NULL;	1340	return NULL;
1468	}	1341	}
1469	}	1342	}
1470		1343
1471	CLEAR_FLAG (op, FLAG_REMOVED);	1344	CLEAR_FLAG (op, FLAG_REMOVED);
…		…
1536		1409
1537	while (top != NULL)	1410	while (top != NULL)
1538	{	1411	{
1539	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1412	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540	floor = top;	1413	floor = top;
		1414
1541	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1415	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542	{	1416	{
1543	/* We insert above top, so we want this object below this */	1417	/* We insert above top, so we want this object below this */
1544	top = top->below;	1418	top = top->below;
1545	break;	1419	break;
1546	}	1420	}
		1421
1547	last = top;	1422	last = top;
1548	top = top->above;	1423	top = top->above;
1549	}	1424	}
		1425
1550	/* Don't want top to be NULL, so set it to the last valid object */	1426	/* Don't want top to be NULL, so set it to the last valid object */
1551	top = last;	1427	top = last;
1552		1428
1553	/* We let update_position deal with figuring out what the space	1429	/* We let update_position deal with figuring out what the space
1554	* looks like instead of lots of conditions here.	1430	* looks like instead of lots of conditions here.
…		…
1633	* of effect may be sufficient.	1509	* of effect may be sufficient.
1634	*/	1510	*/
1635	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1511	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636	update_all_los (op->map, op->x, op->y);	1512	update_all_los (op->map, op->x, op->y);
1637		1513
1638
1639	/* updates flags (blocked, alive, no magic, etc) for this map space */	1514	/* updates flags (blocked, alive, no magic, etc) for this map space */
1640	update_object (op, UP_OBJ_INSERT);	1515	update_object (op, UP_OBJ_INSERT);
1641
1642		1516
1643	/* Don't know if moving this to the end will break anything. However,	1517	/* Don't know if moving this to the end will break anything. However,
1644	* we want to have update_look set above before calling this.	1518	* we want to have update_look set above before calling this.
1645	*	1519	*
1646	* check_move_on() must be after this because code called from	1520	* check_move_on() must be after this because code called from
…		…
1671	* op is the object to insert it under: supplies x and the map.	1545	* op is the object to insert it under: supplies x and the map.
1672	*/	1546	*/
1673	void	1547	void
1674	replace_insert_ob_in_map (const char *arch_string, object *op)	1548	replace_insert_ob_in_map (const char *arch_string, object *op)
1675	{	1549	{
1676	object *tmp;	1550	object *
		1551	tmp;
1677	object *tmp1;	1552	object *
		1553	tmp1;
1678		1554
1679	/* first search for itself and remove any old instances */	1555	/* first search for itself and remove any old instances */
1680		1556
1681	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1557	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1682	{	1558	{
…		…
1685	remove_ob (tmp);	1561	remove_ob (tmp);
1686	free_object (tmp);	1562	free_object (tmp);
1687	}	1563	}
1688	}	1564	}
1689		1565
1690	tmp1 = arch_to_object (find_archetype (arch_string));	1566	tmp1 = arch_to_object (archetype::find (arch_string));
1691		1567
1692	tmp1->x = op->x;	1568	tmp1->x = op->x;
1693	tmp1->y = op->y;	1569	tmp1->y = op->y;
1694	insert_ob_in_map (tmp1, op->map, op, 0);	1570	insert_ob_in_map (tmp1, op->map, op, 0);
1695	}	1571	}
…		…
1713	if (orig_ob->nrof < nr)	1589	if (orig_ob->nrof < nr)
1714	{	1590	{
1715	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1591	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1716	return NULL;	1592	return NULL;
1717	}	1593	}
		1594
1718	newob = object_create_clone (orig_ob);	1595	newob = object_create_clone (orig_ob);
		1596
1719	if ((orig_ob->nrof -= nr) < 1)	1597	if ((orig_ob->nrof -= nr) < 1)
1720	{	1598	{
1721	if (!is_removed)	1599	if (!is_removed)
1722	remove_ob (orig_ob);	1600	remove_ob (orig_ob);
1723	free_object2 (orig_ob, 1);	1601	free_object2 (orig_ob, 1);
…		…
1731	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1609	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1610	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733	return NULL;	1611	return NULL;
1734	}	1612	}
1735	}	1613	}
		1614
1736	newob->nrof = nr;	1615	newob->nrof = nr;
1737		1616
1738	return newob;	1617	return newob;
1739	}	1618	}
1740		1619
…		…
1747	*/	1626	*/
1748		1627
1749	object *	1628	object *
1750	decrease_ob_nr (object *op, uint32 i)	1629	decrease_ob_nr (object *op, uint32 i)
1751	{	1630	{
1752	object *	1631	object *tmp;
1753	tmp;
1754	player *	1632	player *pl;
1755	pl;
1756		1633
1757	if (i == 0) /* objects with op->nrof require this check */	1634	if (i == 0) /* objects with op->nrof require this check */
1758	return op;	1635	return op;
1759		1636
1760	if (i > op->nrof)	1637	if (i > op->nrof)
1761	i = op->nrof;	1638	i = op->nrof;
1762		1639
1763	if (QUERY_FLAG (op, FLAG_REMOVED))	1640	if (QUERY_FLAG (op, FLAG_REMOVED))
1764	{
1765	op->nrof -= i;	1641	op->nrof -= i;
1766	}
1767	else if (op->env != NULL)	1642	else if (op->env != NULL)
1768	{	1643	{
1769	/* is this object in the players inventory, or sub container	1644	/* is this object in the players inventory, or sub container
1770	* therein?	1645	* therein?
1771	*/	1646	*/
…		…
1806	}	1681	}
1807	}	1682	}
1808	}	1683	}
1809	else	1684	else
1810	{	1685	{
1811	object *
1812	above = op->above;	1686	object *above = op->above;
1813		1687
1814	if (i < op->nrof)	1688	if (i < op->nrof)
1815	{
1816	op->nrof -= i;	1689	op->nrof -= i;
1817	}
1818	else	1690	else
1819	{	1691	{
1820	remove_ob (op);	1692	remove_ob (op);
1821	op->nrof = 0;	1693	op->nrof = 0;
1822	}	1694	}
		1695
1823	/* Since we just removed op, op->above is null */	1696	/* Since we just removed op, op->above is null */
1824	for (tmp = above; tmp != NULL; tmp = tmp->above)	1697	for (tmp = above; tmp != NULL; tmp = tmp->above)
1825	if (tmp->type == PLAYER)	1698	if (tmp->type == PLAYER)
1826	{	1699	{
1827	if (op->nrof)	1700	if (op->nrof)
…		…
1830	esrv_del_item (tmp->contr, op->count);	1703	esrv_del_item (tmp->contr, op->count);
1831	}	1704	}
1832	}	1705	}
1833		1706
1834	if (op->nrof)	1707	if (op->nrof)
1835	{
1836	return op;	1708	return op;
1837	}
1838	else	1709	else
1839	{	1710	{
1840	free_object (op);	1711	free_object (op);
1841	return NULL;	1712	return NULL;
1842	}	1713	}
…		…
1851	add_weight (object *op, signed long weight)	1722	add_weight (object *op, signed long weight)
1852	{	1723	{
1853	while (op != NULL)	1724	while (op != NULL)
1854	{	1725	{
1855	if (op->type == CONTAINER)	1726	if (op->type == CONTAINER)
1856	{
1857	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1727	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858	}	1728
1859	op->carrying += weight;	1729	op->carrying += weight;
1860	op = op->env;	1730	op = op->env;
1861	}	1731	}
1862	}	1732	}
1863		1733
…		…
1882	tmp, *	1752	tmp, *
1883	otmp;	1753	otmp;
1884		1754
1885	if (!QUERY_FLAG (op, FLAG_REMOVED))	1755	if (!QUERY_FLAG (op, FLAG_REMOVED))
1886	{	1756	{
1887	dump_object (op);	1757	char *dump = dump_object (op);
1888	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1758	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1759	free (dump);
1889	return op;	1760	return op;
1890	}	1761	}
		1762
1891	if (where == NULL)	1763	if (where == NULL)
1892	{	1764	{
1893	dump_object (op);	1765	char *dump = dump_object (op);
1894	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1766	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1767	free (dump);
1895	return op;	1768	return op;
1896	}	1769	}
		1770
1897	if (where->head)	1771	if (where->head)
1898	{	1772	{
1899	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1773	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900	where = where->head;	1774	where = where->head;
1901	}	1775	}
		1776
1902	if (op->more)	1777	if (op->more)
1903	{	1778	{
1904	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1779	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905	return op;	1780	return op;
1906	}	1781	}
		1782
1907	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1783	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1784	CLEAR_FLAG (op, FLAG_REMOVED);
1909	if (op->nrof)	1785	if (op->nrof)
1910	{	1786	{
1911	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1787	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1996	*/	1872	*/
1997		1873
1998	int	1874	int
1999	check_move_on (object *op, object *originator)	1875	check_move_on (object *op, object *originator)
2000	{	1876	{
2001	object *	1877	object *tmp;
2002	tmp;	1878	maptile *m = op->map;
2003	tag_t
2004	tag;
2005	mapstruct *
2006	m = op->map;
2007	int
2008	x = op->x, y = op->y;	1879	int x = op->x, y = op->y;
2009	MoveType	1880
2010	move_on,	1881	MoveType move_on, move_slow, move_block;
2011	move_slow,
2012	move_block;
2013		1882
2014	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1883	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2015	return 0;	1884	return 0;
2016
2017	tag = op->count;
2018		1885
2019	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1886	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2020	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1887	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2021	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1888	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2022		1889
…		…
2047	* we don't need to check all of them.	1914	* we don't need to check all of them.
2048	*/	1915	*/
2049	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1916	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050	break;	1917	break;
2051	}	1918	}
		1919
2052	for (; tmp != NULL; tmp = tmp->below)	1920	for (; tmp; tmp = tmp->below)
2053	{	1921	{
2054	if (tmp == op)	1922	if (tmp == op)
2055	continue; /* Can't apply yourself */	1923	continue; /* Can't apply yourself */
2056		1924
2057	/* Check to see if one of the movement types should be slowed down.	1925	/* Check to see if one of the movement types should be slowed down.
…		…
2065	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1933	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2066	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1934	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067	{	1935	{
2068		1936
2069	float	1937	float
2070	diff;
2071
2072	diff = tmp->move_slow_penalty * FABS (op->speed);	1938	diff = tmp->move_slow_penalty * FABS (op->speed);
		1939
2073	if (op->type == PLAYER)	1940	if (op->type == PLAYER)
2074	{
2075	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1941	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2076	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1942	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077	{
2078	diff /= 4.0;	1943	diff /= 4.0;
2079	}	1944
2080	}
2081	op->speed_left -= diff;	1945	op->speed_left -= diff;
2082	}	1946	}
2083	}	1947	}
2084		1948
2085	/* Basically same logic as above, except now for actual apply. */	1949	/* Basically same logic as above, except now for actual apply. */
2086	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1950	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2087	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1951	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088	{	1952	{
2089
2090	move_apply (tmp, op, originator);	1953	move_apply (tmp, op, originator);
		1954
2091	if (was_destroyed (op, tag))	1955	if (op->destroyed ())
2092	return 1;	1956	return 1;
2093		1957
2094	/* what the person/creature stepped onto has moved the object	1958	/* what the person/creature stepped onto has moved the object
2095	* someplace new. Don't process any further - if we did,	1959	* someplace new. Don't process any further - if we did,
2096	* have a feeling strange problems would result.	1960	* have a feeling strange problems would result.
2097	*/	1961	*/
2098	if (op->map != m || op->x != x || op->y != y)	1962	if (op->map != m || op->x != x || op->y != y)
2099	return 0;	1963	return 0;
2100	}	1964	}
2101	}	1965	}
		1966
2102	return 0;	1967	return 0;
2103	}	1968	}
2104		1969
2105	/*	1970	/*
2106	* present_arch(arch, map, x, y) searches for any objects with	1971	* present_arch(arch, map, x, y) searches for any objects with
2107	* a matching archetype at the given map and coordinates.	1972	* a matching archetype at the given map and coordinates.
2108	* The first matching object is returned, or NULL if none.	1973	* The first matching object is returned, or NULL if none.
2109	*/	1974	*/
2110		1975
2111	object *	1976	object *
2112	present_arch (const archetype *at, mapstruct *m, int x, int y)	1977	present_arch (const archetype *at, maptile *m, int x, int y)
2113	{	1978	{
2114	object *	1979	object *
2115	tmp;	1980	tmp;
2116		1981
2117	if (m == NULL || out_of_map (m, x, y))	1982	if (m == NULL || out_of_map (m, x, y))
…		…
2130	* a matching type variable at the given map and coordinates.	1995	* a matching type variable at the given map and coordinates.
2131	* The first matching object is returned, or NULL if none.	1996	* The first matching object is returned, or NULL if none.
2132	*/	1997	*/
2133		1998
2134	object *	1999	object *
2135	present (unsigned char type, mapstruct *m, int x, int y)	2000	present (unsigned char type, maptile *m, int x, int y)
2136	{	2001	{
2137	object *	2002	object *
2138	tmp;	2003	tmp;
2139		2004
2140	if (out_of_map (m, x, y))	2005	if (out_of_map (m, x, y))
…		…
2280	* the archetype because that isn't correct if the monster has been	2145	* the archetype because that isn't correct if the monster has been
2281	* customized, changed states, etc.	2146	* customized, changed states, etc.
2282	*/	2147	*/
2283		2148
2284	int	2149	int
2285	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2150	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2286	{	2151	{
2287	int	2152	int
2288	i,	2153	i,
2289	index = 0, flag;	2154	index = 0, flag;
2290	static int	2155	static int
…		…
2311	return -1;	2176	return -1;
2312	return altern[RANDOM () % index];	2177	return altern[RANDOM () % index];
2313	}	2178	}
2314		2179
2315	/*	2180	/*
2316	* find_first_free_spot(archetype, mapstruct, x, y) works like	2181	* find_first_free_spot(archetype, maptile, x, y) works like
2317	* find_free_spot(), but it will search max number of squares.	2182	* find_free_spot(), but it will search max number of squares.
2318	* But it will return the first available spot, not a random choice.	2183	* But it will return the first available spot, not a random choice.
2319	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2184	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2320	*/	2185	*/
2321		2186
2322	int	2187	int
2323	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2188	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2324	{	2189	{
2325	int	2190	int
2326	i;	2191	i;
2327		2192
2328	for (i = 0; i < SIZEOFFREE; i++)	2193	for (i = 0; i < SIZEOFFREE; i++)
…		…
2392	* because we have to know what movement the thing looking to move	2257	* because we have to know what movement the thing looking to move
2393	* there is capable of.	2258	* there is capable of.
2394	*/	2259	*/
2395		2260
2396	int	2261	int
2397	find_dir (mapstruct *m, int x, int y, object *exclude)	2262	find_dir (maptile *m, int x, int y, object *exclude)
2398	{	2263	{
2399	int	2264	int
2400	i,	2265	i,
2401	max = SIZEOFFREE, mflags;	2266	max = SIZEOFFREE, mflags;
2402	sint16	2267
2403	nx,	2268	sint16 nx, ny;
2404	ny;
2405	object *	2269	object *
2406	tmp;	2270	tmp;
2407	mapstruct *	2271	maptile *
2408	mp;	2272	mp;
2409	MoveType	2273
2410	blocked,	2274	MoveType blocked, move_type;
2411	move_type;
2412		2275
2413	if (exclude && exclude->head)	2276	if (exclude && exclude->head)
2414	{	2277	{
2415	exclude = exclude->head;	2278	exclude = exclude->head;
2416	move_type = exclude->move_type;	2279	move_type = exclude->move_type;
…		…
2621	* Modified to be map tile aware -.MSW	2484	* Modified to be map tile aware -.MSW
2622	*/	2485	*/
2623		2486
2624		2487
2625	int	2488	int
2626	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2489	can_see_monsterP (maptile *m, int x, int y, int dir)
2627	{	2490	{
2628	sint16	2491	sint16 dx, dy;
2629	dx,
2630	dy;
2631	int	2492	int
2632	mflags;	2493	mflags;
2633		2494
2634	if (dir < 0)	2495	if (dir < 0)
2635	return 0; /* exit condition: invalid direction */	2496	return 0; /* exit condition: invalid direction */
…		…
2713	if (prev)	2574	if (prev)
2714	prev->more = tmp;	2575	prev->more = tmp;
2715	prev = tmp;	2576	prev = tmp;
2716	}	2577	}
2717		2578
2718	/*** copy inventory ***/
2719	for (item = src->inv; item; item = item->below)	2579	for (item = src->inv; item; item = item->below)
2720	{
2721	(void) insert_ob_in_ob (object_create_clone (item), dst);	2580	insert_ob_in_ob (object_create_clone (item), dst);
2722	}
2723		2581
2724	return dst;	2582	return dst;
2725	}	2583	}
2726		2584
2727	/* return true if the object was destroyed, 0 otherwise */
2728	int
2729	was_destroyed (const object *op, tag_t old_tag)
2730	{
2731	/* checking for FLAG_FREED isn't necessary, but makes this function more
2732	* robust */
2733	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2734	}
2735
2736	/* GROS - Creates an object using a string representing its content. */	2585	/* GROS - Creates an object using a string representing its content. */
2737
2738	/* Basically, we save the content of the string to a temp file, then call */	2586	/* Basically, we save the content of the string to a temp file, then call */
2739
2740	/* load_object on it. I admit it is a highly inefficient way to make things, */	2587	/* load_object on it. I admit it is a highly inefficient way to make things, */
2741
2742	/* but it was simple to make and allows reusing the load_object function. */	2588	/* but it was simple to make and allows reusing the load_object function. */
2743
2744	/* Remember not to use load_object_str in a time-critical situation. */	2589	/* Remember not to use load_object_str in a time-critical situation. */
2745
2746	/* Also remember that multiparts objects are not supported for now. */	2590	/* Also remember that multiparts objects are not supported for now. */
2747		2591
2748	object *	2592	object *
2749	load_object_str (const char *obstr)	2593	load_object_str (const char *obstr)
2750	{	2594	{
2751	object *	2595	object *op;
2752	op;
2753	char
2754	filename[MAX_BUF];	2596	char filename[MAX_BUF];
2755		2597
2756	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2598	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2757		2599
2758	FILE *
2759	tempfile = fopen (filename, "w");	2600	FILE *tempfile = fopen (filename, "w");
2760		2601
2761	if (tempfile == NULL)	2602	if (tempfile == NULL)
2762	{	2603	{
2763	LOG (llevError, "Error - Unable to access load object temp file\n");	2604	LOG (llevError, "Error - Unable to access load object temp file\n");
2764	return NULL;	2605	return NULL;
2765	};	2606	}
		2607
2766	fprintf (tempfile, obstr);	2608	fprintf (tempfile, obstr);
2767	fclose (tempfile);	2609	fclose (tempfile);
2768		2610
2769	op = get_object ();	2611	op = get_object ();
2770		2612
2771	object_thawer	2613	object_thawer thawer (filename);
2772	thawer (filename);
2773		2614
2774	if (thawer)	2615	if (thawer)
2775	load_object (thawer, op, 0);	2616	load_object (thawer, op, 0);
2776		2617
2777	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2618	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2785	* returns NULL if no match.	2626	* returns NULL if no match.
2786	*/	2627	*/
2787	object *	2628	object *
2788	find_obj_by_type_subtype (const object *who, int type, int subtype)	2629	find_obj_by_type_subtype (const object *who, int type, int subtype)
2789	{	2630	{
2790	object *	2631	object *tmp;
2791	tmp;
2792		2632
2793	for (tmp = who->inv; tmp; tmp = tmp->below)	2633	for (tmp = who->inv; tmp; tmp = tmp->below)
2794	if (tmp->type == type && tmp->subtype == subtype)	2634	if (tmp->type == type && tmp->subtype == subtype)
2795	return tmp;	2635	return tmp;
2796		2636
…		…
2804	* do the desired thing.	2644	* do the desired thing.
2805	*/	2645	*/
2806	key_value *	2646	key_value *
2807	get_ob_key_link (const object *ob, const char *key)	2647	get_ob_key_link (const object *ob, const char *key)
2808	{	2648	{
2809	key_value *	2649	key_value *link;
2810	link;
2811		2650
2812	for (link = ob->key_values; link != NULL; link = link->next)	2651	for (link = ob->key_values; link != NULL; link = link->next)
2813	{
2814	if (link->key == key)	2652	if (link->key == key)
2815	{
2816	return link;	2653	return link;
2817	}
2818	}
2819		2654
2820	return NULL;	2655	return NULL;
2821	}	2656	}
2822		2657
2823	/*	2658	/*
…		…
2828	* The returned string is shared.	2663	* The returned string is shared.
2829	*/	2664	*/
2830	const char *	2665	const char *
2831	get_ob_key_value (const object *op, const char *const key)	2666	get_ob_key_value (const object *op, const char *const key)
2832	{	2667	{
2833	key_value *	2668	key_value *link;
2834	link;	2669	shstr_cmp canonical_key (key);
2835	const char *
2836	canonical_key;
2837		2670
2838	canonical_key = shstr::find (key);
2839
2840	if (canonical_key == NULL)	2671	if (!canonical_key)
2841	{	2672	{
2842	/* 1. There being a field named key on any object	2673	/* 1. There being a field named key on any object
2843	* implies there'd be a shared string to find.	2674	* implies there'd be a shared string to find.
2844	* 2. Since there isn't, no object has this field.	2675	* 2. Since there isn't, no object has this field.
2845	* 3. Therefore, *this* object doesn't have this field.	2676	* 3. Therefore, *this* object doesn't have this field.
2846	*/	2677	*/
2847	return NULL;	2678	return 0;
2848	}	2679	}
2849		2680
2850	/* This is copied from get_ob_key_link() above -	2681	/* This is copied from get_ob_key_link() above -
2851	* only 4 lines, and saves the function call overhead.	2682	* only 4 lines, and saves the function call overhead.
2852	*/	2683	*/
2853	for (link = op->key_values; link != NULL; link = link->next)	2684	for (link = op->key_values; link; link = link->next)
2854	{
2855	if (link->key == canonical_key)	2685	if (link->key == canonical_key)
2856	{
2857	return link->value;	2686	return link->value;
2858	}	2687
2859	}
2860	return NULL;	2688	return 0;
2861	}	2689	}
2862		2690
2863		2691
2864	/*	2692	/*
2865	* Updates the canonical_key in op to value.	2693	* Updates the canonical_key in op to value.
…		…
2901	if (last)	2729	if (last)
2902	last->next = field->next;	2730	last->next = field->next;
2903	else	2731	else
2904	op->key_values = field->next;	2732	op->key_values = field->next;
2905		2733
2906	delete
2907	field;	2734	delete field;
2908	}	2735	}
2909	}	2736	}
2910	return TRUE;	2737	return TRUE;
2911	}	2738	}
2912	/* IF we get here, key doesn't exist */	2739	/* IF we get here, key doesn't exist */
…		…
2947	* Returns TRUE on success.	2774	* Returns TRUE on success.
2948	*/	2775	*/
2949	int	2776	int
2950	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2777	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2951	{	2778	{
2952	shstr
2953	key_ (key);	2779	shstr key_ (key);
2954		2780
2955	return set_ob_key_value_s (op, key_, value, add_key);	2781	return set_ob_key_value_s (op, key_, value, add_key);
2956	}	2782	}
		2783
		2784	object::depth_iterator::depth_iterator (object *container)
		2785	: iterator_base (container)
		2786	{
		2787	while (item->inv)
		2788	item = item->inv;
		2789	}
		2790
		2791	void
		2792	object::depth_iterator::next ()
		2793	{
		2794	if (item->below)
		2795	{
		2796	item = item->below;
		2797
		2798	while (item->inv)
		2799	item = item->inv;
		2800	}
		2801	else
		2802	item = item->env;
		2803	}
		2804
		2805	// return a suitable string describing an objetc in enough detail to find it
		2806	const char *
		2807	object::debug_desc (char *info) const
		2808	{
		2809	char info2[256 * 3];
		2810	char *p = info;
		2811
		2812	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2813	count,
		2814	&name,
		2815	title ? " " : "",
		2816	title ? (const char *)title : "");
		2817
		2818	if (env)
		2819	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2820
		2821	if (map)
		2822	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2823
		2824	return info;
		2825	}
		2826
		2827	const char *
		2828	object::debug_desc () const
		2829	{
		2830	static char info[256 * 3];
		2831	return debug_desc (info);
		2832	}
		2833

Diff Legend

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