[ViewVC] Diff of: 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.47 by root, Thu Sep 14 22:33:59 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 %d\n:%s\n", op->count, errmsg);
381	}	454	}
382	}	455	}
…		…
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;
416	return op;	489	return op;
417	}	490	}
418		491
…		…
423	*/	496	*/
424		497
425	object *	498	object *
426	find_object_name (const char *str)	499	find_object_name (const char *str)
427	{	500	{
428	const char *name = shstr::find (str);	501	shstr_cmp str_ (str);
429	object *op;	502	object *op;
430		503
431	for (op = objects; op != NULL; op = op->next)	504	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	505	if (op->name == str_)
433	break;	506	break;
434		507
435	return op;	508	return op;
436	}	509	}
437		510
…		…
440	{	513	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	514	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	515	}
443		516
444	/*	517	/*
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	518	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	519	* skill and experience objects.
485	*/	520	*/
486	void	521	void
487	set_owner (object op, object owner)	522	object::set_owner (object *owner)
488	{	523	{
489	if (owner == NULL \|\| op == NULL)	524	if (!owner)
490	return;	525	return;
491		526
492	/* next line added to allow objects which own objects */	527	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	528	/* 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	529	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	530	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	531	* 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.	532	* didn't match, this check is valid and I believe that cause is valid.
498	*/	533	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	534	while (owner->owner)
500	owner = owner->owner;	535	owner = owner->owner;
501		536
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;	537	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	}	538	}
542		539
543	/* Zero the key_values on op, decrementing the shared-string	540	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	541	* refcounts and freeing the links.
545	*/	542	*/
…		…
561	{	558	{
562	attachable_base::clear ();	559	attachable_base::clear ();
563		560
564	free_key_values (this);	561	free_key_values (this);
565		562
566	clear_owner (this);	563	owner = 0;
567
568	name = 0;	564	name = 0;
569	name_pl = 0;	565	name_pl = 0;
570	title = 0;	566	title = 0;
571	race = 0;	567	race = 0;
572	slaying = 0;	568	slaying = 0;
573	skill = 0;	569	skill = 0;
574	msg = 0;	570	msg = 0;
575	lore = 0;	571	lore = 0;
576	custom_name = 0;	572	custom_name = 0;
577	materialname = 0;	573	materialname = 0;
		574	contr = 0;
		575	below = 0;
		576	above = 0;
		577	inv = 0;
		578	container = 0;
		579	env = 0;
		580	more = 0;
		581	head = 0;
		582	map = 0;
		583	active_next = 0;
		584	active_prev = 0;
578		585
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	586	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		587
581	SET_FLAG (this, FLAG_REMOVED);	588	SET_FLAG (this, FLAG_REMOVED);
		589
		590	/* What is not cleared is next, prev, and count */
		591
		592	expmul = 1.0;
		593	face = blank_face;
		594
		595	if (settings.casting_time)
		596	casting_time = -1;
582	}	597	}
583		598
584	void object::clone (object *destination)	599	void object::clone (object *destination)
585	{	600	{
586	(object_copy ) destination = *this;	601	(object_copy )destination = *this;
587	(object_pod ) destination = *this;	602	(object_pod )destination = *this;
588		603
589	if (self \|\| cb)	604	if (self \|\| cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	605	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	}	606	}
624		607
625	/*	608	/*
626	* copy object first frees everything allocated by the second object,	609	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	610	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	611	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	612	* 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	613	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	614	* will point at garbage.
632	*/	615	*/
633
634	void	616	void
635	copy_object (object op2, object op)	617	copy_object (object op2, object op)
636	{	618	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	619	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	620	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	680	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	681	* 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.	682	* 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.	683	* This function needs to be called whenever the speed of an object changes.
702	*/	684	*/
703
704	void	685	void
705	update_ob_speed (object *op)	686	update_ob_speed (object *op)
706	{	687	{
707	extern int arch_init;	688	extern int arch_init;
708		689
…		…
717	abort ();	698	abort ();
718	#else	699	#else
719	op->speed = 0;	700	op->speed = 0;
720	#endif	701	#endif
721	}	702	}
		703
722	if (arch_init)	704	if (arch_init)
723	{
724	return;	705	return;
725	}	706
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	707	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	708	{
728	/* If already on active list, don't do anything */	709	/* If already on active list, don't do anything */
729	if (op->active_next \|\| op->active_prev \|\| op == active_objects)	710	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
730	return;	711	return;
731		712
732	/* process_events() expects us to insert the object at the beginning	713	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	714	* of the list. */
734	op->active_next = active_objects;	715	op->active_next = active_objects;
		716
735	if (op->active_next != NULL)	717	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	718	op->active_next->active_prev = op;
		719
737	active_objects = op;	720	active_objects = op;
738	}	721	}
739	else	722	else
740	{	723	{
741	/* If not on the active list, nothing needs to be done */	724	/* If not on the active list, nothing needs to be done */
…		…
743	return;	726	return;
744		727
745	if (op->active_prev == NULL)	728	if (op->active_prev == NULL)
746	{	729	{
747	active_objects = op->active_next;	730	active_objects = op->active_next;
		731
748	if (op->active_next != NULL)	732	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	733	op->active_next->active_prev = NULL;
750	}	734	}
751	else	735	else
752	{	736	{
753	op->active_prev->active_next = op->active_next;	737	op->active_prev->active_next = op->active_next;
		738
754	if (op->active_next)	739	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	740	op->active_next->active_prev = op->active_prev;
756	}	741	}
		742
757	op->active_next = NULL;	743	op->active_next = NULL;
758	op->active_prev = NULL;	744	op->active_prev = NULL;
759	}	745	}
760	}	746	}
761		747
…		…
893	* that is being removed.	879	* that is being removed.
894	*/	880	*/
895	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	881	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
896	update_now = 1;	882	update_now = 1;
897	else if (action == UP_OBJ_FACE)	883	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	884	/* Nothing to do for that case */ ;
899	else	885	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	886	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		887
902	if (update_now)	888	if (update_now)
903	{	889	{
…		…
907		893
908	if (op->more != NULL)	894	if (op->more != NULL)
909	update_object (op->more, action);	895	update_object (op->more, action);
910	}	896	}
911		897
912	static unordered_vector<object *> mortals;	898	object::vector object::mortals;
913	static std::vector<object *> freed;	899	object::vector object::objects; // not yet used
		900	object *object::first;
914		901
915	void object::free_mortals ()	902	void object::free_mortals ()
916	{	903	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	904	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
918	if (!(*i)->refcount)	905	if ((*i)->refcnt)
		906	++i; // further delay freeing
		907	else
919	{	908	{
920	freed.push_back (*i);	909	delete *i;
921	mortals.erase (i);	910	mortals.erase (i);
922	}	911	}
923	else	912
924	++i;	913	static int lastmortals = 0;//D
		914
		915	if (mortals.size() != lastmortals)//D
		916	{
		917	lastmortals = mortals.size ();//D
		918	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		919	}
925	}	920	}
926		921
927	object::object ()	922	object::object ()
928	{	923	{
929	SET_FLAG (this, FLAG_REMOVED);	924	SET_FLAG (this, FLAG_REMOVED);
930		925
931	expmul = 1.0;	926	expmul = 1.0;
932	face = blank_face;	927	face = blank_face;
933	attacked_by_count = -1;
934	}	928	}
935		929
936	object::~object ()	930	object::~object ()
937	{	931	{
938	free_key_values (this);	932	free_key_values (this);
939	}	933	}
940		934
941	void object::link ()	935	void object::link ()
942	{	936	{
943	count = ++ob_count;	937	count = ++ob_count;
		938	uuid = gen_uuid ();
944		939
945	prev = 0;	940	prev = 0;
946	next = objects;	941	next = object::first;
947		942
948	if (objects)	943	if (object::first)
949	objects->prev = this;	944	object::first->prev = this;
950		945
951	objects = this;	946	object::first = this;
952	}	947	}
953		948
954	void object::unlink ()	949	void object::unlink ()
955	{	950	{
956	count = 0;	951	//count = 0;//D
		952	if (!prev && !next) return;//D
		953
		954	if (this == object::first)
		955	object::first = next;
957		956
958	/* Remove this object from the list of used objects */	957	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;	958	if (prev) prev->next = next;
		959	if (next) next->prev = prev;
		960
962	prev = 0;	961	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;	962	next = 0;
969	}
970
971	if (this == objects)
972	objects = next;
973	}	963	}
974		964
975	object *object::create ()	965	object *object::create ()
976	{	966	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	967	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 ();	968	op->link ();
990	return op;	969	return op;
991	}	970	}
992		971
993	/*	972	/*
…		…
1000	* If free_inventory is set, free inventory as well. Else drop items in	979	* If free_inventory is set, free inventory as well. Else drop items in
1001	* inventory to the ground.	980	* inventory to the ground.
1002	*/	981	*/
1003	void object::free (bool free_inventory)	982	void object::free (bool free_inventory)
1004	{	983	{
		984	if (QUERY_FLAG (this, FLAG_FREED))
		985	return;
		986
		987	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		988	remove_friendly_object (this);
		989
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	990	if (!QUERY_FLAG (this, FLAG_REMOVED))
1006	{	991	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		992
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))	993	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		994
1027	if (more)	995	if (more)
1028	{	996	{
1029	more->free (free_inventory);	997	more->free (free_inventory);
1030	more = 0;	998	more = 0;
…		…
1034	{	1002	{
1035	/* Only if the space blocks everything do we not process -	1003	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects	1004	* if some form of movement is allowed, let objects
1037	* drop on that space.	1005	* drop on that space.
1038	*/	1006	*/
1039	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1007	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1040	{	1008	{
1041	object *	1009	object *op = inv;
1042	op = inv;
1043		1010
1044	while (op)	1011	while (op)
1045	{	1012	{
1046	object *
1047	tmp = op->below;	1013	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	1014	op->free (free_inventory);
1051	op = tmp;	1015	op = tmp;
1052	}	1016	}
1053	}	1017	}
1054	else	1018	else
1055	{ /* Put objects in inventory onto this space */	1019	{ /* Put objects in inventory onto this space */
1056	object *	1020	object *op = inv;
1057	op = inv;
1058		1021
1059	while (op)	1022	while (op)
1060	{	1023	{
1061	object *
1062	tmp = op->below;	1024	object *tmp = op->below;
1063		1025
1064	remove_ob (op);	1026	remove_ob (op);
1065		1027
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1028	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))	1029	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1076	op = tmp;	1038	op = tmp;
1077	}	1039	}
1078	}	1040	}
1079	}	1041	}
1080		1042
1081	clear_owner (this);	1043	// clear those pointers that likely might have circular references to us
		1044	owner = 0;
		1045	enemy = 0;
		1046	attacked_by = 0;
1082		1047
1083	/* Remove object from the active list */	1048	/* Remove object from the active list */
1084	speed = 0;	1049	speed = 0;
1085	update_ob_speed (this);	1050	update_ob_speed (this);
1086		1051
1087	unlink ();	1052	unlink ();
1088		1053
1089	SET_FLAG (this, FLAG_FREED);
1090
1091	mortals.push_back (this);	1054	mortals.push_back (this);
1092	}	1055	}
1093		1056
1094	/*	1057	/*
1095	* sub_weight() recursively (outwards) subtracts a number from the	1058	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1100	sub_weight (object *op, signed long weight)	1063	sub_weight (object *op, signed long weight)
1101	{	1064	{
1102	while (op != NULL)	1065	while (op != NULL)
1103	{	1066	{
1104	if (op->type == CONTAINER)	1067	if (op->type == CONTAINER)
1105	{
1106	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1068	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1107	}	1069
1108	op->carrying -= weight;	1070	op->carrying -= weight;
1109	op = op->env;	1071	op = op->env;
1110	}	1072	}
1111	}	1073	}
1112		1074
…		…
1120	*/	1082	*/
1121		1083
1122	void	1084	void
1123	remove_ob (object *op)	1085	remove_ob (object *op)
1124	{	1086	{
1125	object tmp, last = NULL;	1087	object tmp, last = 0;
1126	object *otmp;	1088	object *otmp;
1127		1089
1128	tag_t tag;	1090	tag_t tag;
1129	int check_walk_off;	1091	int check_walk_off;
1130	mapstruct *m;	1092	mapstruct *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	tag = op->count;
		1198	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1199
		1200	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1201	{
		1202	/* No point updating the players look faces if he is the object
		1203	* being removed.
		1204	*/
		1205
		1206	if (tmp->type == PLAYER && tmp != op)
1284	{	1207	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1208	/* If a container that the player is currently using somehow gets
		1209	* removed (most likely destroyed), update the player view
		1210	* appropriately.
		1211	*/
		1212	if (tmp->container == op)
		1213	{
		1214	CLEAR_FLAG (op, FLAG_APPLIED);
		1215	tmp->container = NULL;
		1216	}
		1217
		1218	tmp->contr->socket.update_look = 1;
1286	}	1219	}
		1220
		1221	/* See if player moving off should effect something */
		1222	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1223	{
		1224	move_apply (tmp, op, NULL);
		1225
		1226	if (was_destroyed (op, tag))
		1227	{
		1228	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1229	}
1287	}	1230	}
1288		1231
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1232	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1233
1291	if (tmp->above == tmp)	1234	if (tmp->above == tmp)
1292	tmp->above = NULL;	1235	tmp->above = NULL;
1293		1236
1294	last = tmp;	1237	last = tmp;
1295	}	1238	}
1296		1239
1297	/* last == NULL of there are no objects on this space */	1240	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1241	if (last == NULL)
1299	{	1242	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1243	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1244	* 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	1245	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.	1246	* be correct anyways.
1304	*/	1247	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1248	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);	1249	update_position (op->map, op->x, op->y);
1307	}	1250	}
1308	else	1251	else
1309	update_object (last, UP_OBJ_REMOVE);	1252	update_object (last, UP_OBJ_REMOVE);
1310		1253
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))	1254	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))
1312	update_all_los (op->map, op->x, op->y);	1255	update_all_los (op->map, op->x, op->y);
		1256	}
1313	}	1257	}
1314		1258
1315	/*	1259	/*
1316	* merge_ob(op,top):	1260	* merge_ob(op,top):
1317	*	1261	*
1318	* This function goes through all objects below and including top, and	1262	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1263	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1264	* If top is NULL, it is calculated.
1321	* Returns pointer to object if it succeded in the merge, otherwise NULL	1265	* Returns pointer to object if it succeded in the merge, otherwise NULL
1322	*/	1266	*/
1323
1324	object *	1267	object *
1325	merge_ob (object op, object top)	1268	merge_ob (object op, object top)
1326	{	1269	{
1327	if (!op->nrof)	1270	if (!op->nrof)
1328	return 0;	1271	return 0;
		1272
1329	if (top == NULL)	1273	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1274	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1275
1331	for (; top != NULL; top = top->below)	1276	for (; top != NULL; top = top->below)
1332	{	1277	{
1333	if (top == op)	1278	if (top == op)
1334	continue;	1279	continue;
1335	if (CAN_MERGE (op, top))	1280	if (CAN_MERGE (op, top))
…		…
1341	remove_ob (op);	1286	remove_ob (op);
1342	free_object (op);	1287	free_object (op);
1343	return top;	1288	return top;
1344	}	1289	}
1345	}	1290	}
		1291
1346	return NULL;	1292	return 0;
1347	}	1293	}
1348		1294
1349	/*	1295	/*
1350	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1296	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1351	* job preparing multi-part monsters	1297	* job preparing multi-part monsters
1352	*/	1298	*/
1353	object *	1299	object *
1354	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1300	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)
1355	{	1301	{
1356	object *	1302	object *tmp;
1357	tmp;
1358		1303
1359	if (op->head)	1304	if (op->head)
1360	op = op->head;	1305	op = op->head;
		1306
1361	for (tmp = op; tmp; tmp = tmp->more)	1307	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1308	{
1363	tmp->x = x + tmp->arch->clone.x;	1309	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1310	tmp->y = y + tmp->arch->clone.y;
1365	}	1311	}
		1312
1366	return insert_ob_in_map (op, m, originator, flag);	1313	return insert_ob_in_map (op, m, originator, flag);
1367	}	1314	}
1368		1315
1369	/*	1316	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1317	* insert_ob_in_map (op, map, originator, flag):
…		…
1661	* op is the object to insert it under: supplies x and the map.	1608	* op is the object to insert it under: supplies x and the map.
1662	*/	1609	*/
1663	void	1610	void
1664	replace_insert_ob_in_map (const char arch_string, object op)	1611	replace_insert_ob_in_map (const char arch_string, object op)
1665	{	1612	{
1666	object *tmp;	1613	object *
		1614	tmp;
1667	object *tmp1;	1615	object *
		1616	tmp1;
1668		1617
1669	/* first search for itself and remove any old instances */	1618	/* first search for itself and remove any old instances */
1670		1619
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1620	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{	1621	{
…		…
1675	remove_ob (tmp);	1624	remove_ob (tmp);
1676	free_object (tmp);	1625	free_object (tmp);
1677	}	1626	}
1678	}	1627	}
1679		1628
1680	tmp1 = arch_to_object (find_archetype (arch_string));	1629	tmp1 = arch_to_object (archetype::find (arch_string));
1681		1630
1682	tmp1->x = op->x;	1631	tmp1->x = op->x;
1683	tmp1->y = op->y;	1632	tmp1->y = op->y;
1684	insert_ob_in_map (tmp1, op->map, op, 0);	1633	insert_ob_in_map (tmp1, op->map, op, 0);
1685	}	1634	}
…		…
1703	if (orig_ob->nrof < nr)	1652	if (orig_ob->nrof < nr)
1704	{	1653	{
1705	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1654	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1706	return NULL;	1655	return NULL;
1707	}	1656	}
		1657
1708	newob = object_create_clone (orig_ob);	1658	newob = object_create_clone (orig_ob);
		1659
1709	if ((orig_ob->nrof -= nr) < 1)	1660	if ((orig_ob->nrof -= nr) < 1)
1710	{	1661	{
1711	if (!is_removed)	1662	if (!is_removed)
1712	remove_ob (orig_ob);	1663	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);	1664	free_object2 (orig_ob, 1);
…		…
1721	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1672	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");	1673	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1723	return NULL;	1674	return NULL;
1724	}	1675	}
1725	}	1676	}
		1677
1726	newob->nrof = nr;	1678	newob->nrof = nr;
1727		1679
1728	return newob;	1680	return newob;
1729	}	1681	}
1730		1682
…		…
1737	*/	1689	*/
1738		1690
1739	object *	1691	object *
1740	decrease_ob_nr (object *op, uint32 i)	1692	decrease_ob_nr (object *op, uint32 i)
1741	{	1693	{
1742	object *	1694	object *tmp;
1743	tmp;
1744	player *	1695	player *pl;
1745	pl;
1746		1696
1747	if (i == 0) /* objects with op->nrof require this check */	1697	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1698	return op;
1749		1699
1750	if (i > op->nrof)	1700	if (i > op->nrof)
1751	i = op->nrof;	1701	i = op->nrof;
1752		1702
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1703	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1704	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1705	else if (op->env != NULL)
1758	{	1706	{
1759	/* is this object in the players inventory, or sub container	1707	/* is this object in the players inventory, or sub container
1760	* therein?	1708	* therein?
1761	*/	1709	*/
…		…
1796	}	1744	}
1797	}	1745	}
1798	}	1746	}
1799	else	1747	else
1800	{	1748	{
1801	object *
1802	above = op->above;	1749	object *above = op->above;
1803		1750
1804	if (i < op->nrof)	1751	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1752	op->nrof -= i;
1807	}
1808	else	1753	else
1809	{	1754	{
1810	remove_ob (op);	1755	remove_ob (op);
1811	op->nrof = 0;	1756	op->nrof = 0;
1812	}	1757	}
		1758
1813	/* Since we just removed op, op->above is null */	1759	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1760	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1761	if (tmp->type == PLAYER)
1816	{	1762	{
1817	if (op->nrof)	1763	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1766	esrv_del_item (tmp->contr, op->count);
1821	}	1767	}
1822	}	1768	}
1823		1769
1824	if (op->nrof)	1770	if (op->nrof)
1825	{
1826	return op;	1771	return op;
1827	}
1828	else	1772	else
1829	{	1773	{
1830	free_object (op);	1774	free_object (op);
1831	return NULL;	1775	return NULL;
1832	}	1776	}
…		…
1841	add_weight (object *op, signed long weight)	1785	add_weight (object *op, signed long weight)
1842	{	1786	{
1843	while (op != NULL)	1787	while (op != NULL)
1844	{	1788	{
1845	if (op->type == CONTAINER)	1789	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1790	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1791
1849	op->carrying += weight;	1792	op->carrying += weight;
1850	op = op->env;	1793	op = op->env;
1851	}	1794	}
1852	}	1795	}
1853		1796
…		…
1876	{	1819	{
1877	dump_object (op);	1820	dump_object (op);
1878	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1821	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1879	return op;	1822	return op;
1880	}	1823	}
		1824
1881	if (where == NULL)	1825	if (where == NULL)
1882	{	1826	{
1883	dump_object (op);	1827	dump_object (op);
1884	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1828	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1885	return op;	1829	return op;
1886	}	1830	}
		1831
1887	if (where->head)	1832	if (where->head)
1888	{	1833	{
1889	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1834	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1890	where = where->head;	1835	where = where->head;
1891	}	1836	}
		1837
1892	if (op->more)	1838	if (op->more)
1893	{	1839	{
1894	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1840	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1895	return op;	1841	return op;
1896	}	1842	}
		1843
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1844	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1845	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1846	if (op->nrof)
1900	{	1847	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1848	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1986	*/	1933	*/
1987		1934
1988	int	1935	int
1989	check_move_on (object op, object originator)	1936	check_move_on (object op, object originator)
1990	{	1937	{
1991	object *tmp;	1938	object *
1992	tag_t tag;	1939	tmp;
1993	mapstruct *m = op->map;	1940	tag_t
		1941	tag;
		1942	mapstruct *
		1943	m = op->map;
		1944	int
1994	int x = op->x, y = op->y;	1945	x = op->x, y = op->y;
1995		1946
1996	MoveType move_on, move_slow, move_block;	1947	MoveType
		1948	move_on,
		1949	move_slow,
		1950	move_block;
1997		1951
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1952	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1953	return 0;
2000		1954
2001	tag = op->count;	1955	tag = op->count;
…		…
2049	{	2003	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	2004	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))	2005	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	2006	{
2053		2007
		2008	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	2009	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		2010
2056	if (op->type == PLAYER)	2011	if (op->type == PLAYER)
2057	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	2012	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)))	2013	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2059	diff /= 4.0;	2014	diff /= 4.0;
…		…
2378	find_dir (mapstruct m, int x, int y, object exclude)	2333	find_dir (mapstruct m, int x, int y, object exclude)
2379	{	2334	{
2380	int	2335	int
2381	i,	2336	i,
2382	max = SIZEOFFREE, mflags;	2337	max = SIZEOFFREE, mflags;
2383	sint16	2338
2384	nx,	2339	sint16 nx, ny;
2385	ny;
2386	object *	2340	object *
2387	tmp;	2341	tmp;
2388	mapstruct *	2342	mapstruct *
2389	mp;	2343	mp;
2390	MoveType	2344
2391	blocked,	2345	MoveType blocked, move_type;
2392	move_type;
2393		2346
2394	if (exclude && exclude->head)	2347	if (exclude && exclude->head)
2395	{	2348	{
2396	exclude = exclude->head;	2349	exclude = exclude->head;
2397	move_type = exclude->move_type;	2350	move_type = exclude->move_type;
…		…
2604		2557
2605		2558
2606	int	2559	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2560	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2608	{	2561	{
2609	sint16	2562	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2563	int
2613	mflags;	2564	mflags;
2614		2565
2615	if (dir < 0)	2566	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2567	return 0; /* exit condition: invalid direction */
…		…
2741		2692
2742	if (tempfile == NULL)	2693	if (tempfile == NULL)
2743	{	2694	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2695	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2696	return NULL;
2746	};	2697	}
		2698
2747	fprintf (tempfile, obstr);	2699	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2700	fclose (tempfile);
2749		2701
2750	op = get_object ();	2702	op = get_object ();
2751		2703
2752	object_thawer	2704	object_thawer thawer (filename);
2753	thawer (filename);
2754		2705
2755	if (thawer)	2706	if (thawer)
2756	load_object (thawer, op, 0);	2707	load_object (thawer, op, 0);
2757		2708
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2709	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2809	* The returned string is shared.	2760	* The returned string is shared.
2810	*/	2761	*/
2811	const char *	2762	const char *
2812	get_ob_key_value (const object op, const char const key)	2763	get_ob_key_value (const object op, const char const key)
2813	{	2764	{
2814	key_value *	2765	key_value *link;
2815	link;	2766	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2767
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2768	if (!canonical_key)
2822	{	2769	{
2823	/* 1. There being a field named key on any object	2770	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2771	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2772	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, this object doesn't have this field.	2773	* 3. Therefore, this object doesn't have this field.
2827	*/	2774	*/
2828	return NULL;	2775	return 0;
2829	}	2776	}
2830		2777
2831	/* This is copied from get_ob_key_link() above -	2778	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2779	* only 4 lines, and saves the function call overhead.
2833	*/	2780	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2781	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2782	if (link->key == canonical_key)
2837	{
2838	return link->value;	2783	return link->value;
2839	}	2784
2840	}
2841	return NULL;	2785	return 0;
2842	}	2786	}
2843		2787
2844		2788
2845	/*	2789	/*
2846	* Updates the canonical_key in op to value.	2790	* Updates the canonical_key in op to value.
…		…
2882	if (last)	2826	if (last)
2883	last->next = field->next;	2827	last->next = field->next;
2884	else	2828	else
2885	op->key_values = field->next;	2829	op->key_values = field->next;
2886		2830
2887	delete
2888	field;	2831	delete field;
2889	}	2832	}
2890	}	2833	}
2891	return TRUE;	2834	return TRUE;
2892	}	2835	}
2893	/* IF we get here, key doesn't exist */	2836	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2871	* Returns TRUE on success.
2929	*/	2872	*/
2930	int	2873	int
2931	set_ob_key_value (object op, const char key, const char *value, int add_key)	2874	set_ob_key_value (object op, const char key, const char *value, int add_key)
2932	{	2875	{
2933	shstr
2934	key_ (key);	2876	shstr key_ (key);
2935		2877
2936	return set_ob_key_value_s (op, key_, value, add_key);	2878	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2879	}
		2880
		2881	object::depth_iterator::depth_iterator (object *container)
		2882	: iterator_base (container)
		2883	{
		2884	while (item->inv)
		2885	item = item->inv;
		2886	}
		2887
		2888	void
		2889	object::depth_iterator::next ()
		2890	{
		2891	if (item->below)
		2892	{
		2893	item = item->below;
		2894
		2895	while (item->inv)
		2896	item = item->inv;
		2897	}
		2898	else
		2899	item = item->env;
		2900	}
		2901
		2902	// return a suitable string describing an objetc in enough detail to find it
		2903	const char *
		2904	object::debug_desc (char *info) const
		2905	{
		2906	char info2[256 * 3];
		2907	char *p = info;
		2908
		2909	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2910	count,
		2911	&name,
		2912	title ? " " : "",
		2913	title ? (const char *)title : "");
		2914
		2915	if (env)
		2916	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2917
		2918	if (map)
		2919	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2920
		2921	return info;
		2922	}
		2923
		2924	const char *
		2925	object::debug_desc () const
		2926	{
		2927	static char info[256 * 3];
		2928	return debug_desc (info);
		2929	}
		2930

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC vs. Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC