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.52 by root, Wed Sep 27 00:36:08 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: %lld\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.
…		…
372	void	445	void
373	dump_all_objects (void)	446	dump_all_objects (void)
374	{	447	{
375	object *op;	448	object *op;
376		449
377	for (op = objects; op != NULL; op = op->next)	450	for (op = object::first; op != NULL; op = op->next)
378	{	451	{
379	dump_object (op);	452	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);	453	fprintf (logfile, "Object %s\n", errmsg);
381	}	454	}
382	}	455	}
383		456
384	/*	457	/*
385	* get_nearest_part(multi-object, object 2) returns the part of the	458	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
408	object *	481	object *
409	find_object (tag_t i)	482	find_object (tag_t i)
410	{	483	{
411	object *op;	484	object *op;
412		485
413	for (op = objects; op != NULL; op = op->next)	486	for (op = object::first; op != NULL; op = op->next)
414	if (op->count == i)	487	if (op->count == i)
415	break;	488	break;
		489
416	return op;	490	return op;
417	}	491	}
418		492
419	/*	493	/*
420	* Returns the first object which has a name equal to the argument.	494	* Returns the first object which has a name equal to the argument.
…		…
423	*/	497	*/
424		498
425	object *	499	object *
426	find_object_name (const char *str)	500	find_object_name (const char *str)
427	{	501	{
428	const char *name = shstr::find (str);	502	shstr_cmp str_ (str);
429	object *op;	503	object *op;
430		504
431	for (op = objects; op != NULL; op = op->next)	505	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	506	if (op->name == str_)
433	break;	507	break;
434		508
435	return op;	509	return op;
436	}	510	}
437		511
…		…
440	{	514	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	515	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	516	}
443		517
444	/*	518	/*
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	519	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	520	* skill and experience objects.
485	*/	521	*/
486	void	522	void
487	set_owner (object *op, object *owner)	523	object::set_owner (object *owner)
488	{	524	{
489	if (owner == NULL || op == NULL)	525	if (!owner)
490	return;	526	return;
491		527
492	/* next line added to allow objects which own objects */	528	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	529	/* 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	530	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	531	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	532	* 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.	533	* didn't match, this check is valid and I believe that cause is valid.
498	*/	534	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	535	while (owner->owner)
500	owner = owner->owner;	536	owner = owner->owner;
501		537
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;	538	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	}	539	}
542		540
543	/* Zero the key_values on op, decrementing the shared-string	541	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	542	* refcounts and freeing the links.
545	*/	543	*/
…		…
561	{	559	{
562	attachable_base::clear ();	560	attachable_base::clear ();
563		561
564	free_key_values (this);	562	free_key_values (this);
565		563
566	clear_owner (this);	564	owner = 0;
567
568	name = 0;	565	name = 0;
569	name_pl = 0;	566	name_pl = 0;
570	title = 0;	567	title = 0;
571	race = 0;	568	race = 0;
572	slaying = 0;	569	slaying = 0;
573	skill = 0;	570	skill = 0;
574	msg = 0;	571	msg = 0;
575	lore = 0;	572	lore = 0;
576	custom_name = 0;	573	custom_name = 0;
577	materialname = 0;	574	materialname = 0;
		575	contr = 0;
		576	below = 0;
		577	above = 0;
		578	inv = 0;
		579	container = 0;
		580	env = 0;
		581	more = 0;
		582	head = 0;
		583	map = 0;
		584	active_next = 0;
		585	active_prev = 0;
578		586
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	587	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		588
581	SET_FLAG (this, FLAG_REMOVED);	589	SET_FLAG (this, FLAG_REMOVED);
		590
		591	/* What is not cleared is next, prev, and count */
		592
		593	expmul = 1.0;
		594	face = blank_face;
		595
		596	if (settings.casting_time)
		597	casting_time = -1;
582	}	598	}
583		599
584	void object::clone (object *destination)	600	void object::clone (object *destination)
585	{	601	{
586	*(object_copy *) destination = *this;	602	*(object_copy *)destination = *this;
587	*(object_pod *) destination = *this;	603	*(object_pod *)destination = *this;
588		604
589	if (self || cb)	605	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	606	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 */
616
617	op->expmul = 1.0;
618	op->face = blank_face;
619	op->attacked_by_count = -1;
620
621	if (settings.casting_time)
622	op->casting_time = -1;
623	}	607	}
624		608
625	/*	609	/*
626	* copy object first frees everything allocated by the second object,	610	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	611	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	612	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	613	* 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	614	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	615	* will point at garbage.
632	*/	616	*/
633
634	void	617	void
635	copy_object (object *op2, object *op)	618	copy_object (object *op2, object *op)
636	{	619	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	681	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	682	* 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.	683	* 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.	684	* This function needs to be called whenever the speed of an object changes.
702	*/	685	*/
703
704	void	686	void
705	update_ob_speed (object *op)	687	update_ob_speed (object *op)
706	{	688	{
707	extern int arch_init;	689	extern int arch_init;
708		690
…		…
717	abort ();	699	abort ();
718	#else	700	#else
719	op->speed = 0;	701	op->speed = 0;
720	#endif	702	#endif
721	}	703	}
		704
722	if (arch_init)	705	if (arch_init)
723	{
724	return;	706	return;
725	}	707
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	708	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	709	{
728	/* If already on active list, don't do anything */	710	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	711	if (op->active_next || op->active_prev || op == active_objects)
730	return;	712	return;
731		713
732	/* process_events() expects us to insert the object at the beginning	714	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	715	* of the list. */
734	op->active_next = active_objects;	716	op->active_next = active_objects;
		717
735	if (op->active_next != NULL)	718	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	719	op->active_next->active_prev = op;
		720
737	active_objects = op;	721	active_objects = op;
738	}	722	}
739	else	723	else
740	{	724	{
741	/* If not on the active list, nothing needs to be done */	725	/* If not on the active list, nothing needs to be done */
…		…
743	return;	727	return;
744		728
745	if (op->active_prev == NULL)	729	if (op->active_prev == NULL)
746	{	730	{
747	active_objects = op->active_next;	731	active_objects = op->active_next;
		732
748	if (op->active_next != NULL)	733	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	734	op->active_next->active_prev = NULL;
750	}	735	}
751	else	736	else
752	{	737	{
753	op->active_prev->active_next = op->active_next;	738	op->active_prev->active_next = op->active_next;
		739
754	if (op->active_next)	740	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	741	op->active_next->active_prev = op->active_prev;
756	}	742	}
		743
757	op->active_next = NULL;	744	op->active_next = NULL;
758	op->active_prev = NULL;	745	op->active_prev = NULL;
759	}	746	}
760	}	747	}
761		748
…		…
893	* that is being removed.	880	* that is being removed.
894	*/	881	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	882	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	update_now = 1;	883	update_now = 1;
897	else if (action == UP_OBJ_FACE)	884	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	885	/* Nothing to do for that case */ ;
899	else	886	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	887	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		888
902	if (update_now)	889	if (update_now)
903	{	890	{
…		…
907		894
908	if (op->more != NULL)	895	if (op->more != NULL)
909	update_object (op->more, action);	896	update_object (op->more, action);
910	}	897	}
911		898
912	static unordered_vector<object *> mortals;	899	object::vector object::mortals;
913	static std::vector<object *> freed;	900	object::vector object::objects; // not yet used
		901	object *object::first;
914		902
915	void object::free_mortals ()	903	void object::free_mortals ()
916	{	904	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
918	if (!(*i)->refcount)	906	if ((*i)->refcnt)
		907	++i; // further delay freeing
		908	else
919	{	909	{
920	freed.push_back (*i);	910	delete *i;
921	mortals.erase (i);	911	mortals.erase (i);
922	}	912	}
923	else	913
924	++i;	914	static int lastmortals = 0;//D
		915
		916	if (mortals.size() != lastmortals && lastmortals > 100)//D
		917	{
		918	lastmortals = mortals.size ();//D
		919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		920	}
925	}	921	}
926		922
927	object::object ()	923	object::object ()
928	{	924	{
929	SET_FLAG (this, FLAG_REMOVED);	925	SET_FLAG (this, FLAG_REMOVED);
930		926
931	expmul = 1.0;	927	expmul = 1.0;
932	face = blank_face;	928	face = blank_face;
933	attacked_by_count = -1;
934	}	929	}
935		930
936	object::~object ()	931	object::~object ()
937	{	932	{
938	free_key_values (this);	933	free_key_values (this);
939	}	934	}
940		935
941	void object::link ()	936	void object::link ()
942	{	937	{
943	count = ++ob_count;	938	count = ++ob_count;
		939	uuid = gen_uuid ();
944		940
945	prev = 0;	941	prev = 0;
946	next = objects;	942	next = object::first;
947		943
948	if (objects)	944	if (object::first)
949	objects->prev = this;	945	object::first->prev = this;
950		946
951	objects = this;	947	object::first = this;
952	}	948	}
953		949
954	void object::unlink ()	950	void object::unlink ()
955	{	951	{
956	count = 0;	952	if (this == object::first)
		953	object::first = next;
957		954
958	/* Remove this object from the list of used objects */	955	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;	956	if (prev) prev->next = next;
		957	if (next) next->prev = prev;
		958
962	prev = 0;	959	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;	960	next = 0;
969	}
970
971	if (this == objects)
972	objects = next;
973	}	961	}
974		962
975	object *object::create ()	963	object *object::create ()
976	{	964	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	965	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 ();	966	op->link ();
990	return op;	967	return op;
991	}	968	}
992		969
993	/*	970	/*
…		…
995	* it from the list of used objects, and puts it on the list of	972	* 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.	973	* free objects. The IS_FREED() flag is set in the object.
997	* The object must have been removed by remove_ob() first for	974	* The object must have been removed by remove_ob() first for
998	* this function to succeed.	975	* this function to succeed.
999	*	976	*
1000	* If free_inventory is set, free inventory as well. Else drop items in	977	* If destroy_inventory is set, free inventory as well. Else drop items in
1001	* inventory to the ground.	978	* inventory to the ground.
1002	*/	979	*/
1003	void object::free (bool free_inventory)	980	void object::destroy (bool destroy_inventory)
1004	{	981	{
		982	if (QUERY_FLAG (this, FLAG_FREED))
		983	return;
		984
		985	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		986	remove_friendly_object (this);
		987
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	988	if (!QUERY_FLAG (this, FLAG_REMOVED))
1006	{	989	remove_ob (this);
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		990
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))	991	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		992
1027	if (more)	993	if (more)
1028	{	994	{
1029	more->free (free_inventory);	995	more->destroy (destroy_inventory);
1030	more = 0;	996	more = 0;
1031	}	997	}
1032		998
1033	if (inv)	999	if (inv)
1034	{	1000	{
1035	/* Only if the space blocks everything do we not process -	1001	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects	1002	* if some form of movement is allowed, let objects
1037	* drop on that space.	1003	* drop on that space.
1038	*/	1004	*/
1039	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1005	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1040	{	1006	{
1041	object *	1007	object *op = inv;
1042	op = inv;
1043		1008
1044	while (op)	1009	while (op)
1045	{	1010	{
1046	object *
1047	tmp = op->below;	1011	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	1012	op->destroy (destroy_inventory);
1051	op = tmp;	1013	op = tmp;
1052	}	1014	}
1053	}	1015	}
1054	else	1016	else
1055	{ /* Put objects in inventory onto this space */	1017	{ /* Put objects in inventory onto this space */
1056	object *	1018	object *op = inv;
1057	op = inv;
1058		1019
1059	while (op)	1020	while (op)
1060	{	1021	{
1061	object *
1062	tmp = op->below;	1022	object *tmp = op->below;
1063		1023
1064	remove_ob (op);	1024	remove_ob (op);
1065		1025
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1026	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))	1027	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1076	op = tmp;	1036	op = tmp;
1077	}	1037	}
1078	}	1038	}
1079	}	1039	}
1080		1040
1081	clear_owner (this);	1041	// clear those pointers that likely might have circular references to us
		1042	owner = 0;
		1043	enemy = 0;
		1044	attacked_by = 0;
		1045
		1046	// only relevant for players(?), but make sure of it anyways
		1047	contr = 0;
1082		1048
1083	/* Remove object from the active list */	1049	/* Remove object from the active list */
1084	speed = 0;	1050	speed = 0;
1085	update_ob_speed (this);	1051	update_ob_speed (this);
1086		1052
1087	unlink ();	1053	unlink ();
1088		1054
1089	SET_FLAG (this, FLAG_FREED);
1090
1091	mortals.push_back (this);	1055	mortals.push_back (this);
1092	}	1056	}
1093		1057
1094	/*	1058	/*
1095	* sub_weight() recursively (outwards) subtracts a number from the	1059	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1100	sub_weight (object *op, signed long weight)	1064	sub_weight (object *op, signed long weight)
1101	{	1065	{
1102	while (op != NULL)	1066	while (op != NULL)
1103	{	1067	{
1104	if (op->type == CONTAINER)	1068	if (op->type == CONTAINER)
1105	{
1106	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1069	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1107	}	1070
1108	op->carrying -= weight;	1071	op->carrying -= weight;
1109	op = op->env;	1072	op = op->env;
1110	}	1073	}
1111	}	1074	}
1112		1075
…		…
1120	*/	1083	*/
1121		1084
1122	void	1085	void
1123	remove_ob (object *op)	1086	remove_ob (object *op)
1124	{	1087	{
1125	object *tmp, *last = NULL;	1088	object *tmp, *last = 0;
1126	object *otmp;	1089	object *otmp;
1127		1090
1128	tag_t tag;
1129	int check_walk_off;	1091	int check_walk_off;
1130	mapstruct *m;	1092	maptile *m;
1131		1093
1132	sint16 x, y;	1094	sint16 x, y;
1133		1095
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	1096	if (QUERY_FLAG (op, FLAG_REMOVED))
1135	{	1097	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		1098
1139	/* Changed it to always dump core in this case. As has been learned	1099	SET_FLAG (op, FLAG_REMOVED);
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		1100
1152	if (op->more != NULL)	1101	if (op->more != NULL)
1153	remove_ob (op->more);	1102	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);
1156		1103
1157	/*	1104	/*
1158	* In this case, the object to be removed is in someones	1105	* In this case, the object to be removed is in someones
1159	* inventory.	1106	* inventory.
1160	*/	1107	*/
…		…
1186	*/	1133	*/
1187	op->x = op->env->x, op->y = op->env->y;	1134	op->x = op->env->x, op->y = op->env->y;
1188	op->map = op->env->map;	1135	op->map = op->env->map;
1189	op->above = NULL, op->below = NULL;	1136	op->above = NULL, op->below = NULL;
1190	op->env = NULL;	1137	op->env = NULL;
1191	return;	1138	}
		1139	else if (op->map)
1192	}	1140	{
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;	1141	x = op->x;
1199	y = op->y;	1142	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);	1143	m = get_map_from_coord (op->map, &x, &y);
1201		1144
1202	if (!m)	1145	if (!m)
1203	{	1146	{
1204	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1147	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1205	op->map->path, op->x, op->y);	1148	op->map->path, op->x, op->y);
1206	/* in old days, we used to set x and y to 0 and continue.	1149	/* in old days, we used to set x and y to 0 and continue.
1207	* it seems if we get into this case, something is probablye	1150	* it seems if we get into this case, something is probablye
1208	* screwed up and should be fixed.	1151	* screwed up and should be fixed.
		1152	*/
		1153	abort ();
		1154	}
		1155
		1156	if (op->map != m)
		1157	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1158	op->map->path, m->path, op->x, op->y, x, y);
		1159
		1160	/* Re did the following section of code - it looks like it had
		1161	* lots of logic for things we no longer care about
1209	*/	1162	*/
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		1163
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 */	1164	/* link the object above us */
1223	if (op->above)	1165	if (op->above)
1224	op->above->below = op->below;	1166	op->above->below = op->below;
1225	else	1167	else
1226	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1168	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1227		1169
1228	/* Relink the object below us, if there is one */	1170	/* Relink the object below us, if there is one */
1229	if (op->below)	1171	if (op->below)
1230	op->below->above = op->above;	1172	op->below->above = op->above;
1231	else	1173	else
1232	{	1174	{
1233	/* Nothing below, which means we need to relink map object for this space	1175	/* 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	1176	* use translated coordinates in case some oddness with map tiling is
1235	* evident	1177	* 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	*/	1178	*/
1270	if (tmp->container == op)	1179	if (GET_MAP_OB (m, x, y) != op)
1271	{	1180	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1181	dump_object (op);
1273	tmp->container = NULL;	1182	LOG (llevError,
		1183	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
		1184	dump_object (GET_MAP_OB (m, x, y));
		1185	LOG (llevError, "%s\n", errmsg);
1274	}	1186	}
1275		1187
1276	tmp->contr->socket.update_look = 1;	1188	SET_MAP_OB (m, x, y, op->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	{	1189	}
1281	move_apply (tmp, op, NULL);
1282		1190
1283	if (was_destroyed (op, tag))	1191	op->above = 0;
		1192	op->below = 0;
		1193
		1194	if (op->map->in_memory == MAP_SAVING)
		1195	return;
		1196
		1197	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1198
		1199	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1200	{
		1201	/* No point updating the players look faces if he is the object
		1202	* being removed.
		1203	*/
		1204
		1205	if (tmp->type == PLAYER && tmp != op)
1284	{	1206	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1207	/* If a container that the player is currently using somehow gets
		1208	* removed (most likely destroyed), update the player view
		1209	* appropriately.
		1210	*/
		1211	if (tmp->container == op)
		1212	{
		1213	CLEAR_FLAG (op, FLAG_APPLIED);
		1214	tmp->container = NULL;
		1215	}
		1216
		1217	tmp->contr->socket.update_look = 1;
1286	}	1218	}
		1219
		1220	/* See if player moving off should effect something */
		1221	if (check_walk_off
		1222	&& ((op->move_type & tmp->move_off)
		1223	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1224	{
		1225	move_apply (tmp, op, NULL);
		1226
		1227	if (op->destroyed ())
		1228	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1287	}	1229	}
1288		1230
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1231	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1232
1291	if (tmp->above == tmp)	1233	if (tmp->above == tmp)
1292	tmp->above = NULL;	1234	tmp->above = NULL;
1293		1235
1294	last = tmp;	1236	last = tmp;
1295	}	1237	}
1296		1238
1297	/* last == NULL of there are no objects on this space */	1239	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1240	if (last == NULL)
1299	{	1241	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1242	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1243	* 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	1244	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.	1245	* be correct anyways.
1304	*/	1246	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1247	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);	1248	update_position (op->map, op->x, op->y);
1307	}	1249	}
1308	else	1250	else
1309	update_object (last, UP_OBJ_REMOVE);	1251	update_object (last, UP_OBJ_REMOVE);
1310		1252
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1253	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1312	update_all_los (op->map, op->x, op->y);	1254	update_all_los (op->map, op->x, op->y);
		1255	}
1313	}	1256	}
1314		1257
1315	/*	1258	/*
1316	* merge_ob(op,top):	1259	* merge_ob(op,top):
1317	*	1260	*
1318	* This function goes through all objects below and including top, and	1261	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1262	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1263	* If top is NULL, it is calculated.
1321	* Returns pointer to object if it succeded in the merge, otherwise NULL	1264	* Returns pointer to object if it succeded in the merge, otherwise NULL
1322	*/	1265	*/
1323
1324	object *	1266	object *
1325	merge_ob (object *op, object *top)	1267	merge_ob (object *op, object *top)
1326	{	1268	{
1327	if (!op->nrof)	1269	if (!op->nrof)
1328	return 0;	1270	return 0;
		1271
1329	if (top == NULL)	1272	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1273	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1274
1331	for (; top != NULL; top = top->below)	1275	for (; top != NULL; top = top->below)
1332	{	1276	{
1333	if (top == op)	1277	if (top == op)
1334	continue;	1278	continue;
1335	if (CAN_MERGE (op, top))	1279	if (CAN_MERGE (op, top))
…		…
1341	remove_ob (op);	1285	remove_ob (op);
1342	free_object (op);	1286	free_object (op);
1343	return top;	1287	return top;
1344	}	1288	}
1345	}	1289	}
		1290
1346	return NULL;	1291	return 0;
1347	}	1292	}
1348		1293
1349	/*	1294	/*
1350	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1295	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1351	* job preparing multi-part monsters	1296	* job preparing multi-part monsters
1352	*/	1297	*/
1353	object *	1298	object *
1354	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1299	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1355	{	1300	{
1356	object *	1301	object *tmp;
1357	tmp;
1358		1302
1359	if (op->head)	1303	if (op->head)
1360	op = op->head;	1304	op = op->head;
		1305
1361	for (tmp = op; tmp; tmp = tmp->more)	1306	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1307	{
1363	tmp->x = x + tmp->arch->clone.x;	1308	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1309	tmp->y = y + tmp->arch->clone.y;
1365	}	1310	}
		1311
1366	return insert_ob_in_map (op, m, originator, flag);	1312	return insert_ob_in_map (op, m, originator, flag);
1367	}	1313	}
1368		1314
1369	/*	1315	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1316	* insert_ob_in_map (op, map, originator, flag):
…		…
1386	* NULL if 'op' was destroyed	1332	* NULL if 'op' was destroyed
1387	* just 'op' otherwise	1333	* just 'op' otherwise
1388	*/	1334	*/
1389		1335
1390	object *	1336	object *
1391	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1337	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1392	{	1338	{
1393	object *tmp, *top, *floor = NULL;	1339	object *tmp, *top, *floor = NULL;
1394	sint16 x, y;	1340	sint16 x, y;
1395		1341
1396	if (QUERY_FLAG (op, FLAG_FREED))	1342	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1661	* op is the object to insert it under: supplies x and the map.	1607	* op is the object to insert it under: supplies x and the map.
1662	*/	1608	*/
1663	void	1609	void
1664	replace_insert_ob_in_map (const char *arch_string, object *op)	1610	replace_insert_ob_in_map (const char *arch_string, object *op)
1665	{	1611	{
1666	object *tmp;	1612	object *
		1613	tmp;
1667	object *tmp1;	1614	object *
		1615	tmp1;
1668		1616
1669	/* first search for itself and remove any old instances */	1617	/* first search for itself and remove any old instances */
1670		1618
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1619	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{	1620	{
…		…
1675	remove_ob (tmp);	1623	remove_ob (tmp);
1676	free_object (tmp);	1624	free_object (tmp);
1677	}	1625	}
1678	}	1626	}
1679		1627
1680	tmp1 = arch_to_object (find_archetype (arch_string));	1628	tmp1 = arch_to_object (archetype::find (arch_string));
1681		1629
1682	tmp1->x = op->x;	1630	tmp1->x = op->x;
1683	tmp1->y = op->y;	1631	tmp1->y = op->y;
1684	insert_ob_in_map (tmp1, op->map, op, 0);	1632	insert_ob_in_map (tmp1, op->map, op, 0);
1685	}	1633	}
…		…
1703	if (orig_ob->nrof < nr)	1651	if (orig_ob->nrof < nr)
1704	{	1652	{
1705	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1653	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1706	return NULL;	1654	return NULL;
1707	}	1655	}
		1656
1708	newob = object_create_clone (orig_ob);	1657	newob = object_create_clone (orig_ob);
		1658
1709	if ((orig_ob->nrof -= nr) < 1)	1659	if ((orig_ob->nrof -= nr) < 1)
1710	{	1660	{
1711	if (!is_removed)	1661	if (!is_removed)
1712	remove_ob (orig_ob);	1662	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);	1663	free_object2 (orig_ob, 1);
…		…
1721	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1671	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");	1672	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1723	return NULL;	1673	return NULL;
1724	}	1674	}
1725	}	1675	}
		1676
1726	newob->nrof = nr;	1677	newob->nrof = nr;
1727		1678
1728	return newob;	1679	return newob;
1729	}	1680	}
1730		1681
…		…
1737	*/	1688	*/
1738		1689
1739	object *	1690	object *
1740	decrease_ob_nr (object *op, uint32 i)	1691	decrease_ob_nr (object *op, uint32 i)
1741	{	1692	{
1742	object *	1693	object *tmp;
1743	tmp;
1744	player *	1694	player *pl;
1745	pl;
1746		1695
1747	if (i == 0) /* objects with op->nrof require this check */	1696	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1697	return op;
1749		1698
1750	if (i > op->nrof)	1699	if (i > op->nrof)
1751	i = op->nrof;	1700	i = op->nrof;
1752		1701
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1702	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1703	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1704	else if (op->env != NULL)
1758	{	1705	{
1759	/* is this object in the players inventory, or sub container	1706	/* is this object in the players inventory, or sub container
1760	* therein?	1707	* therein?
1761	*/	1708	*/
…		…
1796	}	1743	}
1797	}	1744	}
1798	}	1745	}
1799	else	1746	else
1800	{	1747	{
1801	object *
1802	above = op->above;	1748	object *above = op->above;
1803		1749
1804	if (i < op->nrof)	1750	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1751	op->nrof -= i;
1807	}
1808	else	1752	else
1809	{	1753	{
1810	remove_ob (op);	1754	remove_ob (op);
1811	op->nrof = 0;	1755	op->nrof = 0;
1812	}	1756	}
		1757
1813	/* Since we just removed op, op->above is null */	1758	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1759	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1760	if (tmp->type == PLAYER)
1816	{	1761	{
1817	if (op->nrof)	1762	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1765	esrv_del_item (tmp->contr, op->count);
1821	}	1766	}
1822	}	1767	}
1823		1768
1824	if (op->nrof)	1769	if (op->nrof)
1825	{
1826	return op;	1770	return op;
1827	}
1828	else	1771	else
1829	{	1772	{
1830	free_object (op);	1773	free_object (op);
1831	return NULL;	1774	return NULL;
1832	}	1775	}
…		…
1841	add_weight (object *op, signed long weight)	1784	add_weight (object *op, signed long weight)
1842	{	1785	{
1843	while (op != NULL)	1786	while (op != NULL)
1844	{	1787	{
1845	if (op->type == CONTAINER)	1788	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1789	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1790
1849	op->carrying += weight;	1791	op->carrying += weight;
1850	op = op->env;	1792	op = op->env;
1851	}	1793	}
1852	}	1794	}
1853		1795
…		…
1876	{	1818	{
1877	dump_object (op);	1819	dump_object (op);
1878	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1820	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1879	return op;	1821	return op;
1880	}	1822	}
		1823
1881	if (where == NULL)	1824	if (where == NULL)
1882	{	1825	{
1883	dump_object (op);	1826	dump_object (op);
1884	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1827	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1885	return op;	1828	return op;
1886	}	1829	}
		1830
1887	if (where->head)	1831	if (where->head)
1888	{	1832	{
1889	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1833	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1890	where = where->head;	1834	where = where->head;
1891	}	1835	}
		1836
1892	if (op->more)	1837	if (op->more)
1893	{	1838	{
1894	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1839	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1895	return op;	1840	return op;
1896	}	1841	}
		1842
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1843	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1844	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1845	if (op->nrof)
1900	{	1846	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1847	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1987		1933
1988	int	1934	int
1989	check_move_on (object *op, object *originator)	1935	check_move_on (object *op, object *originator)
1990	{	1936	{
1991	object *tmp;	1937	object *tmp;
1992	tag_t tag;
1993	mapstruct *m = op->map;	1938	maptile *m = op->map;
1994	int x = op->x, y = op->y;	1939	int x = op->x, y = op->y;
1995		1940
1996	MoveType move_on, move_slow, move_block;	1941	MoveType move_on, move_slow, move_block;
1997		1942
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1943	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1944	return 0;
2000
2001	tag = op->count;
2002		1945
2003	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1946	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);	1947	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);	1948	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2006		1949
…		…
2049	{	1992	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1993	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))	1994	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	1995	{
2053		1996
		1997	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	1998	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		1999
2056	if (op->type == PLAYER)	2000	if (op->type == PLAYER)
2057	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	2001	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)))	2002	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2059	diff /= 4.0;	2003	diff /= 4.0;
…		…
2066	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2010	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))	2011	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2068	{	2012	{
2069	move_apply (tmp, op, originator);	2013	move_apply (tmp, op, originator);
2070		2014
2071	if (was_destroyed (op, tag))	2015	if (op->destroyed ())
2072	return 1;	2016	return 1;
2073		2017
2074	/* what the person/creature stepped onto has moved the object	2018	/* what the person/creature stepped onto has moved the object
2075	* someplace new. Don't process any further - if we did,	2019	* someplace new. Don't process any further - if we did,
2076	* have a feeling strange problems would result.	2020	* have a feeling strange problems would result.
…		…
2088	* a matching archetype at the given map and coordinates.	2032	* a matching archetype at the given map and coordinates.
2089	* The first matching object is returned, or NULL if none.	2033	* The first matching object is returned, or NULL if none.
2090	*/	2034	*/
2091		2035
2092	object *	2036	object *
2093	present_arch (const archetype *at, mapstruct *m, int x, int y)	2037	present_arch (const archetype *at, maptile *m, int x, int y)
2094	{	2038	{
2095	object *	2039	object *
2096	tmp;	2040	tmp;
2097		2041
2098	if (m == NULL || out_of_map (m, x, y))	2042	if (m == NULL || out_of_map (m, x, y))
…		…
2111	* a matching type variable at the given map and coordinates.	2055	* a matching type variable at the given map and coordinates.
2112	* The first matching object is returned, or NULL if none.	2056	* The first matching object is returned, or NULL if none.
2113	*/	2057	*/
2114		2058
2115	object *	2059	object *
2116	present (unsigned char type, mapstruct *m, int x, int y)	2060	present (unsigned char type, maptile *m, int x, int y)
2117	{	2061	{
2118	object *	2062	object *
2119	tmp;	2063	tmp;
2120		2064
2121	if (out_of_map (m, x, y))	2065	if (out_of_map (m, x, y))
…		…
2261	* the archetype because that isn't correct if the monster has been	2205	* the archetype because that isn't correct if the monster has been
2262	* customized, changed states, etc.	2206	* customized, changed states, etc.
2263	*/	2207	*/
2264		2208
2265	int	2209	int
2266	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2210	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2267	{	2211	{
2268	int	2212	int
2269	i,	2213	i,
2270	index = 0, flag;	2214	index = 0, flag;
2271	static int	2215	static int
…		…
2292	return -1;	2236	return -1;
2293	return altern[RANDOM () % index];	2237	return altern[RANDOM () % index];
2294	}	2238	}
2295		2239
2296	/*	2240	/*
2297	* find_first_free_spot(archetype, mapstruct, x, y) works like	2241	* find_first_free_spot(archetype, maptile, x, y) works like
2298	* find_free_spot(), but it will search max number of squares.	2242	* find_free_spot(), but it will search max number of squares.
2299	* But it will return the first available spot, not a random choice.	2243	* 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.	2244	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2301	*/	2245	*/
2302		2246
2303	int	2247	int
2304	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2248	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2305	{	2249	{
2306	int	2250	int
2307	i;	2251	i;
2308		2252
2309	for (i = 0; i < SIZEOFFREE; i++)	2253	for (i = 0; i < SIZEOFFREE; i++)
…		…
2373	* because we have to know what movement the thing looking to move	2317	* because we have to know what movement the thing looking to move
2374	* there is capable of.	2318	* there is capable of.
2375	*/	2319	*/
2376		2320
2377	int	2321	int
2378	find_dir (mapstruct *m, int x, int y, object *exclude)	2322	find_dir (maptile *m, int x, int y, object *exclude)
2379	{	2323	{
2380	int	2324	int
2381	i,	2325	i,
2382	max = SIZEOFFREE, mflags;	2326	max = SIZEOFFREE, mflags;
2383	sint16	2327
2384	nx,	2328	sint16 nx, ny;
2385	ny;
2386	object *	2329	object *
2387	tmp;	2330	tmp;
2388	mapstruct *	2331	maptile *
2389	mp;	2332	mp;
2390	MoveType	2333
2391	blocked,	2334	MoveType blocked, move_type;
2392	move_type;
2393		2335
2394	if (exclude && exclude->head)	2336	if (exclude && exclude->head)
2395	{	2337	{
2396	exclude = exclude->head;	2338	exclude = exclude->head;
2397	move_type = exclude->move_type;	2339	move_type = exclude->move_type;
…		…
2602	* Modified to be map tile aware -.MSW	2544	* Modified to be map tile aware -.MSW
2603	*/	2545	*/
2604		2546
2605		2547
2606	int	2548	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2549	can_see_monsterP (maptile *m, int x, int y, int dir)
2608	{	2550	{
2609	sint16	2551	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2552	int
2613	mflags;	2553	mflags;
2614		2554
2615	if (dir < 0)	2555	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2556	return 0; /* exit condition: invalid direction */
…		…
2694	if (prev)	2634	if (prev)
2695	prev->more = tmp;	2635	prev->more = tmp;
2696	prev = tmp;	2636	prev = tmp;
2697	}	2637	}
2698		2638
2699	/*** copy inventory ***/
2700	for (item = src->inv; item; item = item->below)	2639	for (item = src->inv; item; item = item->below)
2701	{
2702	(void) insert_ob_in_ob (object_create_clone (item), dst);	2640	insert_ob_in_ob (object_create_clone (item), dst);
2703	}
2704		2641
2705	return dst;	2642	return dst;
2706	}	2643	}
2707		2644
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. */	2645	/* 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 */	2646	/* 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, */	2647	/* 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. */	2648	/* 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. */	2649	/* Remember not to use load_object_str in a time-critical situation. */
2726
2727	/* Also remember that multiparts objects are not supported for now. */	2650	/* Also remember that multiparts objects are not supported for now. */
2728		2651
2729	object *	2652	object *
2730	load_object_str (const char *obstr)	2653	load_object_str (const char *obstr)
2731	{	2654	{
2732	object *	2655	object *op;
2733	op;
2734	char
2735	filename[MAX_BUF];	2656	char filename[MAX_BUF];
2736		2657
2737	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2658	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2738		2659
2739	FILE *
2740	tempfile = fopen (filename, "w");	2660	FILE *tempfile = fopen (filename, "w");
2741		2661
2742	if (tempfile == NULL)	2662	if (tempfile == NULL)
2743	{	2663	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2664	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2665	return NULL;
2746	};	2666	}
		2667
2747	fprintf (tempfile, obstr);	2668	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2669	fclose (tempfile);
2749		2670
2750	op = get_object ();	2671	op = get_object ();
2751		2672
2752	object_thawer	2673	object_thawer thawer (filename);
2753	thawer (filename);
2754		2674
2755	if (thawer)	2675	if (thawer)
2756	load_object (thawer, op, 0);	2676	load_object (thawer, op, 0);
2757		2677
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2678	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2766	* returns NULL if no match.	2686	* returns NULL if no match.
2767	*/	2687	*/
2768	object *	2688	object *
2769	find_obj_by_type_subtype (const object *who, int type, int subtype)	2689	find_obj_by_type_subtype (const object *who, int type, int subtype)
2770	{	2690	{
2771	object *	2691	object *tmp;
2772	tmp;
2773		2692
2774	for (tmp = who->inv; tmp; tmp = tmp->below)	2693	for (tmp = who->inv; tmp; tmp = tmp->below)
2775	if (tmp->type == type && tmp->subtype == subtype)	2694	if (tmp->type == type && tmp->subtype == subtype)
2776	return tmp;	2695	return tmp;
2777		2696
…		…
2785	* do the desired thing.	2704	* do the desired thing.
2786	*/	2705	*/
2787	key_value *	2706	key_value *
2788	get_ob_key_link (const object *ob, const char *key)	2707	get_ob_key_link (const object *ob, const char *key)
2789	{	2708	{
2790	key_value *	2709	key_value *link;
2791	link;
2792		2710
2793	for (link = ob->key_values; link != NULL; link = link->next)	2711	for (link = ob->key_values; link != NULL; link = link->next)
2794	{
2795	if (link->key == key)	2712	if (link->key == key)
2796	{
2797	return link;	2713	return link;
2798	}
2799	}
2800		2714
2801	return NULL;	2715	return NULL;
2802	}	2716	}
2803		2717
2804	/*	2718	/*
…		…
2809	* The returned string is shared.	2723	* The returned string is shared.
2810	*/	2724	*/
2811	const char *	2725	const char *
2812	get_ob_key_value (const object *op, const char *const key)	2726	get_ob_key_value (const object *op, const char *const key)
2813	{	2727	{
2814	key_value *	2728	key_value *link;
2815	link;	2729	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2730
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2731	if (!canonical_key)
2822	{	2732	{
2823	/* 1. There being a field named key on any object	2733	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2734	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2735	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, *this* object doesn't have this field.	2736	* 3. Therefore, *this* object doesn't have this field.
2827	*/	2737	*/
2828	return NULL;	2738	return 0;
2829	}	2739	}
2830		2740
2831	/* This is copied from get_ob_key_link() above -	2741	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2742	* only 4 lines, and saves the function call overhead.
2833	*/	2743	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2744	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2745	if (link->key == canonical_key)
2837	{
2838	return link->value;	2746	return link->value;
2839	}	2747
2840	}
2841	return NULL;	2748	return 0;
2842	}	2749	}
2843		2750
2844		2751
2845	/*	2752	/*
2846	* Updates the canonical_key in op to value.	2753	* Updates the canonical_key in op to value.
…		…
2882	if (last)	2789	if (last)
2883	last->next = field->next;	2790	last->next = field->next;
2884	else	2791	else
2885	op->key_values = field->next;	2792	op->key_values = field->next;
2886		2793
2887	delete
2888	field;	2794	delete field;
2889	}	2795	}
2890	}	2796	}
2891	return TRUE;	2797	return TRUE;
2892	}	2798	}
2893	/* IF we get here, key doesn't exist */	2799	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2834	* Returns TRUE on success.
2929	*/	2835	*/
2930	int	2836	int
2931	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2837	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2932	{	2838	{
2933	shstr
2934	key_ (key);	2839	shstr key_ (key);
2935		2840
2936	return set_ob_key_value_s (op, key_, value, add_key);	2841	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2842	}
		2843
		2844	object::depth_iterator::depth_iterator (object *container)
		2845	: iterator_base (container)
		2846	{
		2847	while (item->inv)
		2848	item = item->inv;
		2849	}
		2850
		2851	void
		2852	object::depth_iterator::next ()
		2853	{
		2854	if (item->below)
		2855	{
		2856	item = item->below;
		2857
		2858	while (item->inv)
		2859	item = item->inv;
		2860	}
		2861	else
		2862	item = item->env;
		2863	}
		2864
		2865	// return a suitable string describing an objetc in enough detail to find it
		2866	const char *
		2867	object::debug_desc (char *info) const
		2868	{
		2869	char info2[256 * 3];
		2870	char *p = info;
		2871
		2872	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2873	count,
		2874	&name,
		2875	title ? " " : "",
		2876	title ? (const char *)title : "");
		2877
		2878	if (env)
		2879	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2880
		2881	if (map)
		2882	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2883
		2884	return info;
		2885	}
		2886
		2887	const char *
		2888	object::debug_desc () const
		2889	{
		2890	static char info[256 * 3];
		2891	return debug_desc (info);
		2892	}
		2893

Diff Legend

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