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

Diff Legend

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