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.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.49 by root, Sat Sep 16 22:24:12 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.26 2006/09/11 11:46:52 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
…		…
891	/* if the object is being removed, we can't make intelligent	878	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	879	* decisions, because remove_ob can't really pass the object
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	{
897	update_now = 1;	883	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	884	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	885	/* Nothing to do for that case */ ;
902	}
903	else	886	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	887	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		888
908	if (update_now)	889	if (update_now)
909	{	890	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	891	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	892	update_position (op->map, op->x, op->y);
…		…
913		894
914	if (op->more != NULL)	895	if (op->more != NULL)
915	update_object (op->more, action);	896	update_object (op->more, action);
916	}	897	}
917		898
918	static unordered_vector<object *> mortals;	899	object::vector object::mortals;
919	static std::vector<object *> freed;	900	object::vector object::objects; // not yet used
		901	object *object::first;
920		902
921	void object::free_mortals ()	903	void object::free_mortals ()
922	{	904	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	906	if ((*i)->refcnt)
		907	++i; // further delay freeing
		908	else
925	{	909	{
926	freed.push_back (*i);	910	delete *i;
927	mortals.erase (i);	911	mortals.erase (i);
928	}	912	}
929	else	913
930	++i;	914	static int lastmortals = 0;//D
		915
		916	if (mortals.size() != lastmortals)//D
		917	{
		918	lastmortals = mortals.size ();//D
		919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		920	}
931	}	921	}
932		922
933	object::object ()	923	object::object ()
934	{	924	{
935	SET_FLAG (this, FLAG_REMOVED);	925	SET_FLAG (this, FLAG_REMOVED);
936		926
937	expmul = 1.0;	927	expmul = 1.0;
938	face = blank_face;	928	face = blank_face;
939	attacked_by_count = -1;
940	}	929	}
941		930
942	object::~object ()	931	object::~object ()
943	{	932	{
944	free_key_values (this);	933	free_key_values (this);
945	}	934	}
946		935
947	void object::link ()	936	void object::link ()
948	{	937	{
949	count = ++ob_count;	938	count = ++ob_count;
		939	uuid = gen_uuid ();
950		940
951	prev = 0;	941	prev = 0;
952	next = objects;	942	next = object::first;
953		943
954	if (objects)	944	if (object::first)
955	objects->prev = this;	945	object::first->prev = this;
956		946
957	objects = this;	947	object::first = this;
958	}	948	}
959		949
960	void object::unlink ()	950	void object::unlink ()
961	{	951	{
962	count = 0;	952	if (this == object::first)
		953	object::first = next;
963		954
964	/* Remove this object from the list of used objects */	955	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	956	if (prev) prev->next = next;
		957	if (next) next->prev = prev;
		958
968	prev = 0;	959	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	960	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	961	}
980		962
981	object *object::create ()	963	object *object::create ()
982	{	964	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	965	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	966	op->link ();
996	return op;	967	return op;
997	}	968	}
998		969
999	/*	970	/*
…		…
1006	* If free_inventory is set, free inventory as well. Else drop items in	977	* If free_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	978	* inventory to the ground.
1008	*/	979	*/
1009	void object::free (bool free_inventory)	980	void object::free (bool free_inventory)
1010	{	981	{
		982	if (QUERY_FLAG (this, FLAG_FREED))
		983	return;
		984
		985	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		986	remove_friendly_object (this);
		987
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	988	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	989	remove_ob (this);
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		990
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	991	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		992
1033	if (more)	993	if (more)
1034	{	994	{
1035	more->free (free_inventory);	995	more->free (free_inventory);
1036	more = 0;	996	more = 0;
…		…
1040	{	1000	{
1041	/* Only if the space blocks everything do we not process -	1001	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	1002	* if some form of movement is allowed, let objects
1043	* drop on that space.	1003	* drop on that space.
1044	*/	1004	*/
1045	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1005	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046	{	1006	{
1047	object *	1007	object *op = inv;
1048	op = inv;
1049		1008
1050	while (op)	1009	while (op)
1051	{	1010	{
1052	object *
1053	tmp = op->below;	1011	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	1012	op->free (free_inventory);
1057	op = tmp;	1013	op = tmp;
1058	}	1014	}
1059	}	1015	}
1060	else	1016	else
1061	{ /* Put objects in inventory onto this space */	1017	{ /* Put objects in inventory onto this space */
1062	object *	1018	object *op = inv;
1063	op = inv;
1064		1019
1065	while (op)	1020	while (op)
1066	{	1021	{
1067	object *
1068	tmp = op->below;	1022	object *tmp = op->below;
1069		1023
1070	remove_ob (op);	1024	remove_ob (op);
1071		1025
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1026	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	1027	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1082	op = tmp;	1036	op = tmp;
1083	}	1037	}
1084	}	1038	}
1085	}	1039	}
1086		1040
1087	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;
1088		1045
1089	/* Remove object from the active list */	1046	/* Remove object from the active list */
1090	speed = 0;	1047	speed = 0;
1091	update_ob_speed (this);	1048	update_ob_speed (this);
1092		1049
1093	unlink ();	1050	unlink ();
1094		1051
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	1052	mortals.push_back (this);
1098	}	1053	}
1099		1054
1100	/*	1055	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	1056	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1106	sub_weight (object *op, signed long weight)	1061	sub_weight (object *op, signed long weight)
1107	{	1062	{
1108	while (op != NULL)	1063	while (op != NULL)
1109	{	1064	{
1110	if (op->type == CONTAINER)	1065	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1066	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1067
1114	op->carrying -= weight;	1068	op->carrying -= weight;
1115	op = op->env;	1069	op = op->env;
1116	}	1070	}
1117	}	1071	}
1118		1072
…		…
1126	*/	1080	*/
1127		1081
1128	void	1082	void
1129	remove_ob (object *op)	1083	remove_ob (object *op)
1130	{	1084	{
1131	object *tmp, *last = NULL;	1085	object *tmp, *last = 0;
1132	object *otmp;	1086	object *otmp;
1133		1087
1134	tag_t tag;
1135	int check_walk_off;	1088	int check_walk_off;
1136	mapstruct *m;	1089	maptile *m;
1137		1090
1138	sint16 x, y;	1091	sint16 x, y;
1139		1092
1140	if (QUERY_FLAG (op, FLAG_REMOVED))	1093	if (QUERY_FLAG (op, FLAG_REMOVED))
1141	{	1094	return;
1142	dump_object (op);
1143	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1144		1095
1145	/* Changed it to always dump core in this case. As has been learned	1096	SET_FLAG (op, FLAG_REMOVED);
1146	* in the past, trying to recover from errors almost always
1147	* make things worse, and this is a real error here - something
1148	* that should not happen.
1149	* Yes, if this was a mission critical app, trying to do something
1150	* to recover may make sense, but that is because failure of the app
1151	* may have other disastrous problems. Cf runs out of a script
1152	* so is easily enough restarted without any real problems.
1153	* MSW 2001-07-01
1154	*/
1155	abort ();
1156	}
1157		1097
1158	if (op->more != NULL)	1098	if (op->more != NULL)
1159	remove_ob (op->more);	1099	remove_ob (op->more);
1160
1161	SET_FLAG (op, FLAG_REMOVED);
1162		1100
1163	/*	1101	/*
1164	* In this case, the object to be removed is in someones	1102	* In this case, the object to be removed is in someones
1165	* inventory.	1103	* inventory.
1166	*/	1104	*/
…		…
1192	*/	1130	*/
1193	op->x = op->env->x, op->y = op->env->y;	1131	op->x = op->env->x, op->y = op->env->y;
1194	op->map = op->env->map;	1132	op->map = op->env->map;
1195	op->above = NULL, op->below = NULL;	1133	op->above = NULL, op->below = NULL;
1196	op->env = NULL;	1134	op->env = NULL;
1197	return;	1135	}
		1136	else if (op->map)
1198	}	1137	{
1199
1200	/* If we get here, we are removing it from a map */
1201	if (op->map == NULL)
1202	return;
1203
1204	x = op->x;	1138	x = op->x;
1205	y = op->y;	1139	y = op->y;
1206	m = get_map_from_coord (op->map, &x, &y);	1140	m = get_map_from_coord (op->map, &x, &y);
1207		1141
1208	if (!m)	1142	if (!m)
1209	{	1143	{
1210	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1144	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1211	op->map->path, op->x, op->y);	1145	op->map->path, op->x, op->y);
1212	/* in old days, we used to set x and y to 0 and continue.	1146	/* in old days, we used to set x and y to 0 and continue.
1213	* it seems if we get into this case, something is probablye	1147	* it seems if we get into this case, something is probablye
1214	* screwed up and should be fixed.	1148	* screwed up and should be fixed.
		1149	*/
		1150	abort ();
		1151	}
		1152
		1153	if (op->map != m)
		1154	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1155	op->map->path, m->path, op->x, op->y, x, y);
		1156
		1157	/* Re did the following section of code - it looks like it had
		1158	* lots of logic for things we no longer care about
1215	*/	1159	*/
1216	abort ();
1217	}
1218	if (op->map != m)
1219	{
1220	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1221	op->map->path, m->path, op->x, op->y, x, y);
1222	}
1223		1160
1224	/* Re did the following section of code - it looks like it had
1225	* lots of logic for things we no longer care about
1226	*/
1227
1228	/* link the object above us */	1161	/* link the object above us */
1229	if (op->above)	1162	if (op->above)
1230	op->above->below = op->below;	1163	op->above->below = op->below;
1231	else	1164	else
1232	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1165	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1233		1166
1234	/* Relink the object below us, if there is one */	1167	/* Relink the object below us, if there is one */
1235	if (op->below)	1168	if (op->below)
1236	op->below->above = op->above;	1169	op->below->above = op->above;
1237	else	1170	else
1238	{	1171	{
1239	/* Nothing below, which means we need to relink map object for this space	1172	/* Nothing below, which means we need to relink map object for this space
1240	* use translated coordinates in case some oddness with map tiling is	1173	* use translated coordinates in case some oddness with map tiling is
1241	* evident	1174	* evident
1242	*/
1243	if (GET_MAP_OB (m, x, y) != op)
1244	{
1245	dump_object (op);
1246	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",
1247	errmsg);
1248	dump_object (GET_MAP_OB (m, x, y));
1249	LOG (llevError, "%s\n", errmsg);
1250	}
1251
1252	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1253	}
1254
1255	op->above = NULL;
1256	op->below = NULL;
1257
1258	if (op->map->in_memory == MAP_SAVING)
1259	return;
1260
1261	tag = op->count;
1262	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1263
1264	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1265	{
1266	/* No point updating the players look faces if he is the object
1267	* being removed.
1268	*/
1269
1270	if (tmp->type == PLAYER && tmp != op)
1271	{
1272	/* If a container that the player is currently using somehow gets
1273	* removed (most likely destroyed), update the player view
1274	* appropriately.
1275	*/	1175	*/
1276	if (tmp->container == op)	1176	if (GET_MAP_OB (m, x, y) != op)
1277	{	1177	{
1278	CLEAR_FLAG (op, FLAG_APPLIED);	1178	dump_object (op);
1279	tmp->container = NULL;	1179	LOG (llevError,
		1180	"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);
		1181	dump_object (GET_MAP_OB (m, x, y));
		1182	LOG (llevError, "%s\n", errmsg);
1280	}	1183	}
1281		1184
1282	tmp->contr->socket.update_look = 1;	1185	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1283	}
1284	/* See if player moving off should effect something */
1285	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1286	{	1186	}
1287	move_apply (tmp, op, NULL);
1288		1187
1289	if (was_destroyed (op, tag))	1188	op->above = 0;
		1189	op->below = 0;
		1190
		1191	if (op->map->in_memory == MAP_SAVING)
		1192	return;
		1193
		1194	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1195
		1196	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1197	{
		1198	/* No point updating the players look faces if he is the object
		1199	* being removed.
		1200	*/
		1201
		1202	if (tmp->type == PLAYER && tmp != op)
1290	{	1203	{
1291	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1204	/* If a container that the player is currently using somehow gets
		1205	* removed (most likely destroyed), update the player view
		1206	* appropriately.
		1207	*/
		1208	if (tmp->container == op)
		1209	{
		1210	CLEAR_FLAG (op, FLAG_APPLIED);
		1211	tmp->container = NULL;
		1212	}
		1213
		1214	tmp->contr->socket.update_look = 1;
1292	}	1215	}
		1216
		1217	/* See if player moving off should effect something */
		1218	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1219	{
		1220	move_apply (tmp, op, NULL);
		1221
		1222	if (op->destroyed ());
		1223	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1293	}	1224	}
1294		1225
1295	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1226	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1296		1227
1297	if (tmp->above == tmp)	1228	if (tmp->above == tmp)
1298	tmp->above = NULL;	1229	tmp->above = NULL;
1299		1230
1300	last = tmp;	1231	last = tmp;
1301	}	1232	}
1302		1233
1303	/* last == NULL of there are no objects on this space */	1234	/* last == NULL of there are no objects on this space */
1304	if (last == NULL)	1235	if (last == NULL)
1305	{	1236	{
1306	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1237	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1307	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1238	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1308	* those out anyways, and if there are any flags set right now, they won't	1239	* those out anyways, and if there are any flags set right now, they won't
1309	* be correct anyways.	1240	* be correct anyways.
1310	*/	1241	*/
1311	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1242	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1312	update_position (op->map, op->x, op->y);	1243	update_position (op->map, op->x, op->y);
1313	}	1244	}
1314	else	1245	else
1315	update_object (last, UP_OBJ_REMOVE);	1246	update_object (last, UP_OBJ_REMOVE);
1316		1247
1317	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1248	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1318	update_all_los (op->map, op->x, op->y);	1249	update_all_los (op->map, op->x, op->y);
		1250	}
1319	}	1251	}
1320		1252
1321	/*	1253	/*
1322	* merge_ob(op,top):	1254	* merge_ob(op,top):
1323	*	1255	*
1324	* This function goes through all objects below and including top, and	1256	* This function goes through all objects below and including top, and
1325	* merges op to the first matching object.	1257	* merges op to the first matching object.
1326	* If top is NULL, it is calculated.	1258	* If top is NULL, it is calculated.
1327	* Returns pointer to object if it succeded in the merge, otherwise NULL	1259	* Returns pointer to object if it succeded in the merge, otherwise NULL
1328	*/	1260	*/
1329
1330	object *	1261	object *
1331	merge_ob (object *op, object *top)	1262	merge_ob (object *op, object *top)
1332	{	1263	{
1333	if (!op->nrof)	1264	if (!op->nrof)
1334	return 0;	1265	return 0;
		1266
1335	if (top == NULL)	1267	if (top == NULL)
1336	for (top = op; top != NULL && top->above != NULL; top = top->above);	1268	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1269
1337	for (; top != NULL; top = top->below)	1270	for (; top != NULL; top = top->below)
1338	{	1271	{
1339	if (top == op)	1272	if (top == op)
1340	continue;	1273	continue;
1341	if (CAN_MERGE (op, top))	1274	if (CAN_MERGE (op, top))
…		…
1347	remove_ob (op);	1280	remove_ob (op);
1348	free_object (op);	1281	free_object (op);
1349	return top;	1282	return top;
1350	}	1283	}
1351	}	1284	}
		1285
1352	return NULL;	1286	return 0;
1353	}	1287	}
1354		1288
1355	/*	1289	/*
1356	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1290	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1357	* job preparing multi-part monsters	1291	* job preparing multi-part monsters
1358	*/	1292	*/
1359	object *	1293	object *
1360	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1294	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1361	{	1295	{
1362	object *	1296	object *tmp;
1363	tmp;
1364		1297
1365	if (op->head)	1298	if (op->head)
1366	op = op->head;	1299	op = op->head;
		1300
1367	for (tmp = op; tmp; tmp = tmp->more)	1301	for (tmp = op; tmp; tmp = tmp->more)
1368	{	1302	{
1369	tmp->x = x + tmp->arch->clone.x;	1303	tmp->x = x + tmp->arch->clone.x;
1370	tmp->y = y + tmp->arch->clone.y;	1304	tmp->y = y + tmp->arch->clone.y;
1371	}	1305	}
		1306
1372	return insert_ob_in_map (op, m, originator, flag);	1307	return insert_ob_in_map (op, m, originator, flag);
1373	}	1308	}
1374		1309
1375	/*	1310	/*
1376	* insert_ob_in_map (op, map, originator, flag):	1311	* insert_ob_in_map (op, map, originator, flag):
…		…
1392	* NULL if 'op' was destroyed	1327	* NULL if 'op' was destroyed
1393	* just 'op' otherwise	1328	* just 'op' otherwise
1394	*/	1329	*/
1395		1330
1396	object *	1331	object *
1397	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1332	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1398	{	1333	{
1399	object *tmp, *top, *floor = NULL;	1334	object *tmp, *top, *floor = NULL;
1400	sint16 x, y;	1335	sint16 x, y;
1401		1336
1402	if (QUERY_FLAG (op, FLAG_FREED))	1337	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1667	* op is the object to insert it under: supplies x and the map.	1602	* op is the object to insert it under: supplies x and the map.
1668	*/	1603	*/
1669	void	1604	void
1670	replace_insert_ob_in_map (const char *arch_string, object *op)	1605	replace_insert_ob_in_map (const char *arch_string, object *op)
1671	{	1606	{
1672	object *tmp;	1607	object *
		1608	tmp;
1673	object *tmp1;	1609	object *
		1610	tmp1;
1674		1611
1675	/* first search for itself and remove any old instances */	1612	/* first search for itself and remove any old instances */
1676		1613
1677	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1614	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1678	{	1615	{
…		…
1681	remove_ob (tmp);	1618	remove_ob (tmp);
1682	free_object (tmp);	1619	free_object (tmp);
1683	}	1620	}
1684	}	1621	}
1685		1622
1686	tmp1 = arch_to_object (find_archetype (arch_string));	1623	tmp1 = arch_to_object (archetype::find (arch_string));
1687		1624
1688	tmp1->x = op->x;	1625	tmp1->x = op->x;
1689	tmp1->y = op->y;	1626	tmp1->y = op->y;
1690	insert_ob_in_map (tmp1, op->map, op, 0);	1627	insert_ob_in_map (tmp1, op->map, op, 0);
1691	}	1628	}
…		…
1709	if (orig_ob->nrof < nr)	1646	if (orig_ob->nrof < nr)
1710	{	1647	{
1711	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1648	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1712	return NULL;	1649	return NULL;
1713	}	1650	}
		1651
1714	newob = object_create_clone (orig_ob);	1652	newob = object_create_clone (orig_ob);
		1653
1715	if ((orig_ob->nrof -= nr) < 1)	1654	if ((orig_ob->nrof -= nr) < 1)
1716	{	1655	{
1717	if (!is_removed)	1656	if (!is_removed)
1718	remove_ob (orig_ob);	1657	remove_ob (orig_ob);
1719	free_object2 (orig_ob, 1);	1658	free_object2 (orig_ob, 1);
…		…
1727	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1666	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1728	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1667	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1729	return NULL;	1668	return NULL;
1730	}	1669	}
1731	}	1670	}
		1671
1732	newob->nrof = nr;	1672	newob->nrof = nr;
1733		1673
1734	return newob;	1674	return newob;
1735	}	1675	}
1736		1676
…		…
1743	*/	1683	*/
1744		1684
1745	object *	1685	object *
1746	decrease_ob_nr (object *op, uint32 i)	1686	decrease_ob_nr (object *op, uint32 i)
1747	{	1687	{
1748	object *	1688	object *tmp;
1749	tmp;
1750	player *	1689	player *pl;
1751	pl;
1752		1690
1753	if (i == 0) /* objects with op->nrof require this check */	1691	if (i == 0) /* objects with op->nrof require this check */
1754	return op;	1692	return op;
1755		1693
1756	if (i > op->nrof)	1694	if (i > op->nrof)
1757	i = op->nrof;	1695	i = op->nrof;
1758		1696
1759	if (QUERY_FLAG (op, FLAG_REMOVED))	1697	if (QUERY_FLAG (op, FLAG_REMOVED))
1760	{
1761	op->nrof -= i;	1698	op->nrof -= i;
1762	}
1763	else if (op->env != NULL)	1699	else if (op->env != NULL)
1764	{	1700	{
1765	/* is this object in the players inventory, or sub container	1701	/* is this object in the players inventory, or sub container
1766	* therein?	1702	* therein?
1767	*/	1703	*/
…		…
1802	}	1738	}
1803	}	1739	}
1804	}	1740	}
1805	else	1741	else
1806	{	1742	{
1807	object *
1808	above = op->above;	1743	object *above = op->above;
1809		1744
1810	if (i < op->nrof)	1745	if (i < op->nrof)
1811	{
1812	op->nrof -= i;	1746	op->nrof -= i;
1813	}
1814	else	1747	else
1815	{	1748	{
1816	remove_ob (op);	1749	remove_ob (op);
1817	op->nrof = 0;	1750	op->nrof = 0;
1818	}	1751	}
		1752
1819	/* Since we just removed op, op->above is null */	1753	/* Since we just removed op, op->above is null */
1820	for (tmp = above; tmp != NULL; tmp = tmp->above)	1754	for (tmp = above; tmp != NULL; tmp = tmp->above)
1821	if (tmp->type == PLAYER)	1755	if (tmp->type == PLAYER)
1822	{	1756	{
1823	if (op->nrof)	1757	if (op->nrof)
…		…
1826	esrv_del_item (tmp->contr, op->count);	1760	esrv_del_item (tmp->contr, op->count);
1827	}	1761	}
1828	}	1762	}
1829		1763
1830	if (op->nrof)	1764	if (op->nrof)
1831	{
1832	return op;	1765	return op;
1833	}
1834	else	1766	else
1835	{	1767	{
1836	free_object (op);	1768	free_object (op);
1837	return NULL;	1769	return NULL;
1838	}	1770	}
…		…
1847	add_weight (object *op, signed long weight)	1779	add_weight (object *op, signed long weight)
1848	{	1780	{
1849	while (op != NULL)	1781	while (op != NULL)
1850	{	1782	{
1851	if (op->type == CONTAINER)	1783	if (op->type == CONTAINER)
1852	{
1853	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1784	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1854	}	1785
1855	op->carrying += weight;	1786	op->carrying += weight;
1856	op = op->env;	1787	op = op->env;
1857	}	1788	}
1858	}	1789	}
1859		1790
…		…
1882	{	1813	{
1883	dump_object (op);	1814	dump_object (op);
1884	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1815	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1885	return op;	1816	return op;
1886	}	1817	}
		1818
1887	if (where == NULL)	1819	if (where == NULL)
1888	{	1820	{
1889	dump_object (op);	1821	dump_object (op);
1890	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1822	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1891	return op;	1823	return op;
1892	}	1824	}
		1825
1893	if (where->head)	1826	if (where->head)
1894	{	1827	{
1895	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1828	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1896	where = where->head;	1829	where = where->head;
1897	}	1830	}
		1831
1898	if (op->more)	1832	if (op->more)
1899	{	1833	{
1900	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1834	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1901	return op;	1835	return op;
1902	}	1836	}
		1837
1903	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1838	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1904	CLEAR_FLAG (op, FLAG_REMOVED);	1839	CLEAR_FLAG (op, FLAG_REMOVED);
1905	if (op->nrof)	1840	if (op->nrof)
1906	{	1841	{
1907	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1842	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1993		1928
1994	int	1929	int
1995	check_move_on (object *op, object *originator)	1930	check_move_on (object *op, object *originator)
1996	{	1931	{
1997	object *tmp;	1932	object *tmp;
1998	tag_t tag;
1999	mapstruct *m = op->map;	1933	maptile *m = op->map;
2000	int x = op->x, y = op->y;	1934	int x = op->x, y = op->y;
2001		1935
2002	MoveType move_on, move_slow, move_block;	1936	MoveType move_on, move_slow, move_block;
2003		1937
2004	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1938	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2005	return 0;	1939	return 0;
2006
2007	tag = op->count;
2008		1940
2009	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1941	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2010	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1942	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2011	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1943	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2012		1944
…		…
2055	{	1987	{
2056	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1988	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2057	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1989	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2058	{	1990	{
2059		1991
		1992	float
2060	float diff = tmp->move_slow_penalty * FABS (op->speed);	1993	diff = tmp->move_slow_penalty * FABS (op->speed);
2061		1994
2062	if (op->type == PLAYER)	1995	if (op->type == PLAYER)
2063	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1996	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2064	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1997	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2065	diff /= 4.0;	1998	diff /= 4.0;
…		…
2072	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2005	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2073	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	2006	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2074	{	2007	{
2075	move_apply (tmp, op, originator);	2008	move_apply (tmp, op, originator);
2076		2009
2077	if (was_destroyed (op, tag))	2010	if (op->destroyed ())
2078	return 1;	2011	return 1;
2079		2012
2080	/* what the person/creature stepped onto has moved the object	2013	/* what the person/creature stepped onto has moved the object
2081	* someplace new. Don't process any further - if we did,	2014	* someplace new. Don't process any further - if we did,
2082	* have a feeling strange problems would result.	2015	* have a feeling strange problems would result.
…		…
2094	* a matching archetype at the given map and coordinates.	2027	* a matching archetype at the given map and coordinates.
2095	* The first matching object is returned, or NULL if none.	2028	* The first matching object is returned, or NULL if none.
2096	*/	2029	*/
2097		2030
2098	object *	2031	object *
2099	present_arch (const archetype *at, mapstruct *m, int x, int y)	2032	present_arch (const archetype *at, maptile *m, int x, int y)
2100	{	2033	{
2101	object *	2034	object *
2102	tmp;	2035	tmp;
2103		2036
2104	if (m == NULL || out_of_map (m, x, y))	2037	if (m == NULL || out_of_map (m, x, y))
…		…
2117	* a matching type variable at the given map and coordinates.	2050	* a matching type variable at the given map and coordinates.
2118	* The first matching object is returned, or NULL if none.	2051	* The first matching object is returned, or NULL if none.
2119	*/	2052	*/
2120		2053
2121	object *	2054	object *
2122	present (unsigned char type, mapstruct *m, int x, int y)	2055	present (unsigned char type, maptile *m, int x, int y)
2123	{	2056	{
2124	object *	2057	object *
2125	tmp;	2058	tmp;
2126		2059
2127	if (out_of_map (m, x, y))	2060	if (out_of_map (m, x, y))
…		…
2267	* the archetype because that isn't correct if the monster has been	2200	* the archetype because that isn't correct if the monster has been
2268	* customized, changed states, etc.	2201	* customized, changed states, etc.
2269	*/	2202	*/
2270		2203
2271	int	2204	int
2272	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2205	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2273	{	2206	{
2274	int	2207	int
2275	i,	2208	i,
2276	index = 0, flag;	2209	index = 0, flag;
2277	static int	2210	static int
…		…
2298	return -1;	2231	return -1;
2299	return altern[RANDOM () % index];	2232	return altern[RANDOM () % index];
2300	}	2233	}
2301		2234
2302	/*	2235	/*
2303	* find_first_free_spot(archetype, mapstruct, x, y) works like	2236	* find_first_free_spot(archetype, maptile, x, y) works like
2304	* find_free_spot(), but it will search max number of squares.	2237	* find_free_spot(), but it will search max number of squares.
2305	* But it will return the first available spot, not a random choice.	2238	* But it will return the first available spot, not a random choice.
2306	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2239	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2307	*/	2240	*/
2308		2241
2309	int	2242	int
2310	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2243	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2311	{	2244	{
2312	int	2245	int
2313	i;	2246	i;
2314		2247
2315	for (i = 0; i < SIZEOFFREE; i++)	2248	for (i = 0; i < SIZEOFFREE; i++)
…		…
2379	* because we have to know what movement the thing looking to move	2312	* because we have to know what movement the thing looking to move
2380	* there is capable of.	2313	* there is capable of.
2381	*/	2314	*/
2382		2315
2383	int	2316	int
2384	find_dir (mapstruct *m, int x, int y, object *exclude)	2317	find_dir (maptile *m, int x, int y, object *exclude)
2385	{	2318	{
2386	int	2319	int
2387	i,	2320	i,
2388	max = SIZEOFFREE, mflags;	2321	max = SIZEOFFREE, mflags;
2389	sint16	2322
2390	nx,	2323	sint16 nx, ny;
2391	ny;
2392	object *	2324	object *
2393	tmp;	2325	tmp;
2394	mapstruct *	2326	maptile *
2395	mp;	2327	mp;
2396	MoveType	2328
2397	blocked,	2329	MoveType blocked, move_type;
2398	move_type;
2399		2330
2400	if (exclude && exclude->head)	2331	if (exclude && exclude->head)
2401	{	2332	{
2402	exclude = exclude->head;	2333	exclude = exclude->head;
2403	move_type = exclude->move_type;	2334	move_type = exclude->move_type;
…		…
2608	* Modified to be map tile aware -.MSW	2539	* Modified to be map tile aware -.MSW
2609	*/	2540	*/
2610		2541
2611		2542
2612	int	2543	int
2613	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2544	can_see_monsterP (maptile *m, int x, int y, int dir)
2614	{	2545	{
2615	sint16	2546	sint16 dx, dy;
2616	dx,
2617	dy;
2618	int	2547	int
2619	mflags;	2548	mflags;
2620		2549
2621	if (dir < 0)	2550	if (dir < 0)
2622	return 0; /* exit condition: invalid direction */	2551	return 0; /* exit condition: invalid direction */
…		…
2700	if (prev)	2629	if (prev)
2701	prev->more = tmp;	2630	prev->more = tmp;
2702	prev = tmp;	2631	prev = tmp;
2703	}	2632	}
2704		2633
2705	/*** copy inventory ***/
2706	for (item = src->inv; item; item = item->below)	2634	for (item = src->inv; item; item = item->below)
2707	{
2708	(void) insert_ob_in_ob (object_create_clone (item), dst);	2635	insert_ob_in_ob (object_create_clone (item), dst);
2709	}
2710		2636
2711	return dst;	2637	return dst;
2712	}	2638	}
2713		2639
2714	/* return true if the object was destroyed, 0 otherwise */
2715	int
2716	was_destroyed (const object *op, tag_t old_tag)
2717	{
2718	/* checking for FLAG_FREED isn't necessary, but makes this function more
2719	* robust */
2720	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2721	}
2722
2723	/* GROS - Creates an object using a string representing its content. */	2640	/* GROS - Creates an object using a string representing its content. */
2724
2725	/* Basically, we save the content of the string to a temp file, then call */	2641	/* Basically, we save the content of the string to a temp file, then call */
2726
2727	/* load_object on it. I admit it is a highly inefficient way to make things, */	2642	/* load_object on it. I admit it is a highly inefficient way to make things, */
2728
2729	/* but it was simple to make and allows reusing the load_object function. */	2643	/* but it was simple to make and allows reusing the load_object function. */
2730
2731	/* Remember not to use load_object_str in a time-critical situation. */	2644	/* Remember not to use load_object_str in a time-critical situation. */
2732
2733	/* Also remember that multiparts objects are not supported for now. */	2645	/* Also remember that multiparts objects are not supported for now. */
2734		2646
2735	object *	2647	object *
2736	load_object_str (const char *obstr)	2648	load_object_str (const char *obstr)
2737	{	2649	{
2738	object *	2650	object *op;
2739	op;
2740	char
2741	filename[MAX_BUF];	2651	char filename[MAX_BUF];
2742		2652
2743	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2653	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2744		2654
2745	FILE *
2746	tempfile = fopen (filename, "w");	2655	FILE *tempfile = fopen (filename, "w");
2747		2656
2748	if (tempfile == NULL)	2657	if (tempfile == NULL)
2749	{	2658	{
2750	LOG (llevError, "Error - Unable to access load object temp file\n");	2659	LOG (llevError, "Error - Unable to access load object temp file\n");
2751	return NULL;	2660	return NULL;
2752	};	2661	}
		2662
2753	fprintf (tempfile, obstr);	2663	fprintf (tempfile, obstr);
2754	fclose (tempfile);	2664	fclose (tempfile);
2755		2665
2756	op = get_object ();	2666	op = get_object ();
2757		2667
2758	object_thawer	2668	object_thawer thawer (filename);
2759	thawer (filename);
2760		2669
2761	if (thawer)	2670	if (thawer)
2762	load_object (thawer, op, 0);	2671	load_object (thawer, op, 0);
2763		2672
2764	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2673	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2772	* returns NULL if no match.	2681	* returns NULL if no match.
2773	*/	2682	*/
2774	object *	2683	object *
2775	find_obj_by_type_subtype (const object *who, int type, int subtype)	2684	find_obj_by_type_subtype (const object *who, int type, int subtype)
2776	{	2685	{
2777	object *	2686	object *tmp;
2778	tmp;
2779		2687
2780	for (tmp = who->inv; tmp; tmp = tmp->below)	2688	for (tmp = who->inv; tmp; tmp = tmp->below)
2781	if (tmp->type == type && tmp->subtype == subtype)	2689	if (tmp->type == type && tmp->subtype == subtype)
2782	return tmp;	2690	return tmp;
2783		2691
…		…
2791	* do the desired thing.	2699	* do the desired thing.
2792	*/	2700	*/
2793	key_value *	2701	key_value *
2794	get_ob_key_link (const object *ob, const char *key)	2702	get_ob_key_link (const object *ob, const char *key)
2795	{	2703	{
2796	key_value *	2704	key_value *link;
2797	link;
2798		2705
2799	for (link = ob->key_values; link != NULL; link = link->next)	2706	for (link = ob->key_values; link != NULL; link = link->next)
2800	{
2801	if (link->key == key)	2707	if (link->key == key)
2802	{
2803	return link;	2708	return link;
2804	}
2805	}
2806		2709
2807	return NULL;	2710	return NULL;
2808	}	2711	}
2809		2712
2810	/*	2713	/*
…		…
2815	* The returned string is shared.	2718	* The returned string is shared.
2816	*/	2719	*/
2817	const char *	2720	const char *
2818	get_ob_key_value (const object *op, const char *const key)	2721	get_ob_key_value (const object *op, const char *const key)
2819	{	2722	{
2820	key_value *	2723	key_value *link;
2821	link;	2724	shstr_cmp canonical_key (key);
2822	const char *
2823	canonical_key;
2824		2725
2825	canonical_key = shstr::find (key);
2826
2827	if (canonical_key == NULL)	2726	if (!canonical_key)
2828	{	2727	{
2829	/* 1. There being a field named key on any object	2728	/* 1. There being a field named key on any object
2830	* implies there'd be a shared string to find.	2729	* implies there'd be a shared string to find.
2831	* 2. Since there isn't, no object has this field.	2730	* 2. Since there isn't, no object has this field.
2832	* 3. Therefore, *this* object doesn't have this field.	2731	* 3. Therefore, *this* object doesn't have this field.
2833	*/	2732	*/
2834	return NULL;	2733	return 0;
2835	}	2734	}
2836		2735
2837	/* This is copied from get_ob_key_link() above -	2736	/* This is copied from get_ob_key_link() above -
2838	* only 4 lines, and saves the function call overhead.	2737	* only 4 lines, and saves the function call overhead.
2839	*/	2738	*/
2840	for (link = op->key_values; link != NULL; link = link->next)	2739	for (link = op->key_values; link; link = link->next)
2841	{
2842	if (link->key == canonical_key)	2740	if (link->key == canonical_key)
2843	{
2844	return link->value;	2741	return link->value;
2845	}	2742
2846	}
2847	return NULL;	2743	return 0;
2848	}	2744	}
2849		2745
2850		2746
2851	/*	2747	/*
2852	* Updates the canonical_key in op to value.	2748	* Updates the canonical_key in op to value.
…		…
2888	if (last)	2784	if (last)
2889	last->next = field->next;	2785	last->next = field->next;
2890	else	2786	else
2891	op->key_values = field->next;	2787	op->key_values = field->next;
2892		2788
2893	delete
2894	field;	2789	delete field;
2895	}	2790	}
2896	}	2791	}
2897	return TRUE;	2792	return TRUE;
2898	}	2793	}
2899	/* IF we get here, key doesn't exist */	2794	/* IF we get here, key doesn't exist */
…		…
2934	* Returns TRUE on success.	2829	* Returns TRUE on success.
2935	*/	2830	*/
2936	int	2831	int
2937	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2832	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2938	{	2833	{
2939	shstr
2940	key_ (key);	2834	shstr key_ (key);
2941		2835
2942	return set_ob_key_value_s (op, key_, value, add_key);	2836	return set_ob_key_value_s (op, key_, value, add_key);
2943	}	2837	}
		2838
		2839	object::depth_iterator::depth_iterator (object *container)
		2840	: iterator_base (container)
		2841	{
		2842	while (item->inv)
		2843	item = item->inv;
		2844	}
		2845
		2846	void
		2847	object::depth_iterator::next ()
		2848	{
		2849	if (item->below)
		2850	{
		2851	item = item->below;
		2852
		2853	while (item->inv)
		2854	item = item->inv;
		2855	}
		2856	else
		2857	item = item->env;
		2858	}
		2859
		2860	// return a suitable string describing an objetc in enough detail to find it
		2861	const char *
		2862	object::debug_desc (char *info) const
		2863	{
		2864	char info2[256 * 3];
		2865	char *p = info;
		2866
		2867	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2868	count,
		2869	&name,
		2870	title ? " " : "",
		2871	title ? (const char *)title : "");
		2872
		2873	if (env)
		2874	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2875
		2876	if (map)
		2877	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2878
		2879	return info;
		2880	}
		2881
		2882	const char *
		2883	object::debug_desc () const
		2884	{
		2885	static char info[256 * 3];
		2886	return debug_desc (info);
		2887	}
		2888

Diff Legend

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