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

Diff Legend

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