ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.65 by root, Wed Dec 13 00:42:03 2006 UTC

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

Diff Legend

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