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.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.64 by root, Tue Dec 12 21:39:56 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.27 2006/09/11 12:08:45 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);
681	}	591	}
682		592
683	/*	593	/*
684	* If an object with the IS_TURNABLE() flag needs to be turned due	594	* 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	595	* to the closest player being on the other side, this function can
…		…
698	/*	608	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	609	* 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.	610	* 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.	611	* This function needs to be called whenever the speed of an object changes.
702	*/	612	*/
703
704	void	613	void
705	update_ob_speed (object *op)	614	update_ob_speed (object *op)
706	{	615	{
707	extern int arch_init;	616	extern int arch_init;
708		617
…		…
717	abort ();	626	abort ();
718	#else	627	#else
719	op->speed = 0;	628	op->speed = 0;
720	#endif	629	#endif
721	}	630	}
		631
722	if (arch_init)	632	if (arch_init)
723	{
724	return;	633	return;
725	}	634
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	635	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	636	{
728	/* If already on active list, don't do anything */	637	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	638	if (op->active_next || op->active_prev || op == active_objects)
730	return;	639	return;
731		640
732	/* process_events() expects us to insert the object at the beginning	641	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	642	* of the list. */
734	op->active_next = active_objects;	643	op->active_next = active_objects;
		644
735	if (op->active_next != NULL)	645	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	646	op->active_next->active_prev = op;
		647
737	active_objects = op;	648	active_objects = op;
738	}	649	}
739	else	650	else
740	{	651	{
741	/* If not on the active list, nothing needs to be done */	652	/* If not on the active list, nothing needs to be done */
…		…
743	return;	654	return;
744		655
745	if (op->active_prev == NULL)	656	if (op->active_prev == NULL)
746	{	657	{
747	active_objects = op->active_next;	658	active_objects = op->active_next;
		659
748	if (op->active_next != NULL)	660	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	661	op->active_next->active_prev = NULL;
750	}	662	}
751	else	663	else
752	{	664	{
753	op->active_prev->active_next = op->active_next;	665	op->active_prev->active_next = op->active_next;
		666
754	if (op->active_next)	667	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	668	op->active_next->active_prev = op->active_prev;
756	}	669	}
		670
757	op->active_next = NULL;	671	op->active_next = NULL;
758	op->active_prev = NULL;	672	op->active_prev = NULL;
759	}	673	}
760	}	674	}
761		675
…		…
886	update_now = 1;	800	update_now = 1;
887		801
888	if ((move_slow | op->move_slow) != move_slow)	802	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;	803	update_now = 1;
890	}	804	}
		805
891	/* if the object is being removed, we can't make intelligent	806	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	807	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	808	* that is being removed.
894	*/	809	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	810	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	update_now = 1;	811	update_now = 1;
897	else if (action == UP_OBJ_FACE)	812	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	813	/* Nothing to do for that case */ ;
899	else	814	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	815	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		816
902	if (update_now)	817	if (update_now)
903	{	818	{
…		…
907		822
908	if (op->more != NULL)	823	if (op->more != NULL)
909	update_object (op->more, action);	824	update_object (op->more, action);
910	}	825	}
911		826
912	static unordered_vector<object *> mortals;	827	object::vector object::mortals;
913	static std::vector<object *> freed;	828	object::vector object::objects; // not yet used
		829	object *object::first;
914		830
915	void object::free_mortals ()	831	void object::free_mortals ()
916	{	832	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	833	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
918	if (!(*i)->refcount)	834	if ((*i)->refcnt)
		835	++i; // further delay freeing
		836	else
919	{	837	{
920	freed.push_back (*i);	838	delete *i;
921	mortals.erase (i);	839	mortals.erase (i);
922	}	840	}
923	else
924	++i;
925	}	841	}
926		842
927	object::object ()	843	object::object ()
928	{	844	{
929	SET_FLAG (this, FLAG_REMOVED);	845	SET_FLAG (this, FLAG_REMOVED);
930		846
931	expmul = 1.0;	847	expmul = 1.0;
932	face = blank_face;	848	face = blank_face;
933	attacked_by_count = -1;
934	}	849	}
935		850
936	object::~object ()	851	object::~object ()
937	{	852	{
938	free_key_values (this);	853	free_key_values (this);
939	}	854	}
940		855
941	void object::link ()	856	void object::link ()
942	{	857	{
943	count = ++ob_count;	858	count = ++ob_count;
		859	uuid = gen_uuid ();
944		860
945	prev = 0;	861	prev = 0;
946	next = objects;	862	next = object::first;
947		863
948	if (objects)	864	if (object::first)
949	objects->prev = this;	865	object::first->prev = this;
950		866
951	objects = this;	867	object::first = this;
952	}	868	}
953		869
954	void object::unlink ()	870	void object::unlink ()
955	{	871	{
956	count = 0;	872	if (this == object::first)
		873	object::first = next;
957		874
958	/* Remove this object from the list of used objects */	875	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;	876	if (prev) prev->next = next;
		877	if (next) next->prev = prev;
		878
962	prev = 0;	879	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;	880	next = 0;
969	}
970
971	if (this == objects)
972	objects = next;
973	}	881	}
974		882
975	object *object::create ()	883	object *object::create ()
976	{	884	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	885	object *op = new object;
981	else
982	{
983	// highly annoying, but the only way to get it stable right now
984	op = freed.back (); freed.pop_back ();
985	op->~object ();
986	new ((void *)op) object;
987	}
988
989	op->link ();	886	op->link ();
990	return op;	887	return op;
991	}	888	}
992		889
993	/*	890	/*
…		…
995	* it from the list of used objects, and puts it on the list of	892	* it from the list of used objects, and puts it on the list of
996	* free objects. The IS_FREED() flag is set in the object.	893	* free objects. The IS_FREED() flag is set in the object.
997	* The object must have been removed by remove_ob() first for	894	* The object must have been removed by remove_ob() first for
998	* this function to succeed.	895	* this function to succeed.
999	*	896	*
1000	* If free_inventory is set, free inventory as well. Else drop items in	897	* If destroy_inventory is set, free inventory as well. Else drop items in
1001	* inventory to the ground.	898	* inventory to the ground.
1002	*/	899	*/
1003	void object::free (bool free_inventory)	900	void object::destroy (bool destroy_inventory)
1004	{	901	{
		902	if (QUERY_FLAG (this, FLAG_FREED))
		903	return;
		904
		905	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		906	remove_friendly_object (this);
		907
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	908	if (!QUERY_FLAG (this, FLAG_REMOVED))
1006	{	909	remove ();
1007	LOG (llevDebug, "Free object called with non removed object\n");
1008	dump_object (this);
1009	#ifdef MANY_CORES
1010	abort ();
1011	#endif
1012	}
1013		910
1014	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1015	{
1016	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1017	remove_friendly_object (this);
1018	}
1019
1020	if (QUERY_FLAG (this, FLAG_FREED))	911	SET_FLAG (this, FLAG_FREED);
1021	{
1022	dump_object (this);
1023	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1024	return;
1025	}
1026		912
1027	if (more)	913	if (more)
1028	{	914	{
1029	more->free (free_inventory);	915	more->destroy (destroy_inventory);
1030	more = 0;	916	more = 0;
1031	}	917	}
1032		918
1033	if (inv)	919	if (inv)
1034	{	920	{
1035	/* Only if the space blocks everything do we not process -	921	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects	922	* if some form of movement is allowed, let objects
1037	* drop on that space.	923	* drop on that space.
1038	*/	924	*/
1039	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	925	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1040	{	926	{
1041	object *	927	object *op = inv;
1042	op = inv;
1043		928
1044	while (op)	929	while (op)
1045	{	930	{
1046	object *
1047	tmp = op->below;	931	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	932	op->destroy (destroy_inventory);
1051	op = tmp;	933	op = tmp;
1052	}	934	}
1053	}	935	}
1054	else	936	else
1055	{ /* Put objects in inventory onto this space */	937	{ /* Put objects in inventory onto this space */
1056	object *	938	object *op = inv;
1057	op = inv;
1058		939
1059	while (op)	940	while (op)
1060	{	941	{
1061	object *
1062	tmp = op->below;	942	object *tmp = op->below;
1063		943
1064	remove_ob (op);	944	op->remove ();
1065		945
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	946	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1067	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	947	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1068	free_object (op);	948	op->destroy ();
1069	else	949	else
1070	{	950	{
1071	op->x = x;	951	op->x = x;
1072	op->y = y;	952	op->y = y;
1073	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	953	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1076	op = tmp;	956	op = tmp;
1077	}	957	}
1078	}	958	}
1079	}	959	}
1080		960
1081	clear_owner (this);	961	// hack to ensure that freed objects still have a valid map
		962	{
		963	static maptile *freed_map; // freed objects are moved here to avoid crashes
		964
		965	if (!freed_map)
		966	{
		967	freed_map = new maptile;
		968
		969	freed_map->name = "/internal/freed_objects_map";
		970	freed_map->width = 3;
		971	freed_map->height = 3;
		972
		973	freed_map->allocate ();
		974	}
		975
		976	map = freed_map;
		977	x = 1;
		978	y = 1;
		979	}
		980
		981	// clear those pointers that likely might have circular references to us
		982	owner = 0;
		983	enemy = 0;
		984	attacked_by = 0;
		985
		986	// only relevant for players(?), but make sure of it anyways
		987	contr = 0;
1082		988
1083	/* Remove object from the active list */	989	/* Remove object from the active list */
1084	speed = 0;	990	speed = 0;
1085	update_ob_speed (this);	991	update_ob_speed (this);
1086		992
1087	unlink ();	993	unlink ();
1088		994
1089	SET_FLAG (this, FLAG_FREED);
1090
1091	mortals.push_back (this);	995	mortals.push_back (this);
1092	}	996	}
1093		997
1094	/*	998	/*
1095	* sub_weight() recursively (outwards) subtracts a number from the	999	* sub_weight() recursively (outwards) subtracts a number from the
1096	* weight of an object (and what is carried by it's environment(s)).	1000	* weight of an object (and what is carried by it's environment(s)).
1097	*/	1001	*/
1098
1099	void	1002	void
1100	sub_weight (object *op, signed long weight)	1003	sub_weight (object *op, signed long weight)
1101	{	1004	{
1102	while (op != NULL)	1005	while (op != NULL)
1103	{	1006	{
1104	if (op->type == CONTAINER)	1007	if (op->type == CONTAINER)
1105	{
1106	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1008	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1107	}	1009
1108	op->carrying -= weight;	1010	op->carrying -= weight;
1109	op = op->env;	1011	op = op->env;
1110	}	1012	}
1111	}	1013	}
1112		1014
1113	/* remove_ob(op):	1015	/* op->remove ():
1114	* This function removes the object op from the linked list of objects	1016	* This function removes the object op from the linked list of objects
1115	* which it is currently tied to. When this function is done, the	1017	* which it is currently tied to. When this function is done, the
1116	* object will have no environment. If the object previously had an	1018	* object will have no environment. If the object previously had an
1117	* environment, the x and y coordinates will be updated to	1019	* environment, the x and y coordinates will be updated to
1118	* the previous environment.	1020	* the previous environment.
1119	* Beware: This function is called from the editor as well!	1021	* Beware: This function is called from the editor as well!
1120	*/	1022	*/
1121
1122	void	1023	void
1123	remove_ob (object *op)	1024	object::remove ()
1124	{	1025	{
1125	object *tmp, *last = NULL;	1026	object *tmp, *last = 0;
1126	object *otmp;	1027	object *otmp;
1127		1028
1128	tag_t tag;
1129	int check_walk_off;	1029	int check_walk_off;
1130	mapstruct *m;
1131		1030
1132	sint16 x, y;
1133
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	1031	if (QUERY_FLAG (this, FLAG_REMOVED))
1135	{	1032	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		1033
1139	/* Changed it to always dump core in this case. As has been learned
1140	* in the past, trying to recover from errors almost always
1141	* make things worse, and this is a real error here - something
1142	* that should not happen.
1143	* Yes, if this was a mission critical app, trying to do something
1144	* to recover may make sense, but that is because failure of the app
1145	* may have other disastrous problems. Cf runs out of a script
1146	* so is easily enough restarted without any real problems.
1147	* MSW 2001-07-01
1148	*/
1149	abort ();
1150	}
1151
1152	if (op->more != NULL)
1153	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);	1034	SET_FLAG (this, FLAG_REMOVED);
		1035
		1036	if (more)
		1037	more->remove ();
1156		1038
1157	/*	1039	/*
1158	* In this case, the object to be removed is in someones	1040	* In this case, the object to be removed is in someones
1159	* inventory.	1041	* inventory.
1160	*/	1042	*/
1161	if (op->env != NULL)	1043	if (env)
1162	{	1044	{
1163	if (op->nrof)	1045	if (nrof)
1164	sub_weight (op->env, op->weight * op->nrof);	1046	sub_weight (env, weight * nrof);
1165	else	1047	else
1166	sub_weight (op->env, op->weight + op->carrying);	1048	sub_weight (env, weight + carrying);
1167		1049
1168	/* NO_FIX_PLAYER is set when a great many changes are being	1050	/* NO_FIX_PLAYER is set when a great many changes are being
1169	* made to players inventory. If set, avoiding the call	1051	* made to players inventory. If set, avoiding the call
1170	* to save cpu time.	1052	* to save cpu time.
1171	*/	1053	*/
1172	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1054	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1173	fix_player (otmp);	1055	fix_player (otmp);
1174		1056
1175	if (op->above != NULL)	1057	if (above != NULL)
1176	op->above->below = op->below;	1058	above->below = below;
1177	else	1059	else
1178	op->env->inv = op->below;	1060	env->inv = below;
1179		1061
1180	if (op->below != NULL)	1062	if (below != NULL)
1181	op->below->above = op->above;	1063	below->above = above;
1182		1064
1183	/* we set up values so that it could be inserted into	1065	/* we set up values so that it could be inserted into
1184	* the map, but we don't actually do that - it is up	1066	* the map, but we don't actually do that - it is up
1185	* to the caller to decide what we want to do.	1067	* to the caller to decide what we want to do.
1186	*/	1068	*/
1187	op->x = op->env->x, op->y = op->env->y;	1069	x = env->x, y = env->y;
1188	op->map = op->env->map;	1070	map = env->map;
1189	op->above = NULL, op->below = NULL;	1071	above = 0, below = 0;
1190	op->env = NULL;	1072	env = 0;
1191	return;
1192	}
1193
1194	/* If we get here, we are removing it from a map */
1195	if (op->map == NULL)
1196	return;
1197
1198	x = op->x;
1199	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);
1201
1202	if (!m)
1203	{	1073	}
1204	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1074	else if (map)
1205	op->map->path, op->x, op->y);	1075	{
1206	/* in old days, we used to set x and y to 0 and continue.	1076	/* Re did the following section of code - it looks like it had
1207	* it seems if we get into this case, something is probablye	1077	* lots of logic for things we no longer care about
1208	* screwed up and should be fixed.
1209	*/	1078	*/
1210	abort ();
1211	}
1212	if (op->map != m)
1213	{
1214	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1215	op->map->path, m->path, op->x, op->y, x, y);
1216	}
1217		1079
1218	/* Re did the following section of code - it looks like it had
1219	* lots of logic for things we no longer care about
1220	*/
1221
1222	/* link the object above us */	1080	/* link the object above us */
1223	if (op->above)	1081	if (above)
1224	op->above->below = op->below;	1082	above->below = below;
1225	else	1083	else
1226	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1084	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1227		1085
1228	/* Relink the object below us, if there is one */	1086	/* Relink the object below us, if there is one */
1229	if (op->below)	1087	if (below)
1230	op->below->above = op->above;	1088	below->above = above;
1231	else	1089	else
1232	{	1090	{
1233	/* Nothing below, which means we need to relink map object for this space	1091	/* Nothing below, which means we need to relink map object for this space
1234	* use translated coordinates in case some oddness with map tiling is	1092	* use translated coordinates in case some oddness with map tiling is
1235	* evident	1093	* evident
1236	*/
1237	if (GET_MAP_OB (m, x, y) != op)
1238	{
1239	dump_object (op);
1240	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",
1241	errmsg);
1242	dump_object (GET_MAP_OB (m, x, y));
1243	LOG (llevError, "%s\n", errmsg);
1244	}
1245
1246	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1247	}
1248
1249	op->above = NULL;
1250	op->below = NULL;
1251
1252	if (op->map->in_memory == MAP_SAVING)
1253	return;
1254
1255	tag = op->count;
1256	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1257
1258	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1259	{
1260	/* No point updating the players look faces if he is the object
1261	* being removed.
1262	*/
1263
1264	if (tmp->type == PLAYER && tmp != op)
1265	{
1266	/* If a container that the player is currently using somehow gets
1267	* removed (most likely destroyed), update the player view
1268	* appropriately.
1269	*/	1094	*/
1270	if (tmp->container == op)	1095	if (GET_MAP_OB (map, x, y) != this)
1271	{	1096	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1097	char *dump = dump_object (this);
1273	tmp->container = NULL;	1098	LOG (llevError,
		1099	"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);
		1100	free (dump);
		1101	dump = dump_object (GET_MAP_OB (map, x, y));
		1102	LOG (llevError, "%s\n", dump);
		1103	free (dump);
1274	}	1104	}
1275		1105
1276	tmp->contr->socket.update_look = 1;	1106	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1277	}
1278	/* See if player moving off should effect something */
1279	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1280	{	1107	}
1281	move_apply (tmp, op, NULL);
1282		1108
1283	if (was_destroyed (op, tag))	1109	above = 0;
		1110	below = 0;
		1111
		1112	if (map->in_memory == MAP_SAVING)
		1113	return;
		1114
		1115	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1116
		1117	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1118	{
		1119	/* No point updating the players look faces if he is the object
		1120	* being removed.
		1121	*/
		1122
		1123	if (tmp->type == PLAYER && tmp != this)
1284	{	1124	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1125	/* If a container that the player is currently using somehow gets
		1126	* removed (most likely destroyed), update the player view
		1127	* appropriately.
		1128	*/
		1129	if (tmp->container == this)
		1130	{
		1131	CLEAR_FLAG (this, FLAG_APPLIED);
		1132	tmp->container = 0;
		1133	}
		1134
		1135	tmp->contr->socket.update_look = 1;
1286	}	1136	}
		1137
		1138	/* See if player moving off should effect something */
		1139	if (check_walk_off
		1140	&& ((move_type & tmp->move_off)
		1141	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1142	{
		1143	move_apply (tmp, this, 0);
		1144
		1145	if (destroyed ())
		1146	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1287	}	1147	}
1288		1148
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1149	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1150
1291	if (tmp->above == tmp)	1151	if (tmp->above == tmp)
1292	tmp->above = NULL;	1152	tmp->above = 0;
1293		1153
1294	last = tmp;	1154	last = tmp;
1295	}	1155	}
1296		1156
1297	/* last == NULL of there are no objects on this space */	1157	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1158	if (!last)
1299	{	1159	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1160	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1161	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1302	* those out anyways, and if there are any flags set right now, they won't	1162	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.	1163	* be correct anyways.
1304	*/	1164	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1165	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);	1166	update_position (map, x, y);
1307	}	1167	}
1308	else	1168	else
1309	update_object (last, UP_OBJ_REMOVE);	1169	update_object (last, UP_OBJ_REMOVE);
1310		1170
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1171	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1312	update_all_los (op->map, op->x, op->y);	1172	update_all_los (map, x, y);
		1173	}
1313	}	1174	}
1314		1175
1315	/*	1176	/*
1316	* merge_ob(op,top):	1177	* merge_ob(op,top):
1317	*	1178	*
1318	* This function goes through all objects below and including top, and	1179	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1180	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1181	* If top is NULL, it is calculated.
1321	* Returns pointer to object if it succeded in the merge, otherwise NULL	1182	* Returns pointer to object if it succeded in the merge, otherwise NULL
1322	*/	1183	*/
1323
1324	object *	1184	object *
1325	merge_ob (object *op, object *top)	1185	merge_ob (object *op, object *top)
1326	{	1186	{
1327	if (!op->nrof)	1187	if (!op->nrof)
1328	return 0;	1188	return 0;
		1189
1329	if (top == NULL)	1190	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1191	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1192
1331	for (; top != NULL; top = top->below)	1193	for (; top != NULL; top = top->below)
1332	{	1194	{
1333	if (top == op)	1195	if (top == op)
1334	continue;	1196	continue;
1335	if (CAN_MERGE (op, top))	1197	if (CAN_MERGE (op, top))
1336	{	1198	{
1337	top->nrof += op->nrof;	1199	top->nrof += op->nrof;
1338		1200
1339	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1201	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1340	op->weight = 0; /* Don't want any adjustements now */	1202	op->weight = 0; /* Don't want any adjustements now */
1341	remove_ob (op);	1203	op->destroy ();
1342	free_object (op);
1343	return top;	1204	return top;
1344	}	1205	}
1345	}	1206	}
		1207
1346	return NULL;	1208	return 0;
1347	}	1209	}
1348		1210
1349	/*	1211	/*
1350	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1212	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1351	* job preparing multi-part monsters	1213	* job preparing multi-part monsters
1352	*/	1214	*/
1353	object *	1215	object *
1354	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1216	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1355	{	1217	{
1356	object *	1218	object *tmp;
1357	tmp;
1358		1219
1359	if (op->head)	1220	if (op->head)
1360	op = op->head;	1221	op = op->head;
		1222
1361	for (tmp = op; tmp; tmp = tmp->more)	1223	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1224	{
1363	tmp->x = x + tmp->arch->clone.x;	1225	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1226	tmp->y = y + tmp->arch->clone.y;
1365	}	1227	}
		1228
1366	return insert_ob_in_map (op, m, originator, flag);	1229	return insert_ob_in_map (op, m, originator, flag);
1367	}	1230	}
1368		1231
1369	/*	1232	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1233	* insert_ob_in_map (op, map, originator, flag):
…		…
1386	* NULL if 'op' was destroyed	1249	* NULL if 'op' was destroyed
1387	* just 'op' otherwise	1250	* just 'op' otherwise
1388	*/	1251	*/
1389		1252
1390	object *	1253	object *
1391	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1254	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1392	{	1255	{
1393	object *tmp, *top, *floor = NULL;	1256	object *tmp, *top, *floor = NULL;
1394	sint16 x, y;	1257	sint16 x, y;
1395		1258
1396	if (QUERY_FLAG (op, FLAG_FREED))	1259	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1399	return NULL;	1262	return NULL;
1400	}	1263	}
1401		1264
1402	if (m == NULL)	1265	if (m == NULL)
1403	{	1266	{
1404	dump_object (op);	1267	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1268	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1269	free (dump);
1406	return op;	1270	return op;
1407	}	1271	}
1408		1272
1409	if (out_of_map (m, op->x, op->y))	1273	if (out_of_map (m, op->x, op->y))
1410	{	1274	{
1411	dump_object (op);	1275	char *dump = dump_object (op);
1412	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1276	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1413	#ifdef MANY_CORES	1277	#ifdef MANY_CORES
1414	/* Better to catch this here, as otherwise the next use of this object	1278	/* Better to catch this here, as otherwise the next use of this object
1415	* is likely to cause a crash. Better to find out where it is getting	1279	* is likely to cause a crash. Better to find out where it is getting
1416	* improperly inserted.	1280	* improperly inserted.
1417	*/	1281	*/
1418	abort ();	1282	abort ();
1419	#endif	1283	#endif
		1284	free (dump);
1420	return op;	1285	return op;
1421	}	1286	}
1422		1287
1423	if (!QUERY_FLAG (op, FLAG_REMOVED))	1288	if (!QUERY_FLAG (op, FLAG_REMOVED))
1424	{	1289	{
1425	dump_object (op);	1290	char *dump = dump_object (op);
1426	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1291	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1292	free (dump);
1427	return op;	1293	return op;
1428	}	1294	}
1429		1295
1430	if (op->more != NULL)	1296	if (op->more != NULL)
1431	{	1297	{
…		…
1472	if (op->nrof && !(flag & INS_NO_MERGE))	1338	if (op->nrof && !(flag & INS_NO_MERGE))
1473	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1339	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1474	if (CAN_MERGE (op, tmp))	1340	if (CAN_MERGE (op, tmp))
1475	{	1341	{
1476	op->nrof += tmp->nrof;	1342	op->nrof += tmp->nrof;
1477	remove_ob (tmp);	1343	tmp->destroy ();
1478	free_object (tmp);
1479	}	1344	}
1480		1345
1481	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1346	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1482	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1347	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1483		1348
…		…
1661	* op is the object to insert it under: supplies x and the map.	1526	* op is the object to insert it under: supplies x and the map.
1662	*/	1527	*/
1663	void	1528	void
1664	replace_insert_ob_in_map (const char *arch_string, object *op)	1529	replace_insert_ob_in_map (const char *arch_string, object *op)
1665	{	1530	{
1666	object *tmp;	1531	object *
		1532	tmp;
1667	object *tmp1;	1533	object *
		1534	tmp1;
1668		1535
1669	/* first search for itself and remove any old instances */	1536	/* first search for itself and remove any old instances */
1670		1537
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1538	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{
1673	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1539	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1674	{	1540	tmp->destroy ();
1675	remove_ob (tmp);
1676	free_object (tmp);
1677	}
1678	}
1679		1541
1680	tmp1 = arch_to_object (find_archetype (arch_string));	1542	tmp1 = arch_to_object (archetype::find (arch_string));
1681		1543
1682	tmp1->x = op->x;	1544	tmp1->x = op->x;
1683	tmp1->y = op->y;	1545	tmp1->y = op->y;
1684	insert_ob_in_map (tmp1, op->map, op, 0);	1546	insert_ob_in_map (tmp1, op->map, op, 0);
1685	}	1547	}
…		…
1693	*/	1555	*/
1694		1556
1695	object *	1557	object *
1696	get_split_ob (object *orig_ob, uint32 nr)	1558	get_split_ob (object *orig_ob, uint32 nr)
1697	{	1559	{
1698	object *	1560	object *newob;
1699	newob;
1700	int
1701	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1561	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1702		1562
1703	if (orig_ob->nrof < nr)	1563	if (orig_ob->nrof < nr)
1704	{	1564	{
1705	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1565	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1706	return NULL;	1566	return NULL;
1707	}	1567	}
		1568
1708	newob = object_create_clone (orig_ob);	1569	newob = object_create_clone (orig_ob);
		1570
1709	if ((orig_ob->nrof -= nr) < 1)	1571	if ((orig_ob->nrof -= nr) < 1)
1710	{	1572	orig_ob->destroy (1);
1711	if (!is_removed)
1712	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);
1714	}
1715	else if (!is_removed)	1573	else if (!is_removed)
1716	{	1574	{
1717	if (orig_ob->env != NULL)	1575	if (orig_ob->env != NULL)
1718	sub_weight (orig_ob->env, orig_ob->weight * nr);	1576	sub_weight (orig_ob->env, orig_ob->weight * nr);
1719	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1577	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1721	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1579	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1722	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1580	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1723	return NULL;	1581	return NULL;
1724	}	1582	}
1725	}	1583	}
		1584
1726	newob->nrof = nr;	1585	newob->nrof = nr;
1727		1586
1728	return newob;	1587	return newob;
1729	}	1588	}
1730		1589
…		…
1737	*/	1596	*/
1738		1597
1739	object *	1598	object *
1740	decrease_ob_nr (object *op, uint32 i)	1599	decrease_ob_nr (object *op, uint32 i)
1741	{	1600	{
1742	object *	1601	object *tmp;
1743	tmp;
1744	player *	1602	player *pl;
1745	pl;
1746		1603
1747	if (i == 0) /* objects with op->nrof require this check */	1604	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1605	return op;
1749		1606
1750	if (i > op->nrof)	1607	if (i > op->nrof)
1751	i = op->nrof;	1608	i = op->nrof;
1752		1609
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1610	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1611	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1612	else if (op->env != NULL)
1758	{	1613	{
1759	/* is this object in the players inventory, or sub container	1614	/* is this object in the players inventory, or sub container
1760	* therein?	1615	* therein?
1761	*/	1616	*/
…		…
1786	esrv_send_item (tmp, op);	1641	esrv_send_item (tmp, op);
1787	}	1642	}
1788	}	1643	}
1789	else	1644	else
1790	{	1645	{
1791	remove_ob (op);	1646	op->remove ();
1792	op->nrof = 0;	1647	op->nrof = 0;
1793	if (tmp)	1648	if (tmp)
1794	{	1649	{
1795	esrv_del_item (tmp->contr, op->count);	1650	esrv_del_item (tmp->contr, op->count);
1796	}	1651	}
1797	}	1652	}
1798	}	1653	}
1799	else	1654	else
1800	{	1655	{
1801	object *
1802	above = op->above;	1656	object *above = op->above;
1803		1657
1804	if (i < op->nrof)	1658	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1659	op->nrof -= i;
1807	}
1808	else	1660	else
1809	{	1661	{
1810	remove_ob (op);	1662	op->remove ();
1811	op->nrof = 0;	1663	op->nrof = 0;
1812	}	1664	}
		1665
1813	/* Since we just removed op, op->above is null */	1666	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1667	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1668	if (tmp->type == PLAYER)
1816	{	1669	{
1817	if (op->nrof)	1670	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1673	esrv_del_item (tmp->contr, op->count);
1821	}	1674	}
1822	}	1675	}
1823		1676
1824	if (op->nrof)	1677	if (op->nrof)
1825	{
1826	return op;	1678	return op;
1827	}
1828	else	1679	else
1829	{	1680	{
1830	free_object (op);	1681	op->destroy ();
1831	return NULL;	1682	return NULL;
1832	}	1683	}
1833	}	1684	}
1834		1685
1835	/*	1686	/*
…		…
1841	add_weight (object *op, signed long weight)	1692	add_weight (object *op, signed long weight)
1842	{	1693	{
1843	while (op != NULL)	1694	while (op != NULL)
1844	{	1695	{
1845	if (op->type == CONTAINER)	1696	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1697	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1698
1849	op->carrying += weight;	1699	op->carrying += weight;
1850	op = op->env;	1700	op = op->env;
1851	}	1701	}
1852	}	1702	}
1853		1703
		1704	object *
		1705	insert_ob_in_ob (object *op, object *where)
		1706	{
		1707	if (!where)
		1708	{
		1709	char *dump = dump_object (op);
		1710	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1711	free (dump);
		1712	return op;
		1713	}
		1714
		1715	if (where->head)
		1716	{
		1717	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1718	where = where->head;
		1719	}
		1720
		1721	return where->insert (op);
		1722	}
		1723
1854	/*	1724	/*
1855	* insert_ob_in_ob(op,environment):	1725	* env->insert (op)
1856	* This function inserts the object op in the linked list	1726	* This function inserts the object op in the linked list
1857	* inside the object environment.	1727	* inside the object environment.
1858	*	1728	*
1859	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1860	* the inventory at the last position or next to other objects of the same
1861	* type.
1862	* Frank: Now sorted by type, archetype and magic!
1863	*
1864	* The function returns now pointer to inserted item, and return value can	1729	* The function returns now pointer to inserted item, and return value can
1865	* be != op, if items are merged. -Tero	1730	* be != op, if items are merged. -Tero
1866	*/	1731	*/
1867		1732
1868	object *	1733	object *
1869	insert_ob_in_ob (object *op, object *where)	1734	object::insert (object *op)
1870	{	1735	{
1871	object *	1736	object *tmp, *otmp;
1872	tmp, *
1873	otmp;
1874		1737
1875	if (!QUERY_FLAG (op, FLAG_REMOVED))	1738	if (!QUERY_FLAG (op, FLAG_REMOVED))
1876	{	1739	op->remove ();
1877	dump_object (op);	1740
1878	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1879	return op;
1880	}
1881	if (where == NULL)
1882	{
1883	dump_object (op);
1884	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1885	return op;
1886	}
1887	if (where->head)
1888	{
1889	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1890	where = where->head;
1891	}
1892	if (op->more)	1741	if (op->more)
1893	{	1742	{
1894	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1743	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1895	return op;	1744	return op;
1896	}	1745	}
		1746
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1747	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1748	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1749	if (op->nrof)
1900	{	1750	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1751	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1902	if (CAN_MERGE (tmp, op))	1752	if (CAN_MERGE (tmp, op))
1903	{	1753	{
1904	/* return the original object and remove inserted object	1754	/* return the original object and remove inserted object
1905	(client needs the original object) */	1755	(client needs the original object) */
1906	tmp->nrof += op->nrof;	1756	tmp->nrof += op->nrof;
1907	/* Weight handling gets pretty funky. Since we are adding to	1757	/* Weight handling gets pretty funky. Since we are adding to
1908	* tmp->nrof, we need to increase the weight.	1758	* tmp->nrof, we need to increase the weight.
1909	*/	1759	*/
1910	add_weight (where, op->weight * op->nrof);	1760	add_weight (this, op->weight * op->nrof);
1911	SET_FLAG (op, FLAG_REMOVED);	1761	SET_FLAG (op, FLAG_REMOVED);
1912	free_object (op); /* free the inserted object */	1762	op->destroy (); /* free the inserted object */
1913	op = tmp;	1763	op = tmp;
1914	remove_ob (op); /* and fix old object's links */	1764	op->remove (); /* and fix old object's links */
1915	CLEAR_FLAG (op, FLAG_REMOVED);	1765	CLEAR_FLAG (op, FLAG_REMOVED);
1916	break;	1766	break;
1917	}	1767	}
1918		1768
1919	/* I assume combined objects have no inventory	1769	/* I assume combined objects have no inventory
1920	* We add the weight - this object could have just been removed	1770	* We add the weight - this object could have just been removed
1921	* (if it was possible to merge). calling remove_ob will subtract	1771	* (if it was possible to merge). calling remove_ob will subtract
1922	* the weight, so we need to add it in again, since we actually do	1772	* the weight, so we need to add it in again, since we actually do
1923	* the linking below	1773	* the linking below
1924	*/	1774	*/
1925	add_weight (where, op->weight * op->nrof);	1775	add_weight (this, op->weight * op->nrof);
1926	}	1776	}
1927	else	1777	else
1928	add_weight (where, (op->weight + op->carrying));	1778	add_weight (this, (op->weight + op->carrying));
1929		1779
1930	otmp = is_player_inv (where);	1780	otmp = is_player_inv (this);
1931	if (otmp && otmp->contr != NULL)	1781	if (otmp && otmp->contr)
1932	{
1933	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1782	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1934	fix_player (otmp);	1783	fix_player (otmp);
1935	}
1936		1784
1937	op->map = NULL;	1785	op->map = NULL;
1938	op->env = where;	1786	op->env = this;
1939	op->above = NULL;	1787	op->above = NULL;
1940	op->below = NULL;	1788	op->below = NULL;
1941	op->x = 0, op->y = 0;	1789	op->x = 0, op->y = 0;
1942		1790
1943	/* reset the light list and los of the players on the map */	1791	/* reset the light list and los of the players on the map */
1944	if ((op->glow_radius != 0) && where->map)	1792	if ((op->glow_radius != 0) && map)
1945	{	1793	{
1946	#ifdef DEBUG_LIGHTS	1794	#ifdef DEBUG_LIGHTS
1947	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1795	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1948	#endif /* DEBUG_LIGHTS */	1796	#endif /* DEBUG_LIGHTS */
1949	if (MAP_DARKNESS (where->map))	1797	if (MAP_DARKNESS (map))
1950	update_all_los (where->map, where->x, where->y);	1798	update_all_los (map, x, y);
1951	}	1799	}
1952		1800
1953	/* Client has no idea of ordering so lets not bother ordering it here.	1801	/* Client has no idea of ordering so lets not bother ordering it here.
1954	* It sure simplifies this function...	1802	* It sure simplifies this function...
1955	*/	1803	*/
1956	if (where->inv == NULL)	1804	if (!inv)
1957	where->inv = op;	1805	inv = op;
1958	else	1806	else
1959	{	1807	{
1960	op->below = where->inv;	1808	op->below = inv;
1961	op->below->above = op;	1809	op->below->above = op;
1962	where->inv = op;	1810	inv = op;
1963	}	1811	}
		1812
1964	return op;	1813	return op;
1965	}	1814	}
1966		1815
1967	/*	1816	/*
1968	* Checks if any objects has a move_type that matches objects	1817	* Checks if any objects has a move_type that matches objects
…		…
1987		1836
1988	int	1837	int
1989	check_move_on (object *op, object *originator)	1838	check_move_on (object *op, object *originator)
1990	{	1839	{
1991	object *tmp;	1840	object *tmp;
1992	tag_t tag;
1993	mapstruct *m = op->map;	1841	maptile *m = op->map;
1994	int x = op->x, y = op->y;	1842	int x = op->x, y = op->y;
1995		1843
1996	MoveType move_on, move_slow, move_block;	1844	MoveType move_on, move_slow, move_block;
1997		1845
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1846	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1847	return 0;
2000
2001	tag = op->count;
2002		1848
2003	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1849	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2004	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1850	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2005	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1851	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2006		1852
…		…
2049	{	1895	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1896	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2051	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1897	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	1898	{
2053		1899
		1900	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	1901	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		1902
2056	if (op->type == PLAYER)	1903	if (op->type == PLAYER)
2057	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1904	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2058	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1905	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2059	diff /= 4.0;	1906	diff /= 4.0;
…		…
2066	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1913	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2067	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1914	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2068	{	1915	{
2069	move_apply (tmp, op, originator);	1916	move_apply (tmp, op, originator);
2070		1917
2071	if (was_destroyed (op, tag))	1918	if (op->destroyed ())
2072	return 1;	1919	return 1;
2073		1920
2074	/* what the person/creature stepped onto has moved the object	1921	/* what the person/creature stepped onto has moved the object
2075	* someplace new. Don't process any further - if we did,	1922	* someplace new. Don't process any further - if we did,
2076	* have a feeling strange problems would result.	1923	* have a feeling strange problems would result.
…		…
2088	* a matching archetype at the given map and coordinates.	1935	* a matching archetype at the given map and coordinates.
2089	* The first matching object is returned, or NULL if none.	1936	* The first matching object is returned, or NULL if none.
2090	*/	1937	*/
2091		1938
2092	object *	1939	object *
2093	present_arch (const archetype *at, mapstruct *m, int x, int y)	1940	present_arch (const archetype *at, maptile *m, int x, int y)
2094	{	1941	{
2095	object *	1942	object *
2096	tmp;	1943	tmp;
2097		1944
2098	if (m == NULL || out_of_map (m, x, y))	1945	if (m == NULL || out_of_map (m, x, y))
…		…
2111	* a matching type variable at the given map and coordinates.	1958	* a matching type variable at the given map and coordinates.
2112	* The first matching object is returned, or NULL if none.	1959	* The first matching object is returned, or NULL if none.
2113	*/	1960	*/
2114		1961
2115	object *	1962	object *
2116	present (unsigned char type, mapstruct *m, int x, int y)	1963	present (unsigned char type, maptile *m, int x, int y)
2117	{	1964	{
2118	object *	1965	object *
2119	tmp;	1966	tmp;
2120		1967
2121	if (out_of_map (m, x, y))	1968	if (out_of_map (m, x, y))
…		…
2261	* the archetype because that isn't correct if the monster has been	2108	* the archetype because that isn't correct if the monster has been
2262	* customized, changed states, etc.	2109	* customized, changed states, etc.
2263	*/	2110	*/
2264		2111
2265	int	2112	int
2266	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2113	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2267	{	2114	{
2268	int	2115	int
2269	i,	2116	i,
2270	index = 0, flag;	2117	index = 0, flag;
2271	static int	2118	static int
…		…
2292	return -1;	2139	return -1;
2293	return altern[RANDOM () % index];	2140	return altern[RANDOM () % index];
2294	}	2141	}
2295		2142
2296	/*	2143	/*
2297	* find_first_free_spot(archetype, mapstruct, x, y) works like	2144	* find_first_free_spot(archetype, maptile, x, y) works like
2298	* find_free_spot(), but it will search max number of squares.	2145	* find_free_spot(), but it will search max number of squares.
2299	* But it will return the first available spot, not a random choice.	2146	* But it will return the first available spot, not a random choice.
2300	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2147	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2301	*/	2148	*/
2302		2149
2303	int	2150	int
2304	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2151	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2305	{	2152	{
2306	int	2153	int
2307	i;	2154	i;
2308		2155
2309	for (i = 0; i < SIZEOFFREE; i++)	2156	for (i = 0; i < SIZEOFFREE; i++)
…		…
2373	* because we have to know what movement the thing looking to move	2220	* because we have to know what movement the thing looking to move
2374	* there is capable of.	2221	* there is capable of.
2375	*/	2222	*/
2376		2223
2377	int	2224	int
2378	find_dir (mapstruct *m, int x, int y, object *exclude)	2225	find_dir (maptile *m, int x, int y, object *exclude)
2379	{	2226	{
2380	int	2227	int
2381	i,	2228	i,
2382	max = SIZEOFFREE, mflags;	2229	max = SIZEOFFREE, mflags;
2383	sint16	2230
2384	nx,	2231	sint16 nx, ny;
2385	ny;
2386	object *	2232	object *
2387	tmp;	2233	tmp;
2388	mapstruct *	2234	maptile *
2389	mp;	2235	mp;
2390	MoveType	2236
2391	blocked,	2237	MoveType blocked, move_type;
2392	move_type;
2393		2238
2394	if (exclude && exclude->head)	2239	if (exclude && exclude->head)
2395	{	2240	{
2396	exclude = exclude->head;	2241	exclude = exclude->head;
2397	move_type = exclude->move_type;	2242	move_type = exclude->move_type;
…		…
2602	* Modified to be map tile aware -.MSW	2447	* Modified to be map tile aware -.MSW
2603	*/	2448	*/
2604		2449
2605		2450
2606	int	2451	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2452	can_see_monsterP (maptile *m, int x, int y, int dir)
2608	{	2453	{
2609	sint16	2454	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2455	int
2613	mflags;	2456	mflags;
2614		2457
2615	if (dir < 0)	2458	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2459	return 0; /* exit condition: invalid direction */
…		…
2663	* create clone from object to another	2506	* create clone from object to another
2664	*/	2507	*/
2665	object *	2508	object *
2666	object_create_clone (object *asrc)	2509	object_create_clone (object *asrc)
2667	{	2510	{
2668	object *
2669	dst = NULL, *tmp, *src, *part, *prev, *item;	2511	object *dst = 0, *tmp, *src, *part, *prev, *item;
2670		2512
2671	if (!asrc)	2513	if (!asrc)
2672	return NULL;	2514	return 0;
		2515
2673	src = asrc;	2516	src = asrc;
2674	if (src->head)	2517	if (src->head)
2675	src = src->head;	2518	src = src->head;
2676		2519
2677	prev = NULL;	2520	prev = 0;
2678	for (part = src; part; part = part->more)	2521	for (part = src; part; part = part->more)
2679	{	2522	{
2680	tmp = get_object ();	2523	tmp = object::create ();
2681	copy_object (part, tmp);	2524	part->copy_to (tmp);
2682	tmp->x -= src->x;	2525	tmp->x -= src->x;
2683	tmp->y -= src->y;	2526	tmp->y -= src->y;
		2527
2684	if (!part->head)	2528	if (!part->head)
2685	{	2529	{
2686	dst = tmp;	2530	dst = tmp;
2687	tmp->head = NULL;	2531	tmp->head = 0;
2688	}	2532	}
2689	else	2533	else
2690	{	2534	{
2691	tmp->head = dst;	2535	tmp->head = dst;
2692	}	2536	}
		2537
2693	tmp->more = NULL;	2538	tmp->more = 0;
		2539
2694	if (prev)	2540	if (prev)
2695	prev->more = tmp;	2541	prev->more = tmp;
		2542
2696	prev = tmp;	2543	prev = tmp;
2697	}	2544	}
2698		2545
2699	/*** copy inventory ***/
2700	for (item = src->inv; item; item = item->below)	2546	for (item = src->inv; item; item = item->below)
2701	{
2702	(void) insert_ob_in_ob (object_create_clone (item), dst);	2547	insert_ob_in_ob (object_create_clone (item), dst);
2703	}
2704		2548
2705	return dst;	2549	return dst;
2706	}	2550	}
2707		2551
2708	/* return true if the object was destroyed, 0 otherwise */
2709	int
2710	was_destroyed (const object *op, tag_t old_tag)
2711	{
2712	/* checking for FLAG_FREED isn't necessary, but makes this function more
2713	* robust */
2714	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2715	}
2716
2717	/* GROS - Creates an object using a string representing its content. */	2552	/* GROS - Creates an object using a string representing its content. */
2718
2719	/* Basically, we save the content of the string to a temp file, then call */	2553	/* Basically, we save the content of the string to a temp file, then call */
2720
2721	/* load_object on it. I admit it is a highly inefficient way to make things, */	2554	/* load_object on it. I admit it is a highly inefficient way to make things, */
2722
2723	/* but it was simple to make and allows reusing the load_object function. */	2555	/* but it was simple to make and allows reusing the load_object function. */
2724
2725	/* Remember not to use load_object_str in a time-critical situation. */	2556	/* Remember not to use load_object_str in a time-critical situation. */
2726
2727	/* Also remember that multiparts objects are not supported for now. */	2557	/* Also remember that multiparts objects are not supported for now. */
2728		2558
2729	object *	2559	object *
2730	load_object_str (const char *obstr)	2560	load_object_str (const char *obstr)
2731	{	2561	{
2732	object *	2562	object *op;
2733	op;
2734	char
2735	filename[MAX_BUF];	2563	char filename[MAX_BUF];
2736		2564
2737	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2565	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2738		2566
2739	FILE *
2740	tempfile = fopen (filename, "w");	2567	FILE *tempfile = fopen (filename, "w");
2741		2568
2742	if (tempfile == NULL)	2569	if (tempfile == NULL)
2743	{	2570	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2571	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2572	return NULL;
2746	};	2573	}
		2574
2747	fprintf (tempfile, obstr);	2575	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2576	fclose (tempfile);
2749		2577
2750	op = get_object ();	2578	op = object::create ();
2751		2579
2752	object_thawer	2580	object_thawer thawer (filename);
2753	thawer (filename);
2754		2581
2755	if (thawer)	2582	if (thawer)
2756	load_object (thawer, op, 0);	2583	load_object (thawer, op, 0);
2757		2584
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2585	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2766	* returns NULL if no match.	2593	* returns NULL if no match.
2767	*/	2594	*/
2768	object *	2595	object *
2769	find_obj_by_type_subtype (const object *who, int type, int subtype)	2596	find_obj_by_type_subtype (const object *who, int type, int subtype)
2770	{	2597	{
2771	object *	2598	object *tmp;
2772	tmp;
2773		2599
2774	for (tmp = who->inv; tmp; tmp = tmp->below)	2600	for (tmp = who->inv; tmp; tmp = tmp->below)
2775	if (tmp->type == type && tmp->subtype == subtype)	2601	if (tmp->type == type && tmp->subtype == subtype)
2776	return tmp;	2602	return tmp;
2777		2603
…		…
2785	* do the desired thing.	2611	* do the desired thing.
2786	*/	2612	*/
2787	key_value *	2613	key_value *
2788	get_ob_key_link (const object *ob, const char *key)	2614	get_ob_key_link (const object *ob, const char *key)
2789	{	2615	{
2790	key_value *	2616	key_value *link;
2791	link;
2792		2617
2793	for (link = ob->key_values; link != NULL; link = link->next)	2618	for (link = ob->key_values; link != NULL; link = link->next)
2794	{
2795	if (link->key == key)	2619	if (link->key == key)
2796	{
2797	return link;	2620	return link;
2798	}
2799	}
2800		2621
2801	return NULL;	2622	return NULL;
2802	}	2623	}
2803		2624
2804	/*	2625	/*
…		…
2809	* The returned string is shared.	2630	* The returned string is shared.
2810	*/	2631	*/
2811	const char *	2632	const char *
2812	get_ob_key_value (const object *op, const char *const key)	2633	get_ob_key_value (const object *op, const char *const key)
2813	{	2634	{
2814	key_value *	2635	key_value *link;
2815	link;	2636	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2637
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2638	if (!canonical_key)
2822	{	2639	{
2823	/* 1. There being a field named key on any object	2640	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2641	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2642	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, *this* object doesn't have this field.	2643	* 3. Therefore, *this* object doesn't have this field.
2827	*/	2644	*/
2828	return NULL;	2645	return 0;
2829	}	2646	}
2830		2647
2831	/* This is copied from get_ob_key_link() above -	2648	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2649	* only 4 lines, and saves the function call overhead.
2833	*/	2650	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2651	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2652	if (link->key == canonical_key)
2837	{
2838	return link->value;	2653	return link->value;
2839	}	2654
2840	}
2841	return NULL;	2655	return 0;
2842	}	2656	}
2843		2657
2844		2658
2845	/*	2659	/*
2846	* Updates the canonical_key in op to value.	2660	* Updates the canonical_key in op to value.
…		…
2882	if (last)	2696	if (last)
2883	last->next = field->next;	2697	last->next = field->next;
2884	else	2698	else
2885	op->key_values = field->next;	2699	op->key_values = field->next;
2886		2700
2887	delete
2888	field;	2701	delete field;
2889	}	2702	}
2890	}	2703	}
2891	return TRUE;	2704	return TRUE;
2892	}	2705	}
2893	/* IF we get here, key doesn't exist */	2706	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2741	* Returns TRUE on success.
2929	*/	2742	*/
2930	int	2743	int
2931	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2744	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2932	{	2745	{
2933	shstr
2934	key_ (key);	2746	shstr key_ (key);
2935		2747
2936	return set_ob_key_value_s (op, key_, value, add_key);	2748	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2749	}
		2750
		2751	object::depth_iterator::depth_iterator (object *container)
		2752	: iterator_base (container)
		2753	{
		2754	while (item->inv)
		2755	item = item->inv;
		2756	}
		2757
		2758	void
		2759	object::depth_iterator::next ()
		2760	{
		2761	if (item->below)
		2762	{
		2763	item = item->below;
		2764
		2765	while (item->inv)
		2766	item = item->inv;
		2767	}
		2768	else
		2769	item = item->env;
		2770	}
		2771
		2772	// return a suitable string describing an objetc in enough detail to find it
		2773	const char *
		2774	object::debug_desc (char *info) const
		2775	{
		2776	char info2[256 * 3];
		2777	char *p = info;
		2778
		2779	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2780	count,
		2781	&name,
		2782	title ? " " : "",
		2783	title ? (const char *)title : "");
		2784
		2785	if (env)
		2786	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2787
		2788	if (map)
		2789	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2790
		2791	return info;
		2792	}
		2793
		2794	const char *
		2795	object::debug_desc () const
		2796	{
		2797	static char info[256 * 3];
		2798	return debug_desc (info);
		2799	}
		2800

Diff Legend

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