ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.65 by root, Wed Dec 13 00:42:03 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.24 2006/09/10 16:00:23 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: %" 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	}
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.
…		…
406	*/	412	*/
407		413
408	object *	414	object *
409	find_object (tag_t i)	415	find_object (tag_t i)
410	{	416	{
411	object *op;	417	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	418	if (op->count == i)
415	break;	419	return op;
		420
416	return op;	421	return 0;
417	}	422	}
418		423
419	/*	424	/*
420	* 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.
421	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
423	*/	428	*/
424		429
425	object *	430	object *
426	find_object_name (const char *str)	431	find_object_name (const char *str)
427	{	432	{
428	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
429	object *op;	434	object *op;
430		435
431	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	437	if (op->name == str_)
433	break;	438	break;
434		439
435	return op;	440	return op;
436	}	441	}
437		442
…		…
440	{	445	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	447	}
443		448
444	/*	449	/*
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	450	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	451	* skill and experience objects.
485	*/	452	*/
486	void	453	void
487	set_owner (object *op, object *owner)	454	object::set_owner (object *owner)
488	{	455	{
489	if (owner == NULL || op == NULL)	456	if (!owner)
490	return;	457	return;
491		458
492	/* next line added to allow objects which own objects */	459	/* next line added to allow objects which own objects */
493	/* 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
494	* with the fireball owning a poison cloud which then owned the	461	* with the fireball owning a poison cloud which then owned the
495	* 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
496	* freed and then another object replacing it. Since the ownercounts	463	* 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.	464	* didn't match, this check is valid and I believe that cause is valid.
498	*/	465	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	466	while (owner->owner)
500	owner = owner->owner;	467	owner = owner->owner;
501		468
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;	469	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512
513	}
514
515	/* Set the owner to clone's current owner and set the skill and experience
516	* objects to clone's objects (typically those objects that where the owner's
517	* current skill and experience objects at the time when clone's owner was
518	* set - not the owner's current skill and experience objects).
519	*
520	* Use this function if player created an object (e.g. fire bullet, swarm
521	* spell), and this object creates further objects whose kills should be
522	* accounted for the player's original skill, even if player has changed
523	* skills meanwhile.
524	*/
525	void
526	copy_owner (object *op, object *clone)
527	{
528	object *owner = get_owner (clone);
529
530	if (owner == NULL)
531	{
532	/* players don't have owners - they own themselves. Update
533	* as appropriate.
534	*/
535	if (clone->type == PLAYER)
536	owner = clone;
537	else
538	return;
539	}
540	set_owner (op, owner);
541
542	}	470	}
543		471
544	/* Zero the key_values on op, decrementing the shared-string	472	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	473	* refcounts and freeing the links.
546	*/	474	*/
…		…
562	{	490	{
563	attachable_base::clear ();	491	attachable_base::clear ();
564		492
565	free_key_values (this);	493	free_key_values (this);
566		494
		495	owner = 0;
567	name = 0;	496	name = 0;
568	name_pl = 0;	497	name_pl = 0;
569	title = 0;	498	title = 0;
570	race = 0;	499	race = 0;
571	slaying = 0;	500	slaying = 0;
572	skill = 0;	501	skill = 0;
573	msg = 0;	502	msg = 0;
574	lore = 0;	503	lore = 0;
575	custom_name = 0;	504	custom_name = 0;
576	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;
577		517
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
579		519
580	SET_FLAG (this, FLAG_REMOVED);	520	SET_FLAG (this, FLAG_REMOVED);
581	}
582		521
583	void object::clone (object *destination)
584	{
585	*(object_copy *) destination = *this;
586	*(object_pod *) destination = *this;
587
588	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
590	}
591
592	/*
593	* clear_object() frees everything allocated by an object, and also
594	* clears all variables and flags to default settings.
595	*/
596
597	void
598	clear_object (object *op)
599	{
600	op->clear ();
601
602	op->contr = NULL;
603	op->below = NULL;
604	op->above = NULL;
605	op->inv = NULL;
606	op->container = NULL;
607	op->env = NULL;
608	op->more = NULL;
609	op->head = NULL;
610	op->map = NULL;
611	op->refcount = 0;
612	op->active_next = NULL;
613	op->active_prev = NULL;
614	/* What is not cleared is next, prev, and count */	522	/* What is not cleared is next, prev, and count */
615		523
616	op->expmul = 1.0;	524	expmul = 1.0;
617	op->face = blank_face;	525	face = blank_face;
618	op->attacked_by_count = -1;
619		526
620	if (settings.casting_time)	527	if (settings.casting_time)
621	op->casting_time = -1;	528	casting_time = -1;
622	}	529	}
623		530
624	/*	531	/*
625	* copy object first frees everything allocated by the second object,	532	* copy_to first frees everything allocated by the dst object,
626	* and then copies the contends of the first object into the second	533	* and then copies the contents of itself into the second
627	* object, allocating what needs to be allocated. Basically, any	534	* object, allocating what needs to be allocated. Basically, any
628	* 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,
629	* 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
630	* will point at garbage.	537	* will point at garbage.
631	*/	538	*/
632
633	void	539	void
634	copy_object (object *op2, object *op)	540	object::copy_to (object *dst)
635	{	541	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
638		544
639	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));
640		550
641	if (is_freed)	551	if (is_freed)
642	SET_FLAG (op, FLAG_FREED);	552	SET_FLAG (dst, FLAG_FREED);
		553
643	if (is_removed)	554	if (is_removed)
644	SET_FLAG (op, FLAG_REMOVED);	555	SET_FLAG (dst, FLAG_REMOVED);
645		556
646	if (op2->speed < 0)	557	if (speed < 0)
647	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	558	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
648		559
649	/* Copy over key_values, if any. */	560	/* Copy over key_values, if any. */
650	if (op2->key_values)	561	if (key_values)
651	{	562	{
652	key_value *tail = 0;	563	key_value *tail = 0;
653	key_value *i;	564	key_value *i;
654		565
655	op->key_values = 0;	566	dst->key_values = 0;
656		567
657	for (i = op2->key_values; i; i = i->next)	568	for (i = key_values; i; i = i->next)
658	{	569	{
659	key_value *new_link = new key_value;	570	key_value *new_link = new key_value;
660		571
661	new_link->next = 0;	572	new_link->next = 0;
662	new_link->key = i->key;	573	new_link->key = i->key;
663	new_link->value = i->value;	574	new_link->value = i->value;
664		575
665	/* Try and be clever here, too. */	576	/* Try and be clever here, too. */
666	if (!op->key_values)	577	if (!dst->key_values)
667	{	578	{
668	op->key_values = new_link;	579	dst->key_values = new_link;
669	tail = new_link;	580	tail = new_link;
670	}	581	}
671	else	582	else
672	{	583	{
673	tail->next = new_link;	584	tail->next = new_link;
674	tail = new_link;	585	tail = new_link;
675	}	586	}
676	}	587	}
677	}	588	}
678		589
679	update_ob_speed (op);	590	update_ob_speed (dst);
		591	}
		592
		593	object *
		594	object::clone ()
		595	{
		596	object *neu = create ();
		597	copy_to (neu);
		598	return neu;
680	}	599	}
681		600
682	/*	601	/*
683	* If an object with the IS_TURNABLE() flag needs to be turned due	602	* If an object with the IS_TURNABLE() flag needs to be turned due
684	* to the closest player being on the other side, this function can	603	* to the closest player being on the other side, this function can
…		…
697	/*	616	/*
698	* Updates the speed of an object. If the speed changes from 0 to another	617	* Updates the speed of an object. If the speed changes from 0 to another
699	* value, or vice versa, then add/remove the object from the active list.	618	* value, or vice versa, then add/remove the object from the active list.
700	* This function needs to be called whenever the speed of an object changes.	619	* This function needs to be called whenever the speed of an object changes.
701	*/	620	*/
702
703	void	621	void
704	update_ob_speed (object *op)	622	update_ob_speed (object *op)
705	{	623	{
706	extern int arch_init;	624	extern int arch_init;
707		625
…		…
716	abort ();	634	abort ();
717	#else	635	#else
718	op->speed = 0;	636	op->speed = 0;
719	#endif	637	#endif
720	}	638	}
		639
721	if (arch_init)	640	if (arch_init)
722	{
723	return;	641	return;
724	}	642
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	643	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{	644	{
727	/* If already on active list, don't do anything */	645	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)	646	if (op->active_next || op->active_prev || op == active_objects)
729	return;	647	return;
730		648
731	/* process_events() expects us to insert the object at the beginning	649	/* process_events() expects us to insert the object at the beginning
732	* of the list. */	650	* of the list. */
733	op->active_next = active_objects;	651	op->active_next = active_objects;
		652
734	if (op->active_next != NULL)	653	if (op->active_next != NULL)
735	op->active_next->active_prev = op;	654	op->active_next->active_prev = op;
		655
736	active_objects = op;	656	active_objects = op;
737	}	657	}
738	else	658	else
739	{	659	{
740	/* If not on the active list, nothing needs to be done */	660	/* If not on the active list, nothing needs to be done */
…		…
742	return;	662	return;
743		663
744	if (op->active_prev == NULL)	664	if (op->active_prev == NULL)
745	{	665	{
746	active_objects = op->active_next;	666	active_objects = op->active_next;
		667
747	if (op->active_next != NULL)	668	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;	669	op->active_next->active_prev = NULL;
749	}	670	}
750	else	671	else
751	{	672	{
752	op->active_prev->active_next = op->active_next;	673	op->active_prev->active_next = op->active_next;
		674
753	if (op->active_next)	675	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;	676	op->active_next->active_prev = op->active_prev;
755	}	677	}
		678
756	op->active_next = NULL;	679	op->active_next = NULL;
757	op->active_prev = NULL;	680	op->active_prev = NULL;
758	}	681	}
759	}	682	}
760		683
…		…
885	update_now = 1;	808	update_now = 1;
886		809
887	if ((move_slow | op->move_slow) != move_slow)	810	if ((move_slow | op->move_slow) != move_slow)
888	update_now = 1;	811	update_now = 1;
889	}	812	}
		813
890	/* if the object is being removed, we can't make intelligent	814	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	815	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	816	* that is being removed.
893	*/	817	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	818	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{
896	update_now = 1;	819	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	820	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	821	/* Nothing to do for that case */ ;
901	}
902	else	822	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	823	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		824
907	if (update_now)	825	if (update_now)
908	{	826	{
909	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	827	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
910	update_position (op->map, op->x, op->y);	828	update_position (op->map, op->x, op->y);
…		…
912		830
913	if (op->more != NULL)	831	if (op->more != NULL)
914	update_object (op->more, action);	832	update_object (op->more, action);
915	}	833	}
916		834
917	static	835	object::vector object::mortals;
918	std::vector < object *>	836	object::vector object::objects; // not yet used
919	mortals;	837	object *object::first;
920		838
921	void object::free_mortals ()	839	void object::free_mortals ()
922	{	840	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)	841	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	delete *	842	if ((*i)->refcnt)
		843	++i; // further delay freeing
		844	else
925	i;	845	{
926		846	delete *i;
927	mortals.clear ();	847	mortals.erase (i);
		848	}
928	}	849	}
929		850
930	object::object ()	851	object::object ()
931	{	852	{
932	SET_FLAG (this, FLAG_REMOVED);	853	SET_FLAG (this, FLAG_REMOVED);
933		854
934	expmul = 1.0;	855	expmul = 1.0;
935	face = blank_face;	856	face = blank_face;
936	attacked_by_count = -1;
937	}	857	}
938		858
939	object::~object ()	859	object::~object ()
940	{	860	{
941	free_key_values (this);	861	free_key_values (this);
942	}	862	}
943		863
944	void object::link ()	864	void object::link ()
945	{	865	{
946	count = ++ob_count;	866	count = ++ob_count;
		867	uuid = gen_uuid ();
947		868
948	prev = 0;	869	prev = 0;
949	next = objects;	870	next = object::first;
950		871
951	if (objects)	872	if (object::first)
952	objects->prev = this;	873	object::first->prev = this;
953		874
954	objects = this;	875	object::first = this;
955	}	876	}
956		877
957	void object::unlink ()	878	void object::unlink ()
958	{	879	{
959	count = 0;	880	if (this == object::first)
		881	object::first = next;
960		882
961	/* Remove this object from the list of used objects */	883	/* Remove this object from the list of used objects */
962	if (prev)
963	prev->next = next;	884	if (prev) prev->next = next;
964	if (next)
965	next->prev = prev;	885	if (next) next->prev = prev;
966	if (this == objects)	886
967	objects = next;	887	prev = 0;
		888	next = 0;
968	}	889	}
969		890
970	object *object::create ()	891	object *object::create ()
971	{	892	{
972	object *
973	op = new object;	893	object *op = new object;
974
975	op->link ();	894	op->link ();
976	return op;	895	return op;
977	}	896	}
978		897
979	/*	898	/*
…		…
981	* it from the list of used objects, and puts it on the list of	900	* it from the list of used objects, and puts it on the list of
982	* free objects. The IS_FREED() flag is set in the object.	901	* free objects. The IS_FREED() flag is set in the object.
983	* The object must have been removed by remove_ob() first for	902	* The object must have been removed by remove_ob() first for
984	* this function to succeed.	903	* this function to succeed.
985	*	904	*
986	* If free_inventory is set, free inventory as well. Else drop items in	905	* If destroy_inventory is set, free inventory as well. Else drop items in
987	* inventory to the ground.	906	* inventory to the ground.
988	*/	907	*/
989	void object::free (bool free_inventory)	908	void object::destroy (bool destroy_inventory)
990	{	909	{
		910	if (QUERY_FLAG (this, FLAG_FREED))
		911	return;
		912
		913	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		914	remove_friendly_object (this);
		915
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	916	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	{	917	remove ();
993	LOG (llevDebug, "Free object called with non removed object\n");
994	dump_object (this);
995	#ifdef MANY_CORES
996	abort ();
997	#endif
998	}
999		918
1000	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1001	{
1002	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1003	remove_friendly_object (this);
1004	}
1005
1006	if (QUERY_FLAG (this, FLAG_FREED))	919	SET_FLAG (this, FLAG_FREED);
1007	{
1008	dump_object (this);
1009	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1010	return;
1011	}
1012		920
1013	if (more)	921	if (more)
1014	{	922	{
1015	more->free (free_inventory);	923	more->destroy (destroy_inventory);
1016	more = 0;	924	more = 0;
1017	}	925	}
1018		926
1019	if (inv)	927	if (inv)
1020	{	928	{
1021	/* Only if the space blocks everything do we not process -	929	/* Only if the space blocks everything do we not process -
1022	* if some form of movement is allowed, let objects	930	* if some form of movement is allowed, let objects
1023	* drop on that space.	931	* drop on that space.
1024	*/	932	*/
1025	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	933	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1026	{	934	{
1027	object *	935	object *op = inv;
1028	op = inv;
1029		936
1030	while (op)	937	while (op)
1031	{	938	{
1032	object *
1033	tmp = op->below;	939	object *tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);	940	op->destroy (destroy_inventory);
1037	op = tmp;	941	op = tmp;
1038	}	942	}
1039	}	943	}
1040	else	944	else
1041	{ /* Put objects in inventory onto this space */	945	{ /* Put objects in inventory onto this space */
1042	object *	946	object *op = inv;
1043	op = inv;
1044		947
1045	while (op)	948	while (op)
1046	{	949	{
1047	object *
1048	tmp = op->below;	950	object *tmp = op->below;
1049		951
1050	remove_ob (op);	952	op->remove ();
1051		953
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	954	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1053	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	955	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1054	free_object (op);	956	op->destroy ();
1055	else	957	else
1056	{	958	{
1057	op->x = x;	959	op->x = x;
1058	op->y = y;	960	op->y = y;
1059	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	961	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1062	op = tmp;	964	op = tmp;
1063	}	965	}
1064	}	966	}
1065	}	967	}
1066		968
		969	// hack to ensure that freed objects still have a valid map
		970	{
		971	static maptile *freed_map; // freed objects are moved here to avoid crashes
		972
		973	if (!freed_map)
		974	{
		975	freed_map = new maptile;
		976
		977	freed_map->name = "/internal/freed_objects_map";
		978	freed_map->width = 3;
		979	freed_map->height = 3;
		980
		981	freed_map->allocate ();
		982	}
		983
		984	map = freed_map;
		985	x = 1;
		986	y = 1;
		987	}
		988
		989	// clear those pointers that likely might have circular references to us
		990	owner = 0;
		991	enemy = 0;
		992	attacked_by = 0;
		993
		994	// only relevant for players(?), but make sure of it anyways
		995	contr = 0;
		996
1067	/* Remove object from the active list */	997	/* Remove object from the active list */
1068	speed = 0;	998	speed = 0;
1069	update_ob_speed (this);	999	update_ob_speed (this);
1070		1000
1071	unlink ();	1001	unlink ();
1072		1002
1073	SET_FLAG (this, FLAG_FREED);
1074
1075	mortals.push_back (this);	1003	mortals.push_back (this);
1076	}	1004	}
1077		1005
1078	/*	1006	/*
1079	* sub_weight() recursively (outwards) subtracts a number from the	1007	* sub_weight() recursively (outwards) subtracts a number from the
1080	* weight of an object (and what is carried by it's environment(s)).	1008	* weight of an object (and what is carried by it's environment(s)).
1081	*/	1009	*/
1082
1083	void	1010	void
1084	sub_weight (object *op, signed long weight)	1011	sub_weight (object *op, signed long weight)
1085	{	1012	{
1086	while (op != NULL)	1013	while (op != NULL)
1087	{	1014	{
1088	if (op->type == CONTAINER)	1015	if (op->type == CONTAINER)
1089	{
1090	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1016	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1091	}	1017
1092	op->carrying -= weight;	1018	op->carrying -= weight;
1093	op = op->env;	1019	op = op->env;
1094	}	1020	}
1095	}	1021	}
1096		1022
1097	/* remove_ob(op):	1023	/* op->remove ():
1098	* This function removes the object op from the linked list of objects	1024	* This function removes the object op from the linked list of objects
1099	* which it is currently tied to. When this function is done, the	1025	* which it is currently tied to. When this function is done, the
1100	* object will have no environment. If the object previously had an	1026	* object will have no environment. If the object previously had an
1101	* environment, the x and y coordinates will be updated to	1027	* environment, the x and y coordinates will be updated to
1102	* the previous environment.	1028	* the previous environment.
1103	* Beware: This function is called from the editor as well!	1029	* Beware: This function is called from the editor as well!
1104	*/	1030	*/
1105
1106	void	1031	void
1107	remove_ob (object *op)	1032	object::remove ()
1108	{	1033	{
		1034	object *tmp, *last = 0;
1109	object *	1035	object *otmp;
1110	tmp, *	1036
1111	last = NULL;
1112	object *
1113	otmp;
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;	1037	int check_walk_off;
1118	mapstruct *
1119	m;
1120	sint16
1121	x,
1122	y;
1123		1038
1124
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1039	if (QUERY_FLAG (this, FLAG_REMOVED))
1126	{	1040	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		1041
1130	/* Changed it to always dump core in this case. As has been learned
1131	* in the past, trying to recover from errors almost always
1132	* make things worse, and this is a real error here - something
1133	* that should not happen.
1134	* Yes, if this was a mission critical app, trying to do something
1135	* to recover may make sense, but that is because failure of the app
1136	* may have other disastrous problems. Cf runs out of a script
1137	* so is easily enough restarted without any real problems.
1138	* MSW 2001-07-01
1139	*/
1140	abort ();
1141	}
1142	if (op->more != NULL)
1143	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);	1042	SET_FLAG (this, FLAG_REMOVED);
		1043
		1044	if (more)
		1045	more->remove ();
1146		1046
1147	/*	1047	/*
1148	* In this case, the object to be removed is in someones	1048	* In this case, the object to be removed is in someones
1149	* inventory.	1049	* inventory.
1150	*/	1050	*/
1151	if (op->env != NULL)	1051	if (env)
1152	{	1052	{
1153	if (op->nrof)	1053	if (nrof)
1154	sub_weight (op->env, op->weight * op->nrof);	1054	sub_weight (env, weight * nrof);
1155	else	1055	else
1156	sub_weight (op->env, op->weight + op->carrying);	1056	sub_weight (env, weight + carrying);
1157		1057
1158	/* NO_FIX_PLAYER is set when a great many changes are being	1058	/* NO_FIX_PLAYER is set when a great many changes are being
1159	* made to players inventory. If set, avoiding the call	1059	* made to players inventory. If set, avoiding the call
1160	* to save cpu time.	1060	* to save cpu time.
1161	*/	1061	*/
1162	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1062	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1163	fix_player (otmp);	1063	fix_player (otmp);
1164		1064
1165	if (op->above != NULL)	1065	if (above != NULL)
1166	op->above->below = op->below;	1066	above->below = below;
1167	else	1067	else
1168	op->env->inv = op->below;	1068	env->inv = below;
1169		1069
1170	if (op->below != NULL)	1070	if (below != NULL)
1171	op->below->above = op->above;	1071	below->above = above;
1172		1072
1173	/* we set up values so that it could be inserted into	1073	/* we set up values so that it could be inserted into
1174	* the map, but we don't actually do that - it is up	1074	* the map, but we don't actually do that - it is up
1175	* to the caller to decide what we want to do.	1075	* to the caller to decide what we want to do.
1176	*/	1076	*/
1177	op->x = op->env->x, op->y = op->env->y;	1077	x = env->x, y = env->y;
1178	op->map = op->env->map;	1078	map = env->map;
1179	op->above = NULL, op->below = NULL;	1079	above = 0, below = 0;
1180	op->env = NULL;	1080	env = 0;
1181	return;
1182	}
1183
1184	/* If we get here, we are removing it from a map */
1185	if (op->map == NULL)
1186	return;
1187
1188	x = op->x;
1189	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);
1191
1192	if (!m)
1193	{	1081	}
1194	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1082	else if (map)
1195	op->map->path, op->x, op->y);	1083	{
1196	/* in old days, we used to set x and y to 0 and continue.	1084	/* Re did the following section of code - it looks like it had
1197	* it seems if we get into this case, something is probablye	1085	* lots of logic for things we no longer care about
1198	* screwed up and should be fixed.
1199	*/	1086	*/
1200	abort ();
1201	}
1202	if (op->map != m)
1203	{
1204	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1205	op->map->path, m->path, op->x, op->y, x, y);
1206	}
1207		1087
1208	/* Re did the following section of code - it looks like it had
1209	* lots of logic for things we no longer care about
1210	*/
1211
1212	/* link the object above us */	1088	/* link the object above us */
1213	if (op->above)	1089	if (above)
1214	op->above->below = op->below;	1090	above->below = below;
1215	else	1091	else
1216	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1092	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1217		1093
1218	/* Relink the object below us, if there is one */	1094	/* Relink the object below us, if there is one */
1219	if (op->below)	1095	if (below)
1220	{
1221	op->below->above = op->above;	1096	below->above = above;
1222	}
1223	else	1097	else
1224	{	1098	{
1225	/* Nothing below, which means we need to relink map object for this space	1099	/* Nothing below, which means we need to relink map object for this space
1226	* use translated coordinates in case some oddness with map tiling is	1100	* use translated coordinates in case some oddness with map tiling is
1227	* evident	1101	* evident
1228	*/
1229	if (GET_MAP_OB (m, x, y) != op)
1230	{
1231	dump_object (op);
1232	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1233	errmsg);
1234	dump_object (GET_MAP_OB (m, x, y));
1235	LOG (llevError, "%s\n", errmsg);
1236	}
1237	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1238	}
1239	op->above = NULL;
1240	op->below = NULL;
1241
1242	if (op->map->in_memory == MAP_SAVING)
1243	return;
1244
1245	tag = op->count;
1246	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1247	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1248	{
1249	/* No point updating the players look faces if he is the object
1250	* being removed.
1251	*/
1252
1253	if (tmp->type == PLAYER && tmp != op)
1254	{
1255	/* If a container that the player is currently using somehow gets
1256	* removed (most likely destroyed), update the player view
1257	* appropriately.
1258	*/	1102	*/
1259	if (tmp->container == op)	1103	if (GET_MAP_OB (map, x, y) != this)
1260	{	1104	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1105	char *dump = dump_object (this);
1262	tmp->container = NULL;	1106	LOG (llevError,
		1107	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1108	free (dump);
		1109	dump = dump_object (GET_MAP_OB (map, x, y));
		1110	LOG (llevError, "%s\n", dump);
		1111	free (dump);
1263	}	1112	}
1264	tmp->contr->socket.update_look = 1;	1113
1265	}	1114	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1266	/* See if player moving off should effect something */
1267	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1268	{	1115	}
1269		1116
1270	move_apply (tmp, op, NULL);	1117	above = 0;
1271	if (was_destroyed (op, tag))	1118	below = 0;
		1119
		1120	if (map->in_memory == MAP_SAVING)
		1121	return;
		1122
		1123	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1124
		1125	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1126	{
		1127	/* No point updating the players look faces if he is the object
		1128	* being removed.
		1129	*/
		1130
		1131	if (tmp->type == PLAYER && tmp != this)
1272	{	1132	{
1273	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1133	/* If a container that the player is currently using somehow gets
		1134	* removed (most likely destroyed), update the player view
		1135	* appropriately.
		1136	*/
		1137	if (tmp->container == this)
		1138	{
		1139	CLEAR_FLAG (this, FLAG_APPLIED);
		1140	tmp->container = 0;
		1141	}
		1142
		1143	tmp->contr->socket.update_look = 1;
1274	}	1144	}
		1145
		1146	/* See if player moving off should effect something */
		1147	if (check_walk_off
		1148	&& ((move_type & tmp->move_off)
		1149	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1150	{
		1151	move_apply (tmp, this, 0);
		1152
		1153	if (destroyed ())
		1154	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1275	}	1155	}
1276		1156
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1157	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1158
1279	if (tmp->above == tmp)	1159	if (tmp->above == tmp)
1280	tmp->above = NULL;	1160	tmp->above = 0;
		1161
1281	last = tmp;	1162	last = tmp;
1282	}	1163	}
		1164
1283	/* last == NULL of there are no objects on this space */	1165	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1166	if (!last)
1285	{	1167	{
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1168	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1169	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288	* those out anyways, and if there are any flags set right now, they won't	1170	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.	1171	* be correct anyways.
1290	*/	1172	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1173	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);	1174	update_position (map, x, y);
1293	}	1175	}
1294	else	1176	else
1295	update_object (last, UP_OBJ_REMOVE);	1177	update_object (last, UP_OBJ_REMOVE);
1296		1178
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1179	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1298	update_all_los (op->map, op->x, op->y);	1180	update_all_los (map, x, y);
1299		1181	}
1300	}	1182	}
1301		1183
1302	/*	1184	/*
1303	* merge_ob(op,top):	1185	* merge_ob(op,top):
1304	*	1186	*
1305	* This function goes through all objects below and including top, and	1187	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1188	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1189	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1190	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1191	*/
1310
1311	object *	1192	object *
1312	merge_ob (object *op, object *top)	1193	merge_ob (object *op, object *top)
1313	{	1194	{
1314	if (!op->nrof)	1195	if (!op->nrof)
1315	return 0;	1196	return 0;
		1197
1316	if (top == NULL)	1198	if (top == NULL)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1199	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1200
1318	for (; top != NULL; top = top->below)	1201	for (; top != NULL; top = top->below)
1319	{	1202	{
1320	if (top == op)	1203	if (top == op)
1321	continue;	1204	continue;
1322	if (CAN_MERGE (op, top))	1205	if (CAN_MERGE (op, top))
1323	{	1206	{
1324	top->nrof += op->nrof;	1207	top->nrof += op->nrof;
1325		1208
1326	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1209	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1327	op->weight = 0; /* Don't want any adjustements now */	1210	op->weight = 0; /* Don't want any adjustements now */
1328	remove_ob (op);	1211	op->destroy ();
1329	free_object (op);
1330	return top;	1212	return top;
1331	}	1213	}
1332	}	1214	}
		1215
1333	return NULL;	1216	return 0;
1334	}	1217	}
1335		1218
1336	/*	1219	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1220	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1338	* job preparing multi-part monsters	1221	* job preparing multi-part monsters
1339	*/	1222	*/
1340	object *	1223	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1342	{	1225	{
1343	object *	1226	object *tmp;
1344	tmp;
1345		1227
1346	if (op->head)	1228	if (op->head)
1347	op = op->head;	1229	op = op->head;
		1230
1348	for (tmp = op; tmp; tmp = tmp->more)	1231	for (tmp = op; tmp; tmp = tmp->more)
1349	{	1232	{
1350	tmp->x = x + tmp->arch->clone.x;	1233	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1234	tmp->y = y + tmp->arch->clone.y;
1352	}	1235	}
		1236
1353	return insert_ob_in_map (op, m, originator, flag);	1237	return insert_ob_in_map (op, m, originator, flag);
1354	}	1238	}
1355		1239
1356	/*	1240	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1241	* insert_ob_in_map (op, map, originator, flag):
…		…
1373	* NULL if 'op' was destroyed	1257	* NULL if 'op' was destroyed
1374	* just 'op' otherwise	1258	* just 'op' otherwise
1375	*/	1259	*/
1376		1260
1377	object *	1261	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1262	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1379	{	1263	{
1380	object *	1264	object *tmp, *top, *floor = NULL;
1381	tmp, *	1265	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1266
1388	if (QUERY_FLAG (op, FLAG_FREED))	1267	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1268	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1269	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1270	return NULL;
1392	}	1271	}
		1272
1393	if (m == NULL)	1273	if (m == NULL)
1394	{	1274	{
1395	dump_object (op);	1275	char *dump = dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1276	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1277	free (dump);
1397	return op;	1278	return op;
1398	}	1279	}
		1280
1399	if (out_of_map (m, op->x, op->y))	1281	if (out_of_map (m, op->x, op->y))
1400	{	1282	{
1401	dump_object (op);	1283	char *dump = dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1284	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403	#ifdef MANY_CORES	1285	#ifdef MANY_CORES
1404	/* Better to catch this here, as otherwise the next use of this object	1286	/* Better to catch this here, as otherwise the next use of this object
1405	* is likely to cause a crash. Better to find out where it is getting	1287	* is likely to cause a crash. Better to find out where it is getting
1406	* improperly inserted.	1288	* improperly inserted.
1407	*/	1289	*/
1408	abort ();	1290	abort ();
1409	#endif	1291	#endif
		1292	free (dump);
1410	return op;	1293	return op;
1411	}	1294	}
		1295
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1296	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1297	{
1414	dump_object (op);	1298	char *dump = dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1299	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1300	free (dump);
1416	return op;	1301	return op;
1417	}	1302	}
		1303
1418	if (op->more != NULL)	1304	if (op->more != NULL)
1419	{	1305	{
1420	/* The part may be on a different map. */	1306	/* The part may be on a different map. */
1421		1307
1422	object *
1423	more = op->more;	1308	object *more = op->more;
1424		1309
1425	/* We really need the caller to normalize coordinates - if	1310	/* We really need the caller to normalize coordinates - if
1426	* we set the map, that doesn't work if the location is within	1311	* we set the map, that doesn't work if the location is within
1427	* a map and this is straddling an edge. So only if coordinate	1312	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.	1313	* is clear wrong do we normalize it.
1429	*/	1314	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1315	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1316	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1317	else if (!more->map)
1435	{	1318	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1319	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1320	* more->map should always point to the parent.
1438	*/	1321	*/
…		…
1441		1324
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1325	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1326	{
1444	if (!op->head)	1327	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1328	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1329
1446	return NULL;	1330	return NULL;
1447	}	1331	}
1448	}	1332	}
		1333
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1334	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1335
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1336	/* Ideally, the caller figures this out. However, it complicates a lot
1452	* of areas of callers (eg, anything that uses find_free_spot would now	1337	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1338	* need extra work
…		…
1457	y = op->y;	1342	y = op->y;
1458		1343
1459	/* this has to be done after we translate the coordinates.	1344	/* this has to be done after we translate the coordinates.
1460	*/	1345	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1346	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1347	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1348	if (CAN_MERGE (op, tmp))
1465	{	1349	{
1466	op->nrof += tmp->nrof;	1350	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1351	tmp->destroy ();
1468	free_object (tmp);
1469	}	1352	}
1470	}
1471		1353
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1354	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1355	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1356
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1357	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1358	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1359
1477	if (flag & INS_BELOW_ORIGINATOR)	1360	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1361	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1362	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1363	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1364	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1365	abort ();
1483	}	1366	}
		1367
1484	op->above = originator;	1368	op->above = originator;
1485	op->below = originator->below;	1369	op->below = originator->below;
		1370
1486	if (op->below)	1371	if (op->below)
1487	op->below->above = op;	1372	op->below->above = op;
1488	else	1373	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1374	SET_MAP_OB (op->map, op->x, op->y, op);
		1375
1490	/* since *below* originator, no need to update top */	1376	/* since *below* originator, no need to update top */
1491	originator->below = op;	1377	originator->below = op;
1492	}	1378	}
1493	else	1379	else
1494	{	1380	{
1495	/* If there are other objects, then */	1381	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1382	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1383	{
1498	object *
1499	last = NULL;	1384	object *last = NULL;
1500		1385
1501	/*	1386	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1387	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1388	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1389	* Generally, we want to put the new object on top. But if
…		…
1513		1398
1514	while (top != NULL)	1399	while (top != NULL)
1515	{	1400	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1401	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1517	floor = top;	1402	floor = top;
		1403
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1404	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1519	{	1405	{
1520	/* We insert above top, so we want this object below this */	1406	/* We insert above top, so we want this object below this */
1521	top = top->below;	1407	top = top->below;
1522	break;	1408	break;
1523	}	1409	}
		1410
1524	last = top;	1411	last = top;
1525	top = top->above;	1412	top = top->above;
1526	}	1413	}
		1414
1527	/* Don't want top to be NULL, so set it to the last valid object */	1415	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;	1416	top = last;
1529		1417
1530	/* We let update_position deal with figuring out what the space	1418	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1419	* looks like instead of lots of conditions here.
…		…
1551	*/	1439	*/
1552	if (last && last->below && last != floor)	1440	if (last && last->below && last != floor)
1553	top = last->below;	1441	top = last->below;
1554	}	1442	}
1555	} /* If objects on this space */	1443	} /* If objects on this space */
		1444
1556	if (flag & INS_MAP_LOAD)	1445	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1446	top = GET_MAP_TOP (op->map, op->x, op->y);
		1447
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1448	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1449	top = floor;
1560		1450
1561	/* Top is the object that our object (op) is going to get inserted above.	1451	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1452	*/
1563		1453
1564	/* First object on this space */	1454	/* First object on this space */
1565	if (!top)	1455	if (!top)
1566	{	1456	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1457	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1458
1568	if (op->above)	1459	if (op->above)
1569	op->above->below = op;	1460	op->above->below = op;
		1461
1570	op->below = NULL;	1462	op->below = NULL;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1463	SET_MAP_OB (op->map, op->x, op->y, op);
1572	}	1464	}
1573	else	1465	else
1574	{ /* get inserted into the stack above top */	1466	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1467	op->above = top->above;
		1468
1576	if (op->above)	1469	if (op->above)
1577	op->above->below = op;	1470	op->above->below = op;
		1471
1578	op->below = top;	1472	op->below = top;
1579	top->above = op;	1473	top->above = op;
1580	}	1474	}
		1475
1581	if (op->above == NULL)	1476	if (op->above == NULL)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1477	SET_MAP_TOP (op->map, op->x, op->y, op);
1583	} /* else not INS_BELOW_ORIGINATOR */	1478	} /* else not INS_BELOW_ORIGINATOR */
1584		1479
1585	if (op->type == PLAYER)	1480	if (op->type == PLAYER)
…		…
1588	/* If we have a floor, we know the player, if any, will be above	1483	/* If we have a floor, we know the player, if any, will be above
1589	* it, so save a few ticks and start from there.	1484	* it, so save a few ticks and start from there.
1590	*/	1485	*/
1591	if (!(flag & INS_MAP_LOAD))	1486	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1487	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1593	{
1594	if (tmp->type == PLAYER)	1488	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;	1489	tmp->contr->socket.update_look = 1;
1596	}
1597		1490
1598	/* If this object glows, it may affect lighting conditions that are	1491	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1492	* visible to others on this map. But update_all_los is really
1600	* an inefficient way to do this, as it means los for all players	1493	* an inefficient way to do this, as it means los for all players
1601	* on the map will get recalculated. The players could very well	1494	* on the map will get recalculated. The players could very well
…		…
1605	* of effect may be sufficient.	1498	* of effect may be sufficient.
1606	*/	1499	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1500	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1501	update_all_los (op->map, op->x, op->y);
1609		1502
1610
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1503	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1504	update_object (op, UP_OBJ_INSERT);
1613
1614		1505
1615	/* Don't know if moving this to the end will break anything. However,	1506	/* Don't know if moving this to the end will break anything. However,
1616	* we want to have update_look set above before calling this.	1507	* we want to have update_look set above before calling this.
1617	*	1508	*
1618	* check_move_on() must be after this because code called from	1509	* check_move_on() must be after this because code called from
…		…
1620	* blocked() and wall() work properly), and these flags are updated by	1511	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1512	* update_object().
1622	*/	1513	*/
1623		1514
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1515	/* if this is not the head or flag has been passed, don't check walk on status */
1625
1626	if (!(flag & INS_NO_WALK_ON) && !op->head)	1516	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1517	{
1628	if (check_move_on (op, originator))	1518	if (check_move_on (op, originator))
1629	return NULL;	1519	return NULL;
1630		1520
…		…
1633	*/	1523	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1524	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1525	if (check_move_on (tmp, originator))
1636	return NULL;	1526	return NULL;
1637	}	1527	}
		1528
1638	return op;	1529	return op;
1639	}	1530	}
1640		1531
1641	/* this function inserts an object in the map, but if it	1532	/* this function inserts an object in the map, but if it
1642	* finds an object of its own type, it'll remove that one first.	1533	* finds an object of its own type, it'll remove that one first.
…		…
1651	tmp1;	1542	tmp1;
1652		1543
1653	/* first search for itself and remove any old instances */	1544	/* first search for itself and remove any old instances */
1654		1545
1655	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1546	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1656	{
1657	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1658	{	1548	tmp->destroy ();
1659	remove_ob (tmp);
1660	free_object (tmp);
1661	}
1662	}
1663		1549
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1550	tmp1 = arch_to_object (archetype::find (arch_string));
1665
1666		1551
1667	tmp1->x = op->x;	1552	tmp1->x = op->x;
1668	tmp1->y = op->y;	1553	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1554	insert_ob_in_map (tmp1, op->map, op, 0);
1670	}	1555	}
…		…
1678	*/	1563	*/
1679		1564
1680	object *	1565	object *
1681	get_split_ob (object *orig_ob, uint32 nr)	1566	get_split_ob (object *orig_ob, uint32 nr)
1682	{	1567	{
1683	object *	1568	object *newob;
1684	newob;
1685	int
1686	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1569	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1687		1570
1688	if (orig_ob->nrof < nr)	1571	if (orig_ob->nrof < nr)
1689	{	1572	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1573	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;	1574	return NULL;
1692	}	1575	}
		1576
1693	newob = object_create_clone (orig_ob);	1577	newob = object_create_clone (orig_ob);
		1578
1694	if ((orig_ob->nrof -= nr) < 1)	1579	if ((orig_ob->nrof -= nr) < 1)
1695	{	1580	orig_ob->destroy (1);
1696	if (!is_removed)
1697	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);
1699	}
1700	else if (!is_removed)	1581	else if (!is_removed)
1701	{	1582	{
1702	if (orig_ob->env != NULL)	1583	if (orig_ob->env != NULL)
1703	sub_weight (orig_ob->env, orig_ob->weight * nr);	1584	sub_weight (orig_ob->env, orig_ob->weight * nr);
1704	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1585	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1587	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1707	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1588	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;	1589	return NULL;
1709	}	1590	}
1710	}	1591	}
		1592
1711	newob->nrof = nr;	1593	newob->nrof = nr;
1712		1594
1713	return newob;	1595	return newob;
1714	}	1596	}
1715		1597
…		…
1722	*/	1604	*/
1723		1605
1724	object *	1606	object *
1725	decrease_ob_nr (object *op, uint32 i)	1607	decrease_ob_nr (object *op, uint32 i)
1726	{	1608	{
1727	object *	1609	object *tmp;
1728	tmp;
1729	player *	1610	player *pl;
1730	pl;
1731		1611
1732	if (i == 0) /* objects with op->nrof require this check */	1612	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1613	return op;
1734		1614
1735	if (i > op->nrof)	1615	if (i > op->nrof)
1736	i = op->nrof;	1616	i = op->nrof;
1737		1617
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1618	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1619	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1620	else if (op->env != NULL)
1743	{	1621	{
1744	/* is this object in the players inventory, or sub container	1622	/* is this object in the players inventory, or sub container
1745	* therein?	1623	* therein?
1746	*/	1624	*/
…		…
1771	esrv_send_item (tmp, op);	1649	esrv_send_item (tmp, op);
1772	}	1650	}
1773	}	1651	}
1774	else	1652	else
1775	{	1653	{
1776	remove_ob (op);	1654	op->remove ();
1777	op->nrof = 0;	1655	op->nrof = 0;
1778	if (tmp)	1656	if (tmp)
1779	{	1657	{
1780	esrv_del_item (tmp->contr, op->count);	1658	esrv_del_item (tmp->contr, op->count);
1781	}	1659	}
1782	}	1660	}
1783	}	1661	}
1784	else	1662	else
1785	{	1663	{
1786	object *
1787	above = op->above;	1664	object *above = op->above;
1788		1665
1789	if (i < op->nrof)	1666	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1667	op->nrof -= i;
1792	}
1793	else	1668	else
1794	{	1669	{
1795	remove_ob (op);	1670	op->remove ();
1796	op->nrof = 0;	1671	op->nrof = 0;
1797	}	1672	}
		1673
1798	/* Since we just removed op, op->above is null */	1674	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1675	for (tmp = above; tmp != NULL; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1676	if (tmp->type == PLAYER)
1801	{	1677	{
1802	if (op->nrof)	1678	if (op->nrof)
…		…
1805	esrv_del_item (tmp->contr, op->count);	1681	esrv_del_item (tmp->contr, op->count);
1806	}	1682	}
1807	}	1683	}
1808		1684
1809	if (op->nrof)	1685	if (op->nrof)
1810	{
1811	return op;	1686	return op;
1812	}
1813	else	1687	else
1814	{	1688	{
1815	free_object (op);	1689	op->destroy ();
1816	return NULL;	1690	return NULL;
1817	}	1691	}
1818	}	1692	}
1819		1693
1820	/*	1694	/*
…		…
1826	add_weight (object *op, signed long weight)	1700	add_weight (object *op, signed long weight)
1827	{	1701	{
1828	while (op != NULL)	1702	while (op != NULL)
1829	{	1703	{
1830	if (op->type == CONTAINER)	1704	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1705	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1706
1834	op->carrying += weight;	1707	op->carrying += weight;
1835	op = op->env;	1708	op = op->env;
1836	}	1709	}
1837	}	1710	}
1838		1711
		1712	object *
		1713	insert_ob_in_ob (object *op, object *where)
		1714	{
		1715	if (!where)
		1716	{
		1717	char *dump = dump_object (op);
		1718	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1719	free (dump);
		1720	return op;
		1721	}
		1722
		1723	if (where->head)
		1724	{
		1725	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1726	where = where->head;
		1727	}
		1728
		1729	return where->insert (op);
		1730	}
		1731
1839	/*	1732	/*
1840	* insert_ob_in_ob(op,environment):	1733	* env->insert (op)
1841	* This function inserts the object op in the linked list	1734	* This function inserts the object op in the linked list
1842	* inside the object environment.	1735	* inside the object environment.
1843	*	1736	*
1844	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1845	* the inventory at the last position or next to other objects of the same
1846	* type.
1847	* Frank: Now sorted by type, archetype and magic!
1848	*
1849	* The function returns now pointer to inserted item, and return value can	1737	* The function returns now pointer to inserted item, and return value can
1850	* be != op, if items are merged. -Tero	1738	* be != op, if items are merged. -Tero
1851	*/	1739	*/
1852		1740
1853	object *	1741	object *
1854	insert_ob_in_ob (object *op, object *where)	1742	object::insert (object *op)
1855	{	1743	{
1856	object *	1744	object *tmp, *otmp;
1857	tmp, *
1858	otmp;
1859		1745
1860	if (!QUERY_FLAG (op, FLAG_REMOVED))	1746	if (!QUERY_FLAG (op, FLAG_REMOVED))
1861	{	1747	op->remove ();
1862	dump_object (op);	1748
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1864	return op;
1865	}
1866	if (where == NULL)
1867	{
1868	dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870	return op;
1871	}
1872	if (where->head)
1873	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;
1876	}
1877	if (op->more)	1749	if (op->more)
1878	{	1750	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1751	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1752	return op;
1881	}	1753	}
		1754
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1755	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1756	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1757	if (op->nrof)
1885	{	1758	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1759	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1887	if (CAN_MERGE (tmp, op))	1760	if (CAN_MERGE (tmp, op))
1888	{	1761	{
1889	/* return the original object and remove inserted object	1762	/* return the original object and remove inserted object
1890	(client needs the original object) */	1763	(client needs the original object) */
1891	tmp->nrof += op->nrof;	1764	tmp->nrof += op->nrof;
1892	/* Weight handling gets pretty funky. Since we are adding to	1765	/* Weight handling gets pretty funky. Since we are adding to
1893	* tmp->nrof, we need to increase the weight.	1766	* tmp->nrof, we need to increase the weight.
1894	*/	1767	*/
1895	add_weight (where, op->weight * op->nrof);	1768	add_weight (this, op->weight * op->nrof);
1896	SET_FLAG (op, FLAG_REMOVED);	1769	SET_FLAG (op, FLAG_REMOVED);
1897	free_object (op); /* free the inserted object */	1770	op->destroy (); /* free the inserted object */
1898	op = tmp;	1771	op = tmp;
1899	remove_ob (op); /* and fix old object's links */	1772	op->remove (); /* and fix old object's links */
1900	CLEAR_FLAG (op, FLAG_REMOVED);	1773	CLEAR_FLAG (op, FLAG_REMOVED);
1901	break;	1774	break;
1902	}	1775	}
1903		1776
1904	/* I assume combined objects have no inventory	1777	/* I assume combined objects have no inventory
1905	* We add the weight - this object could have just been removed	1778	* We add the weight - this object could have just been removed
1906	* (if it was possible to merge). calling remove_ob will subtract	1779	* (if it was possible to merge). calling remove_ob will subtract
1907	* the weight, so we need to add it in again, since we actually do	1780	* the weight, so we need to add it in again, since we actually do
1908	* the linking below	1781	* the linking below
1909	*/	1782	*/
1910	add_weight (where, op->weight * op->nrof);	1783	add_weight (this, op->weight * op->nrof);
1911	}	1784	}
1912	else	1785	else
1913	add_weight (where, (op->weight + op->carrying));	1786	add_weight (this, (op->weight + op->carrying));
1914		1787
1915	otmp = is_player_inv (where);	1788	otmp = is_player_inv (this);
1916	if (otmp && otmp->contr != NULL)	1789	if (otmp && otmp->contr)
1917	{
1918	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1790	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1919	fix_player (otmp);	1791	fix_player (otmp);
1920	}
1921		1792
1922	op->map = NULL;	1793	op->map = NULL;
1923	op->env = where;	1794	op->env = this;
1924	op->above = NULL;	1795	op->above = NULL;
1925	op->below = NULL;	1796	op->below = NULL;
1926	op->x = 0, op->y = 0;	1797	op->x = 0, op->y = 0;
1927		1798
1928	/* reset the light list and los of the players on the map */	1799	/* reset the light list and los of the players on the map */
1929	if ((op->glow_radius != 0) && where->map)	1800	if ((op->glow_radius != 0) && map)
1930	{	1801	{
1931	#ifdef DEBUG_LIGHTS	1802	#ifdef DEBUG_LIGHTS
1932	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1803	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1933	#endif /* DEBUG_LIGHTS */	1804	#endif /* DEBUG_LIGHTS */
1934	if (MAP_DARKNESS (where->map))	1805	if (MAP_DARKNESS (map))
1935	update_all_los (where->map, where->x, where->y);	1806	update_all_los (map, x, y);
1936	}	1807	}
1937		1808
1938	/* Client has no idea of ordering so lets not bother ordering it here.	1809	/* Client has no idea of ordering so lets not bother ordering it here.
1939	* It sure simplifies this function...	1810	* It sure simplifies this function...
1940	*/	1811	*/
1941	if (where->inv == NULL)	1812	if (!inv)
1942	where->inv = op;	1813	inv = op;
1943	else	1814	else
1944	{	1815	{
1945	op->below = where->inv;	1816	op->below = inv;
1946	op->below->above = op;	1817	op->below->above = op;
1947	where->inv = op;	1818	inv = op;
1948	}	1819	}
		1820
1949	return op;	1821	return op;
1950	}	1822	}
1951		1823
1952	/*	1824	/*
1953	* Checks if any objects has a move_type that matches objects	1825	* Checks if any objects has a move_type that matches objects
…		…
1971	*/	1843	*/
1972		1844
1973	int	1845	int
1974	check_move_on (object *op, object *originator)	1846	check_move_on (object *op, object *originator)
1975	{	1847	{
1976	object *	1848	object *tmp;
1977	tmp;	1849	maptile *m = op->map;
1978	tag_t
1979	tag;
1980	mapstruct *
1981	m = op->map;
1982	int
1983	x = op->x, y = op->y;	1850	int x = op->x, y = op->y;
1984	MoveType	1851
1985	move_on,	1852	MoveType move_on, move_slow, move_block;
1986	move_slow,
1987	move_block;
1988		1853
1989	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1854	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1990	return 0;	1855	return 0;
1991
1992	tag = op->count;
1993		1856
1994	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1857	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1995	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1858	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1996	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1859	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1997		1860
…		…
2022	* we don't need to check all of them.	1885	* we don't need to check all of them.
2023	*/	1886	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1887	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;	1888	break;
2026	}	1889	}
		1890
2027	for (; tmp != NULL; tmp = tmp->below)	1891	for (; tmp; tmp = tmp->below)
2028	{	1892	{
2029	if (tmp == op)	1893	if (tmp == op)
2030	continue; /* Can't apply yourself */	1894	continue; /* Can't apply yourself */
2031		1895
2032	/* Check to see if one of the movement types should be slowed down.	1896	/* Check to see if one of the movement types should be slowed down.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1904	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2041	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1905	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	1906	{
2043		1907
2044	float	1908	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	1909	diff = tmp->move_slow_penalty * FABS (op->speed);
		1910
2048	if (op->type == PLAYER)	1911	if (op->type == PLAYER)
2049	{
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1912	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2051	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1913	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	1914	diff /= 4.0;
2054	}	1915
2055	}
2056	op->speed_left -= diff;	1916	op->speed_left -= diff;
2057	}	1917	}
2058	}	1918	}
2059		1919
2060	/* Basically same logic as above, except now for actual apply. */	1920	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1921	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2062	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1922	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	1923	{
2064
2065	move_apply (tmp, op, originator);	1924	move_apply (tmp, op, originator);
		1925
2066	if (was_destroyed (op, tag))	1926	if (op->destroyed ())
2067	return 1;	1927	return 1;
2068		1928
2069	/* what the person/creature stepped onto has moved the object	1929	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	1930	* someplace new. Don't process any further - if we did,
2071	* have a feeling strange problems would result.	1931	* have a feeling strange problems would result.
2072	*/	1932	*/
2073	if (op->map != m || op->x != x || op->y != y)	1933	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	1934	return 0;
2075	}	1935	}
2076	}	1936	}
		1937
2077	return 0;	1938	return 0;
2078	}	1939	}
2079		1940
2080	/*	1941	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	1942	* present_arch(arch, map, x, y) searches for any objects with
2082	* a matching archetype at the given map and coordinates.	1943	* a matching archetype at the given map and coordinates.
2083	* The first matching object is returned, or NULL if none.	1944	* The first matching object is returned, or NULL if none.
2084	*/	1945	*/
2085		1946
2086	object *	1947	object *
2087	present_arch (const archetype *at, mapstruct *m, int x, int y)	1948	present_arch (const archetype *at, maptile *m, int x, int y)
2088	{	1949	{
2089	object *	1950	object *
2090	tmp;	1951	tmp;
2091		1952
2092	if (m == NULL || out_of_map (m, x, y))	1953	if (m == NULL || out_of_map (m, x, y))
…		…
2105	* a matching type variable at the given map and coordinates.	1966	* a matching type variable at the given map and coordinates.
2106	* The first matching object is returned, or NULL if none.	1967	* The first matching object is returned, or NULL if none.
2107	*/	1968	*/
2108		1969
2109	object *	1970	object *
2110	present (unsigned char type, mapstruct *m, int x, int y)	1971	present (unsigned char type, maptile *m, int x, int y)
2111	{	1972	{
2112	object *	1973	object *
2113	tmp;	1974	tmp;
2114		1975
2115	if (out_of_map (m, x, y))	1976	if (out_of_map (m, x, y))
…		…
2255	* the archetype because that isn't correct if the monster has been	2116	* the archetype because that isn't correct if the monster has been
2256	* customized, changed states, etc.	2117	* customized, changed states, etc.
2257	*/	2118	*/
2258		2119
2259	int	2120	int
2260	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2121	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2261	{	2122	{
2262	int	2123	int
2263	i,	2124	i,
2264	index = 0, flag;	2125	index = 0, flag;
2265	static int	2126	static int
…		…
2286	return -1;	2147	return -1;
2287	return altern[RANDOM () % index];	2148	return altern[RANDOM () % index];
2288	}	2149	}
2289		2150
2290	/*	2151	/*
2291	* find_first_free_spot(archetype, mapstruct, x, y) works like	2152	* find_first_free_spot(archetype, maptile, x, y) works like
2292	* find_free_spot(), but it will search max number of squares.	2153	* find_free_spot(), but it will search max number of squares.
2293	* But it will return the first available spot, not a random choice.	2154	* But it will return the first available spot, not a random choice.
2294	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2155	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2295	*/	2156	*/
2296		2157
2297	int	2158	int
2298	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2159	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2299	{	2160	{
2300	int	2161	int
2301	i;	2162	i;
2302		2163
2303	for (i = 0; i < SIZEOFFREE; i++)	2164	for (i = 0; i < SIZEOFFREE; i++)
…		…
2367	* because we have to know what movement the thing looking to move	2228	* because we have to know what movement the thing looking to move
2368	* there is capable of.	2229	* there is capable of.
2369	*/	2230	*/
2370		2231
2371	int	2232	int
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2233	find_dir (maptile *m, int x, int y, object *exclude)
2373	{	2234	{
2374	int	2235	int
2375	i,	2236	i,
2376	max = SIZEOFFREE, mflags;	2237	max = SIZEOFFREE, mflags;
2377	sint16	2238
2378	nx,	2239	sint16 nx, ny;
2379	ny;
2380	object *	2240	object *
2381	tmp;	2241	tmp;
2382	mapstruct *	2242	maptile *
2383	mp;	2243	mp;
2384	MoveType	2244
2385	blocked,	2245	MoveType blocked, move_type;
2386	move_type;
2387		2246
2388	if (exclude && exclude->head)	2247	if (exclude && exclude->head)
2389	{	2248	{
2390	exclude = exclude->head;	2249	exclude = exclude->head;
2391	move_type = exclude->move_type;	2250	move_type = exclude->move_type;
…		…
2596	* Modified to be map tile aware -.MSW	2455	* Modified to be map tile aware -.MSW
2597	*/	2456	*/
2598		2457
2599		2458
2600	int	2459	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2460	can_see_monsterP (maptile *m, int x, int y, int dir)
2602	{	2461	{
2603	sint16	2462	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int	2463	int
2607	mflags;	2464	mflags;
2608		2465
2609	if (dir < 0)	2466	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2467	return 0; /* exit condition: invalid direction */
…		…
2657	* create clone from object to another	2514	* create clone from object to another
2658	*/	2515	*/
2659	object *	2516	object *
2660	object_create_clone (object *asrc)	2517	object_create_clone (object *asrc)
2661	{	2518	{
2662	object *
2663	dst = NULL, *tmp, *src, *part, *prev, *item;	2519	object *dst = 0, *tmp, *src, *part, *prev, *item;
2664		2520
2665	if (!asrc)	2521	if (!asrc)
2666	return NULL;	2522	return 0;
		2523
2667	src = asrc;	2524	src = asrc;
2668	if (src->head)	2525	if (src->head)
2669	src = src->head;	2526	src = src->head;
2670		2527
2671	prev = NULL;	2528	prev = 0;
2672	for (part = src; part; part = part->more)	2529	for (part = src; part; part = part->more)
2673	{	2530	{
2674	tmp = get_object ();	2531	tmp = part->clone ();
2675	copy_object (part, tmp);
2676	tmp->x -= src->x;	2532	tmp->x -= src->x;
2677	tmp->y -= src->y;	2533	tmp->y -= src->y;
		2534
2678	if (!part->head)	2535	if (!part->head)
2679	{	2536	{
2680	dst = tmp;	2537	dst = tmp;
2681	tmp->head = NULL;	2538	tmp->head = 0;
2682	}	2539	}
2683	else	2540	else
2684	{	2541	{
2685	tmp->head = dst;	2542	tmp->head = dst;
2686	}	2543	}
		2544
2687	tmp->more = NULL;	2545	tmp->more = 0;
		2546
2688	if (prev)	2547	if (prev)
2689	prev->more = tmp;	2548	prev->more = tmp;
		2549
2690	prev = tmp;	2550	prev = tmp;
2691	}	2551	}
2692		2552
2693	/*** copy inventory ***/
2694	for (item = src->inv; item; item = item->below)	2553	for (item = src->inv; item; item = item->below)
2695	{
2696	(void) insert_ob_in_ob (object_create_clone (item), dst);	2554	insert_ob_in_ob (object_create_clone (item), dst);
2697	}
2698		2555
2699	return dst;	2556	return dst;
2700	}	2557	}
2701		2558
2702	/* return true if the object was destroyed, 0 otherwise */
2703	int
2704	was_destroyed (const object *op, tag_t old_tag)
2705	{
2706	/* checking for FLAG_FREED isn't necessary, but makes this function more
2707	* robust */
2708	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709	}
2710
2711	/* GROS - Creates an object using a string representing its content. */	2559	/* GROS - Creates an object using a string representing its content. */
2712
2713	/* Basically, we save the content of the string to a temp file, then call */	2560	/* Basically, we save the content of the string to a temp file, then call */
2714
2715	/* load_object on it. I admit it is a highly inefficient way to make things, */	2561	/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717	/* but it was simple to make and allows reusing the load_object function. */	2562	/* but it was simple to make and allows reusing the load_object function. */
2718
2719	/* Remember not to use load_object_str in a time-critical situation. */	2563	/* Remember not to use load_object_str in a time-critical situation. */
2720
2721	/* Also remember that multiparts objects are not supported for now. */	2564	/* Also remember that multiparts objects are not supported for now. */
2722		2565
2723	object *	2566	object *
2724	load_object_str (const char *obstr)	2567	load_object_str (const char *obstr)
2725	{	2568	{
2726	object *	2569	object *op;
2727	op;
2728	char
2729	filename[MAX_BUF];	2570	char filename[MAX_BUF];
2730		2571
2731	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2572	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732		2573
2733	FILE *
2734	tempfile = fopen (filename, "w");	2574	FILE *tempfile = fopen (filename, "w");
2735		2575
2736	if (tempfile == NULL)	2576	if (tempfile == NULL)
2737	{	2577	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");	2578	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;	2579	return NULL;
2740	};	2580	}
		2581
2741	fprintf (tempfile, obstr);	2582	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2583	fclose (tempfile);
2743		2584
2744	op = get_object ();	2585	op = object::create ();
2745		2586
2746	object_thawer	2587	object_thawer thawer (filename);
2747	thawer (filename);
2748		2588
2749	if (thawer)	2589	if (thawer)
2750	load_object (thawer, op, 0);	2590	load_object (thawer, op, 0);
2751		2591
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2592	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2760	* returns NULL if no match.	2600	* returns NULL if no match.
2761	*/	2601	*/
2762	object *	2602	object *
2763	find_obj_by_type_subtype (const object *who, int type, int subtype)	2603	find_obj_by_type_subtype (const object *who, int type, int subtype)
2764	{	2604	{
2765	object *	2605	object *tmp;
2766	tmp;
2767		2606
2768	for (tmp = who->inv; tmp; tmp = tmp->below)	2607	for (tmp = who->inv; tmp; tmp = tmp->below)
2769	if (tmp->type == type && tmp->subtype == subtype)	2608	if (tmp->type == type && tmp->subtype == subtype)
2770	return tmp;	2609	return tmp;
2771		2610
…		…
2779	* do the desired thing.	2618	* do the desired thing.
2780	*/	2619	*/
2781	key_value *	2620	key_value *
2782	get_ob_key_link (const object *ob, const char *key)	2621	get_ob_key_link (const object *ob, const char *key)
2783	{	2622	{
2784	key_value *	2623	key_value *link;
2785	link;
2786		2624
2787	for (link = ob->key_values; link != NULL; link = link->next)	2625	for (link = ob->key_values; link != NULL; link = link->next)
2788	{
2789	if (link->key == key)	2626	if (link->key == key)
2790	{
2791	return link;	2627	return link;
2792	}
2793	}
2794		2628
2795	return NULL;	2629	return NULL;
2796	}	2630	}
2797		2631
2798	/*	2632	/*
…		…
2803	* The returned string is shared.	2637	* The returned string is shared.
2804	*/	2638	*/
2805	const char *	2639	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2640	get_ob_key_value (const object *op, const char *const key)
2807	{	2641	{
2808	key_value *	2642	key_value *link;
2809	link;	2643	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2644
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2645	if (!canonical_key)
2816	{	2646	{
2817	/* 1. There being a field named key on any object	2647	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2648	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2649	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2650	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2651	*/
2822	return NULL;	2652	return 0;
2823	}	2653	}
2824		2654
2825	/* This is copied from get_ob_key_link() above -	2655	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2656	* only 4 lines, and saves the function call overhead.
2827	*/	2657	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2658	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2659	if (link->key == canonical_key)
2831	{
2832	return link->value;	2660	return link->value;
2833	}	2661
2834	}
2835	return NULL;	2662	return 0;
2836	}	2663	}
2837		2664
2838		2665
2839	/*	2666	/*
2840	* Updates the canonical_key in op to value.	2667	* Updates the canonical_key in op to value.
…		…
2876	if (last)	2703	if (last)
2877	last->next = field->next;	2704	last->next = field->next;
2878	else	2705	else
2879	op->key_values = field->next;	2706	op->key_values = field->next;
2880		2707
2881	delete
2882	field;	2708	delete field;
2883	}	2709	}
2884	}	2710	}
2885	return TRUE;	2711	return TRUE;
2886	}	2712	}
2887	/* IF we get here, key doesn't exist */	2713	/* IF we get here, key doesn't exist */
…		…
2922	* Returns TRUE on success.	2748	* Returns TRUE on success.
2923	*/	2749	*/
2924	int	2750	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2751	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2752	{
2927	shstr
2928	key_ (key);	2753	shstr key_ (key);
2929		2754
2930	return set_ob_key_value_s (op, key_, value, add_key);	2755	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2756	}
		2757
		2758	object::depth_iterator::depth_iterator (object *container)
		2759	: iterator_base (container)
		2760	{
		2761	while (item->inv)
		2762	item = item->inv;
		2763	}
		2764
		2765	void
		2766	object::depth_iterator::next ()
		2767	{
		2768	if (item->below)
		2769	{
		2770	item = item->below;
		2771
		2772	while (item->inv)
		2773	item = item->inv;
		2774	}
		2775	else
		2776	item = item->env;
		2777	}
		2778
		2779	// return a suitable string describing an objetc in enough detail to find it
		2780	const char *
		2781	object::debug_desc (char *info) const
		2782	{
		2783	char info2[256 * 3];
		2784	char *p = info;
		2785
		2786	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2787	count,
		2788	&name,
		2789	title ? " " : "",
		2790	title ? (const char *)title : "");
		2791
		2792	if (env)
		2793	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2794
		2795	if (map)
		2796	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2797
		2798	return info;
		2799	}
		2800
		2801	const char *
		2802	object::debug_desc () const
		2803	{
		2804	static char info[256 * 3];
		2805	return debug_desc (info);
		2806	}
		2807

Diff Legend

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