[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.46 by root, Thu Sep 14 21:16:11 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		1
7	/*	2	/*
8	CrossFire, A Multiplayer game for X-windows	3	CrossFire, A Multiplayer game for X-windows
9		4
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
29		24
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
32	variable. */	27	variable. */
33	#include <global.h>	28	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	29	#include <stdio.h>
36	# include <sys/types.h>	30	#include <sys/types.h>
37	# include <sys/uio.h>	31	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	32	#include <object.h>
40	#include <funcpoint.h>	33	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	34	#include <loader.h>
		35
43	int nrofallocobjects = 0;	36	int nrofallocobjects = 0;
		37	static UUID uuid;
		38	const uint64 UUID_SKIP = 1<<19;
44		39
45	object objects; / Pointer to the list of used objects */
46	object active_objects; / List of active objects that need to be processed */	40	object active_objects; / List of active objects that need to be processed */
47		41
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,	42	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	43	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	};	44	};
…		…
56	};	50	};
57	int freedir[SIZEOFFREE] = {	51	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,	52	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	53	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	};	54	};
		55
		56	static void
		57	write_uuid (void)
		58	{
		59	char filename1[MAX_BUF], filename2[MAX_BUF];
		60
		61	sprintf (filename1, "%s/uuid", settings.localdir);
		62	sprintf (filename2, "%s/uuid~", settings.localdir);
		63
		64	FILE *fp;
		65
		66	if (!(fp = fopen (filename2, "w")))
		67	{
		68	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		69	return;
		70	}
		71
		72	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		73	fclose (fp);
		74	rename (filename2, filename1);
		75	}
		76
		77	static void
		78	read_uuid (void)
		79	{
		80	char filename[MAX_BUF];
		81
		82	sprintf (filename, "%s/uuid", settings.localdir);
		83
		84	FILE *fp;
		85
		86	if (!(fp = fopen (filename, "r")))
		87	{
		88	if (errno == ENOENT)
		89	{
		90	LOG (llevInfo, "RESET uid to 1\n");
		91	uuid.seq = 0;
		92	write_uuid ();
		93	return;
		94	}
		95
		96	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		97	_exit (1);
		98	}
		99
		100	int version;
		101	unsigned long long uid;
		102	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)
		103	{
		104	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		105	_exit (1);
		106	}
		107
		108	uuid.seq = uid;
		109	write_uuid ();
		110	LOG (llevDebug, "read UID: %lld\n", uid);
		111	fclose (fp);
		112	}
		113
		114	UUID
		115	gen_uuid ()
		116	{
		117	UUID uid;
		118
		119	uid.seq = ++uuid.seq;
		120
		121	if (!(uuid.seq & (UUID_SKIP - 1)))
		122	write_uuid ();
		123
		124	return uid;
		125	}
		126
		127	void
		128	init_uuid ()
		129	{
		130	read_uuid ();
		131	}
61		132
62	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	133	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
63	static int	134	static int
64	compare_ob_value_lists_one (const object wants, const object has)	135	compare_ob_value_lists_one (const object wants, const object has)
65	{	136	{
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	285	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	286	return 0;
216		287
217	switch (ob1->type)	288	switch (ob1->type)
218	{	289	{
219	case SCROLL:	290	case SCROLL:
220	if (ob1->level != ob2->level)	291	if (ob1->level != ob2->level)
221	return 0;	292	return 0;
222	break;	293	break;
223	}	294	}
224		295
225	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	296	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)
226	{	297	{
227	/* At least one of these has key_values. */	298	/* At least one of these has key_values. */
…		…
249	/*	320	/*
250	* sum_weight() is a recursive function which calculates the weight	321	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	322	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	323	* containers are carrying, and sums it up.
253	*/	324	*/
254	signed long	325	long
255	sum_weight (object *op)	326	sum_weight (object *op)
256	{	327	{
257	signed long sum;	328	long sum;
258	object *inv;	329	object *inv;
259		330
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	331	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	332	{
262	if (inv->inv)	333	if (inv->inv)
263	sum_weight (inv);	334	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	336	}
		337
266	if (op->type == CONTAINER && op->stats.Str)	338	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	339	sum = (sum * (100 - op->stats.Str)) / 100;
		340
268	if (op->carrying != sum)	341	if (op->carrying != sum)
269	op->carrying = sum;	342	op->carrying = sum;
		343
270	return sum;	344	return sum;
271	}	345	}
272		346
273	/**	347	/**
274	* Return the outermost environment object for a given object.	348	* Return the outermost environment object for a given object.
…		…
372	void	446	void
373	dump_all_objects (void)	447	dump_all_objects (void)
374	{	448	{
375	object *op;	449	object *op;
376		450
377	for (op = objects; op != NULL; op = op->next)	451	for (op = object::first; op != NULL; op = op->next)
378	{	452	{
379	dump_object (op);	453	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);	454	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}	455	}
382	}	456	}
…		…
408	object *	482	object *
409	find_object (tag_t i)	483	find_object (tag_t i)
410	{	484	{
411	object *op;	485	object *op;
412		486
413	for (op = objects; op != NULL; op = op->next)	487	for (op = object::first; op != NULL; op = op->next)
414	if (op->count == i)	488	if (op->count == i)
415	break;	489	break;
416	return op;	490	return op;
417	}	491	}
418		492
…		…
423	*/	497	*/
424		498
425	object *	499	object *
426	find_object_name (const char *str)	500	find_object_name (const char *str)
427	{	501	{
428	const char *name = shstr::find (str);	502	shstr_cmp str_ (str);
429	object *op;	503	object *op;
430		504
431	for (op = objects; op != NULL; op = op->next)	505	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	506	if (op->name == str_)
433	break;	507	break;
434		508
435	return op;	509	return op;
436	}	510	}
437		511
…		…
440	{	514	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	515	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	516	}
443		517
444	/*	518	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	519	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	520	* skill and experience objects.
485	*/	521	*/
486	void	522	void
487	set_owner (object op, object owner)	523	object::set_owner (object *owner)
488	{	524	{
489	if (owner == NULL \|\| op == NULL)	525	if (!owner)
490	return;	526	return;
491		527
492	/* next line added to allow objects which own objects */	528	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	529	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	530	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	531	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	532	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	533	* didn't match, this check is valid and I believe that cause is valid.
498	*/	534	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	535	while (owner->owner)
500	owner = owner->owner;	536	owner = owner->owner;
501		537
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	538	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object op, object clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	539	}
542		540
543	/* Zero the key_values on op, decrementing the shared-string	541	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	542	* refcounts and freeing the links.
545	*/	543	*/
…		…
561	{	559	{
562	attachable_base::clear ();	560	attachable_base::clear ();
563		561
564	free_key_values (this);	562	free_key_values (this);
565		563
566	clear_owner (this);	564	owner = 0;
567
568	name = 0;	565	name = 0;
569	name_pl = 0;	566	name_pl = 0;
570	title = 0;	567	title = 0;
571	race = 0;	568	race = 0;
572	slaying = 0;	569	slaying = 0;
573	skill = 0;	570	skill = 0;
574	msg = 0;	571	msg = 0;
575	lore = 0;	572	lore = 0;
576	custom_name = 0;	573	custom_name = 0;
577	materialname = 0;	574	materialname = 0;
		575	contr = 0;
		576	below = 0;
		577	above = 0;
		578	inv = 0;
		579	container = 0;
		580	env = 0;
		581	more = 0;
		582	head = 0;
		583	map = 0;
		584	active_next = 0;
		585	active_prev = 0;
578		586
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	587	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		588
581	SET_FLAG (this, FLAG_REMOVED);	589	SET_FLAG (this, FLAG_REMOVED);
		590
		591	/* What is not cleared is next, prev, and count */
		592
		593	expmul = 1.0;
		594	face = blank_face;
		595
		596	if (settings.casting_time)
		597	casting_time = -1;
582	}	598	}
583		599
584	void object::clone (object *destination)	600	void object::clone (object *destination)
585	{	601	{
586	(object_copy ) destination = *this;	602	(object_copy )destination = *this;
587	(object_pod ) destination = *this;	603	(object_pod )destination = *this;
588		604
589	if (self \|\| cb)	605	if (self \|\| cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	606	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */
616
617	op->expmul = 1.0;
618	op->face = blank_face;
619	op->attacked_by_count = -1;
620
621	if (settings.casting_time)
622	op->casting_time = -1;
623	}	607	}
624		608
625	/*	609	/*
626	* copy object first frees everything allocated by the second object,	610	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	611	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	612	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	613	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
630	* if the first object is freed, the pointers in the new object	614	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	615	* will point at garbage.
632	*/	616	*/
633
634	void	617	void
635	copy_object (object op2, object op)	618	copy_object (object op2, object op)
636	{	619	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
698	/*	681	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	682	* Updates the speed of an object. If the speed changes from 0 to another
700	* value, or vice versa, then add/remove the object from the active list.	683	* value, or vice versa, then add/remove the object from the active list.
701	* This function needs to be called whenever the speed of an object changes.	684	* This function needs to be called whenever the speed of an object changes.
702	*/	685	*/
703
704	void	686	void
705	update_ob_speed (object *op)	687	update_ob_speed (object *op)
706	{	688	{
707	extern int arch_init;	689	extern int arch_init;
708		690
…		…
717	abort ();	699	abort ();
718	#else	700	#else
719	op->speed = 0;	701	op->speed = 0;
720	#endif	702	#endif
721	}	703	}
		704
722	if (arch_init)	705	if (arch_init)
723	{
724	return;	706	return;
725	}	707
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	708	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	709	{
728	/* If already on active list, don't do anything */	710	/* If already on active list, don't do anything */
729	if (op->active_next \|\| op->active_prev \|\| op == active_objects)	711	if (op->active_next \|\| op->active_prev \|\| op == active_objects)
730	return;	712	return;
731		713
732	/* process_events() expects us to insert the object at the beginning	714	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	715	* of the list. */
734	op->active_next = active_objects;	716	op->active_next = active_objects;
		717
735	if (op->active_next != NULL)	718	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	719	op->active_next->active_prev = op;
		720
737	active_objects = op;	721	active_objects = op;
738	}	722	}
739	else	723	else
740	{	724	{
741	/* If not on the active list, nothing needs to be done */	725	/* If not on the active list, nothing needs to be done */
…		…
743	return;	727	return;
744		728
745	if (op->active_prev == NULL)	729	if (op->active_prev == NULL)
746	{	730	{
747	active_objects = op->active_next;	731	active_objects = op->active_next;
		732
748	if (op->active_next != NULL)	733	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	734	op->active_next->active_prev = NULL;
750	}	735	}
751	else	736	else
752	{	737	{
753	op->active_prev->active_next = op->active_next;	738	op->active_prev->active_next = op->active_next;
		739
754	if (op->active_next)	740	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	741	op->active_next->active_prev = op->active_prev;
756	}	742	}
		743
757	op->active_next = NULL;	744	op->active_next = NULL;
758	op->active_prev = NULL;	745	op->active_prev = NULL;
759	}	746	}
760	}	747	}
761		748
…		…
893	* that is being removed.	880	* that is being removed.
894	*/	881	*/
895	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	882	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
896	update_now = 1;	883	update_now = 1;
897	else if (action == UP_OBJ_FACE)	884	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	885	/* Nothing to do for that case */ ;
899	else	886	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	887	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		888
902	if (update_now)	889	if (update_now)
903	{	890	{
…		…
907		894
908	if (op->more != NULL)	895	if (op->more != NULL)
909	update_object (op->more, action);	896	update_object (op->more, action);
910	}	897	}
911		898
912	static unordered_vector<object *> mortals;	899	object::vector object::mortals;
913	static std::vector<object *> freed;	900	object::vector object::objects; // not yet used
		901	object *object::first;
914		902
915	void object::free_mortals ()	903	void object::free_mortals ()
916	{	904	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
918	if (!(*i)->refcount)	906	if ((*i)->refcnt)
		907	++i; // further delay freeing
		908	else
919	{	909	{
920	freed.push_back (*i);	910	delete *i;
921	mortals.erase (i);	911	mortals.erase (i);
922	}	912	}
923	else	913
924	++i;	914	static int lastmortals = 0;//D
		915
		916	if (mortals.size() != lastmortals)//D
		917	{
		918	lastmortals = mortals.size ();//D
		919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		920	}
925	}	921	}
926		922
927	object::object ()	923	object::object ()
928	{	924	{
929	SET_FLAG (this, FLAG_REMOVED);	925	SET_FLAG (this, FLAG_REMOVED);
930		926
931	expmul = 1.0;	927	expmul = 1.0;
932	face = blank_face;	928	face = blank_face;
933	attacked_by_count = -1;
934	}	929	}
935		930
936	object::~object ()	931	object::~object ()
937	{	932	{
938	free_key_values (this);	933	free_key_values (this);
939	}	934	}
940		935
941	void object::link ()	936	void object::link ()
942	{	937	{
943	count = ++ob_count;	938	count = ++ob_count;
		939	uuid = gen_uuid ();
944		940
945	prev = 0;	941	prev = 0;
946	next = objects;	942	next = object::first;
947		943
948	if (objects)	944	if (object::first)
949	objects->prev = this;	945	object::first->prev = this;
950		946
951	objects = this;	947	object::first = this;
952	}	948	}
953		949
954	void object::unlink ()	950	void object::unlink ()
955	{	951	{
956	count = 0;	952	//count = 0;//D
		953	if (!prev && !next) return;//D
		954
		955	if (this == object::first)
		956	object::first = next;
957		957
958	/* Remove this object from the list of used objects */	958	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;	959	if (prev) prev->next = next;
		960	if (next) next->prev = prev;
		961
962	prev = 0;	962	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;	963	next = 0;
969	}
970
971	if (this == objects)
972	objects = next;
973	}	964	}
974		965
975	object *object::create ()	966	object *object::create ()
976	{	967	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	968	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 ();	969	op->link ();
990	return op;	970	return op;
991	}	971	}
992		972
993	/*	973	/*
…		…
1000	* If free_inventory is set, free inventory as well. Else drop items in	980	* If free_inventory is set, free inventory as well. Else drop items in
1001	* inventory to the ground.	981	* inventory to the ground.
1002	*/	982	*/
1003	void object::free (bool free_inventory)	983	void object::free (bool free_inventory)
1004	{	984	{
		985	if (QUERY_FLAG (this, FLAG_FREED))
		986	return;
		987
		988	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		989	remove_friendly_object (this);
		990
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	991	if (!QUERY_FLAG (this, FLAG_REMOVED))
1006	{	992	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		993
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))	994	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		995
1027	if (more)	996	if (more)
1028	{	997	{
1029	more->free (free_inventory);	998	more->free (free_inventory);
1030	more = 0;	999	more = 0;
…		…
1034	{	1003	{
1035	/* Only if the space blocks everything do we not process -	1004	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects	1005	* if some form of movement is allowed, let objects
1037	* drop on that space.	1006	* drop on that space.
1038	*/	1007	*/
1039	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1008	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1040	{	1009	{
1041	object *	1010	object *op = inv;
1042	op = inv;
1043		1011
1044	while (op)	1012	while (op)
1045	{	1013	{
1046	object *
1047	tmp = op->below;	1014	object *tmp = op->below;
1048
1049	remove_ob (op);
1050	op->free (free_inventory);	1015	op->free (free_inventory);
1051	op = tmp;	1016	op = tmp;
1052	}	1017	}
1053	}	1018	}
1054	else	1019	else
1055	{ /* Put objects in inventory onto this space */	1020	{ /* Put objects in inventory onto this space */
1056	object *	1021	object *op = inv;
1057	op = inv;
1058		1022
1059	while (op)	1023	while (op)
1060	{	1024	{
1061	object *
1062	tmp = op->below;	1025	object *tmp = op->below;
1063		1026
1064	remove_ob (op);	1027	remove_ob (op);
1065		1028
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1029	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))	1030	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1076	op = tmp;	1039	op = tmp;
1077	}	1040	}
1078	}	1041	}
1079	}	1042	}
1080		1043
1081	clear_owner (this);	1044	// clear those pointers that likely might have circular references to us
		1045	owner = 0;
		1046	enemy = 0;
		1047	attacked_by = 0;
1082		1048
1083	/* Remove object from the active list */	1049	/* Remove object from the active list */
1084	speed = 0;	1050	speed = 0;
1085	update_ob_speed (this);	1051	update_ob_speed (this);
1086		1052
1087	unlink ();	1053	unlink ();
1088		1054
1089	SET_FLAG (this, FLAG_FREED);
1090
1091	mortals.push_back (this);	1055	mortals.push_back (this);
1092	}	1056	}
1093		1057
1094	/*	1058	/*
1095	* sub_weight() recursively (outwards) subtracts a number from the	1059	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1100	sub_weight (object *op, signed long weight)	1064	sub_weight (object *op, signed long weight)
1101	{	1065	{
1102	while (op != NULL)	1066	while (op != NULL)
1103	{	1067	{
1104	if (op->type == CONTAINER)	1068	if (op->type == CONTAINER)
1105	{
1106	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1069	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1107	}	1070
1108	op->carrying -= weight;	1071	op->carrying -= weight;
1109	op = op->env;	1072	op = op->env;
1110	}	1073	}
1111	}	1074	}
1112		1075
…		…
1120	*/	1083	*/
1121		1084
1122	void	1085	void
1123	remove_ob (object *op)	1086	remove_ob (object *op)
1124	{	1087	{
1125	object tmp, last = NULL;	1088	object tmp, last = 0;
1126	object *otmp;	1089	object *otmp;
1127		1090
1128	tag_t tag;	1091	tag_t tag;
1129	int check_walk_off;	1092	int check_walk_off;
1130	mapstruct *m;	1093	mapstruct *m;
1131		1094
1132	sint16 x, y;	1095	sint16 x, y;
1133		1096
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	1097	if (QUERY_FLAG (op, FLAG_REMOVED))
1135	{	1098	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		1099
1139	/* Changed it to always dump core in this case. As has been learned	1100	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		1101
1152	if (op->more != NULL)	1102	if (op->more != NULL)
1153	remove_ob (op->more);	1103	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);
1156		1104
1157	/*	1105	/*
1158	* In this case, the object to be removed is in someones	1106	* In this case, the object to be removed is in someones
1159	* inventory.	1107	* inventory.
1160	*/	1108	*/
…		…
1186	*/	1134	*/
1187	op->x = op->env->x, op->y = op->env->y;	1135	op->x = op->env->x, op->y = op->env->y;
1188	op->map = op->env->map;	1136	op->map = op->env->map;
1189	op->above = NULL, op->below = NULL;	1137	op->above = NULL, op->below = NULL;
1190	op->env = NULL;	1138	op->env = NULL;
1191	return;	1139	}
		1140	else if (op->map)
1192	}	1141	{
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;	1142	x = op->x;
1199	y = op->y;	1143	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);	1144	m = get_map_from_coord (op->map, &x, &y);
1201		1145
1202	if (!m)	1146	if (!m)
1203	{	1147	{
1204	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1148	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);	1149	op->map->path, op->x, op->y);
1206	/* in old days, we used to set x and y to 0 and continue.	1150	/* 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	1151	* it seems if we get into this case, something is probablye
1208	* screwed up and should be fixed.	1152	* screwed up and should be fixed.
		1153	*/
		1154	abort ();
		1155	}
		1156
		1157	if (op->map != m)
		1158	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1159	op->map->path, m->path, op->x, op->y, x, y);
		1160
		1161	/* Re did the following section of code - it looks like it had
		1162	* lots of logic for things we no longer care about
1209	*/	1163	*/
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		1164
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 */	1165	/* link the object above us */
1223	if (op->above)	1166	if (op->above)
1224	op->above->below = op->below;	1167	op->above->below = op->below;
1225	else	1168	else
1226	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1169	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1227		1170
1228	/* Relink the object below us, if there is one */	1171	/* Relink the object below us, if there is one */
1229	if (op->below)	1172	if (op->below)
1230	op->below->above = op->above;	1173	op->below->above = op->above;
1231	else	1174	else
1232	{	1175	{
1233	/* Nothing below, which means we need to relink map object for this space	1176	/* 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	1177	* use translated coordinates in case some oddness with map tiling is
1235	* evident	1178	* 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	*/	1179	*/
1270	if (tmp->container == op)	1180	if (GET_MAP_OB (m, x, y) != op)
1271	{	1181	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1182	dump_object (op);
1273	tmp->container = NULL;	1183	LOG (llevError,
		1184	"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);
		1185	dump_object (GET_MAP_OB (m, x, y));
		1186	LOG (llevError, "%s\n", errmsg);
1274	}	1187	}
1275		1188
1276	tmp->contr->socket.update_look = 1;	1189	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	{	1190	}
1281	move_apply (tmp, op, NULL);
1282		1191
1283	if (was_destroyed (op, tag))	1192	op->above = 0;
		1193	op->below = 0;
		1194
		1195	if (op->map->in_memory == MAP_SAVING)
		1196	return;
		1197
		1198	tag = op->count;
		1199	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1200
		1201	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1202	{
		1203	/* No point updating the players look faces if he is the object
		1204	* being removed.
		1205	*/
		1206
		1207	if (tmp->type == PLAYER && tmp != op)
1284	{	1208	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1209	/* If a container that the player is currently using somehow gets
		1210	* removed (most likely destroyed), update the player view
		1211	* appropriately.
		1212	*/
		1213	if (tmp->container == op)
		1214	{
		1215	CLEAR_FLAG (op, FLAG_APPLIED);
		1216	tmp->container = NULL;
		1217	}
		1218
		1219	tmp->contr->socket.update_look = 1;
1286	}	1220	}
		1221
		1222	/* See if player moving off should effect something */
		1223	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1224	{
		1225	move_apply (tmp, op, NULL);
		1226
		1227	if (was_destroyed (op, tag))
		1228	{
		1229	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1230	}
1287	}	1231	}
1288		1232
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1233	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290		1234
1291	if (tmp->above == tmp)	1235	if (tmp->above == tmp)
1292	tmp->above = NULL;	1236	tmp->above = NULL;
1293		1237
1294	last = tmp;	1238	last = tmp;
1295	}	1239	}
1296		1240
1297	/* last == NULL of there are no objects on this space */	1241	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1242	if (last == NULL)
1299	{	1243	{
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1244	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1245	* 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	1246	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.	1247	* be correct anyways.
1304	*/	1248	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1249	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);	1250	update_position (op->map, op->x, op->y);
1307	}	1251	}
1308	else	1252	else
1309	update_object (last, UP_OBJ_REMOVE);	1253	update_object (last, UP_OBJ_REMOVE);
1310		1254
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))	1255	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))
1312	update_all_los (op->map, op->x, op->y);	1256	update_all_los (op->map, op->x, op->y);
		1257	}
1313	}	1258	}
1314		1259
1315	/*	1260	/*
1316	* merge_ob(op,top):	1261	* merge_ob(op,top):
1317	*	1262	*
1318	* This function goes through all objects below and including top, and	1263	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1264	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1265	* If top is NULL, it is calculated.
1321	* Returns pointer to object if it succeded in the merge, otherwise NULL	1266	* Returns pointer to object if it succeded in the merge, otherwise NULL
1322	*/	1267	*/
1323
1324	object *	1268	object *
1325	merge_ob (object op, object top)	1269	merge_ob (object op, object top)
1326	{	1270	{
1327	if (!op->nrof)	1271	if (!op->nrof)
1328	return 0;	1272	return 0;
		1273
1329	if (top == NULL)	1274	if (top == NULL)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1275	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1276
1331	for (; top != NULL; top = top->below)	1277	for (; top != NULL; top = top->below)
1332	{	1278	{
1333	if (top == op)	1279	if (top == op)
1334	continue;	1280	continue;
1335	if (CAN_MERGE (op, top))	1281	if (CAN_MERGE (op, top))
…		…
1341	remove_ob (op);	1287	remove_ob (op);
1342	free_object (op);	1288	free_object (op);
1343	return top;	1289	return top;
1344	}	1290	}
1345	}	1291	}
		1292
1346	return NULL;	1293	return 0;
1347	}	1294	}
1348		1295
1349	/*	1296	/*
1350	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1297	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1351	* job preparing multi-part monsters	1298	* job preparing multi-part monsters
1352	*/	1299	*/
1353	object *	1300	object *
1354	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1301	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)
1355	{	1302	{
1356	object *	1303	object *tmp;
1357	tmp;
1358		1304
1359	if (op->head)	1305	if (op->head)
1360	op = op->head;	1306	op = op->head;
		1307
1361	for (tmp = op; tmp; tmp = tmp->more)	1308	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1309	{
1363	tmp->x = x + tmp->arch->clone.x;	1310	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1311	tmp->y = y + tmp->arch->clone.y;
1365	}	1312	}
		1313
1366	return insert_ob_in_map (op, m, originator, flag);	1314	return insert_ob_in_map (op, m, originator, flag);
1367	}	1315	}
1368		1316
1369	/*	1317	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1318	* insert_ob_in_map (op, map, originator, flag):
…		…
1661	* op is the object to insert it under: supplies x and the map.	1609	* op is the object to insert it under: supplies x and the map.
1662	*/	1610	*/
1663	void	1611	void
1664	replace_insert_ob_in_map (const char arch_string, object op)	1612	replace_insert_ob_in_map (const char arch_string, object op)
1665	{	1613	{
1666	object *tmp;	1614	object *
		1615	tmp;
1667	object *tmp1;	1616	object *
		1617	tmp1;
1668		1618
1669	/* first search for itself and remove any old instances */	1619	/* first search for itself and remove any old instances */
1670		1620
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1621	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{	1622	{
…		…
1675	remove_ob (tmp);	1625	remove_ob (tmp);
1676	free_object (tmp);	1626	free_object (tmp);
1677	}	1627	}
1678	}	1628	}
1679		1629
1680	tmp1 = arch_to_object (find_archetype (arch_string));	1630	tmp1 = arch_to_object (archetype::find (arch_string));
1681		1631
1682	tmp1->x = op->x;	1632	tmp1->x = op->x;
1683	tmp1->y = op->y;	1633	tmp1->y = op->y;
1684	insert_ob_in_map (tmp1, op->map, op, 0);	1634	insert_ob_in_map (tmp1, op->map, op, 0);
1685	}	1635	}
…		…
1703	if (orig_ob->nrof < nr)	1653	if (orig_ob->nrof < nr)
1704	{	1654	{
1705	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1655	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1706	return NULL;	1656	return NULL;
1707	}	1657	}
		1658
1708	newob = object_create_clone (orig_ob);	1659	newob = object_create_clone (orig_ob);
		1660
1709	if ((orig_ob->nrof -= nr) < 1)	1661	if ((orig_ob->nrof -= nr) < 1)
1710	{	1662	{
1711	if (!is_removed)	1663	if (!is_removed)
1712	remove_ob (orig_ob);	1664	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);	1665	free_object2 (orig_ob, 1);
…		…
1721	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1673	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");	1674	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1723	return NULL;	1675	return NULL;
1724	}	1676	}
1725	}	1677	}
		1678
1726	newob->nrof = nr;	1679	newob->nrof = nr;
1727		1680
1728	return newob;	1681	return newob;
1729	}	1682	}
1730		1683
…		…
1737	*/	1690	*/
1738		1691
1739	object *	1692	object *
1740	decrease_ob_nr (object *op, uint32 i)	1693	decrease_ob_nr (object *op, uint32 i)
1741	{	1694	{
1742	object *	1695	object *tmp;
1743	tmp;
1744	player *	1696	player *pl;
1745	pl;
1746		1697
1747	if (i == 0) /* objects with op->nrof require this check */	1698	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1699	return op;
1749		1700
1750	if (i > op->nrof)	1701	if (i > op->nrof)
1751	i = op->nrof;	1702	i = op->nrof;
1752		1703
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1704	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1705	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1706	else if (op->env != NULL)
1758	{	1707	{
1759	/* is this object in the players inventory, or sub container	1708	/* is this object in the players inventory, or sub container
1760	* therein?	1709	* therein?
1761	*/	1710	*/
…		…
1796	}	1745	}
1797	}	1746	}
1798	}	1747	}
1799	else	1748	else
1800	{	1749	{
1801	object *
1802	above = op->above;	1750	object *above = op->above;
1803		1751
1804	if (i < op->nrof)	1752	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1753	op->nrof -= i;
1807	}
1808	else	1754	else
1809	{	1755	{
1810	remove_ob (op);	1756	remove_ob (op);
1811	op->nrof = 0;	1757	op->nrof = 0;
1812	}	1758	}
		1759
1813	/* Since we just removed op, op->above is null */	1760	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1761	for (tmp = above; tmp != NULL; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1762	if (tmp->type == PLAYER)
1816	{	1763	{
1817	if (op->nrof)	1764	if (op->nrof)
…		…
1820	esrv_del_item (tmp->contr, op->count);	1767	esrv_del_item (tmp->contr, op->count);
1821	}	1768	}
1822	}	1769	}
1823		1770
1824	if (op->nrof)	1771	if (op->nrof)
1825	{
1826	return op;	1772	return op;
1827	}
1828	else	1773	else
1829	{	1774	{
1830	free_object (op);	1775	free_object (op);
1831	return NULL;	1776	return NULL;
1832	}	1777	}
…		…
1841	add_weight (object *op, signed long weight)	1786	add_weight (object *op, signed long weight)
1842	{	1787	{
1843	while (op != NULL)	1788	while (op != NULL)
1844	{	1789	{
1845	if (op->type == CONTAINER)	1790	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1791	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1792
1849	op->carrying += weight;	1793	op->carrying += weight;
1850	op = op->env;	1794	op = op->env;
1851	}	1795	}
1852	}	1796	}
1853		1797
…		…
1876	{	1820	{
1877	dump_object (op);	1821	dump_object (op);
1878	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1822	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1879	return op;	1823	return op;
1880	}	1824	}
		1825
1881	if (where == NULL)	1826	if (where == NULL)
1882	{	1827	{
1883	dump_object (op);	1828	dump_object (op);
1884	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1829	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1885	return op;	1830	return op;
1886	}	1831	}
		1832
1887	if (where->head)	1833	if (where->head)
1888	{	1834	{
1889	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1835	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1890	where = where->head;	1836	where = where->head;
1891	}	1837	}
		1838
1892	if (op->more)	1839	if (op->more)
1893	{	1840	{
1894	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1841	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1895	return op;	1842	return op;
1896	}	1843	}
		1844
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1845	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1846	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1847	if (op->nrof)
1900	{	1848	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1849	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
1986	*/	1934	*/
1987		1935
1988	int	1936	int
1989	check_move_on (object op, object originator)	1937	check_move_on (object op, object originator)
1990	{	1938	{
1991	object *tmp;	1939	object *
1992	tag_t tag;	1940	tmp;
1993	mapstruct *m = op->map;	1941	tag_t
		1942	tag;
		1943	mapstruct *
		1944	m = op->map;
		1945	int
1994	int x = op->x, y = op->y;	1946	x = op->x, y = op->y;
1995		1947
1996	MoveType move_on, move_slow, move_block;	1948	MoveType
		1949	move_on,
		1950	move_slow,
		1951	move_block;
1997		1952
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1953	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1954	return 0;
2000		1955
2001	tag = op->count;	1956	tag = op->count;
…		…
2049	{	2004	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	2005	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))	2006	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	2007	{
2053		2008
		2009	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	2010	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		2011
2056	if (op->type == PLAYER)	2012	if (op->type == PLAYER)
2057	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	2013	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)))	2014	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2059	diff /= 4.0;	2015	diff /= 4.0;
…		…
2378	find_dir (mapstruct m, int x, int y, object exclude)	2334	find_dir (mapstruct m, int x, int y, object exclude)
2379	{	2335	{
2380	int	2336	int
2381	i,	2337	i,
2382	max = SIZEOFFREE, mflags;	2338	max = SIZEOFFREE, mflags;
2383	sint16	2339
2384	nx,	2340	sint16 nx, ny;
2385	ny;
2386	object *	2341	object *
2387	tmp;	2342	tmp;
2388	mapstruct *	2343	mapstruct *
2389	mp;	2344	mp;
2390	MoveType	2345
2391	blocked,	2346	MoveType blocked, move_type;
2392	move_type;
2393		2347
2394	if (exclude && exclude->head)	2348	if (exclude && exclude->head)
2395	{	2349	{
2396	exclude = exclude->head;	2350	exclude = exclude->head;
2397	move_type = exclude->move_type;	2351	move_type = exclude->move_type;
…		…
2604		2558
2605		2559
2606	int	2560	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2561	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2608	{	2562	{
2609	sint16	2563	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int	2564	int
2613	mflags;	2565	mflags;
2614		2566
2615	if (dir < 0)	2567	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2568	return 0; /* exit condition: invalid direction */
…		…
2741		2693
2742	if (tempfile == NULL)	2694	if (tempfile == NULL)
2743	{	2695	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2696	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2697	return NULL;
2746	};	2698	}
		2699
2747	fprintf (tempfile, obstr);	2700	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2701	fclose (tempfile);
2749		2702
2750	op = get_object ();	2703	op = get_object ();
2751		2704
2752	object_thawer	2705	object_thawer thawer (filename);
2753	thawer (filename);
2754		2706
2755	if (thawer)	2707	if (thawer)
2756	load_object (thawer, op, 0);	2708	load_object (thawer, op, 0);
2757		2709
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2710	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2809	* The returned string is shared.	2761	* The returned string is shared.
2810	*/	2762	*/
2811	const char *	2763	const char *
2812	get_ob_key_value (const object op, const char const key)	2764	get_ob_key_value (const object op, const char const key)
2813	{	2765	{
2814	key_value *	2766	key_value *link;
2815	link;	2767	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2768
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2769	if (!canonical_key)
2822	{	2770	{
2823	/* 1. There being a field named key on any object	2771	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2772	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2773	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, this object doesn't have this field.	2774	* 3. Therefore, this object doesn't have this field.
2827	*/	2775	*/
2828	return NULL;	2776	return 0;
2829	}	2777	}
2830		2778
2831	/* This is copied from get_ob_key_link() above -	2779	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2780	* only 4 lines, and saves the function call overhead.
2833	*/	2781	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2782	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2783	if (link->key == canonical_key)
2837	{
2838	return link->value;	2784	return link->value;
2839	}	2785
2840	}
2841	return NULL;	2786	return 0;
2842	}	2787	}
2843		2788
2844		2789
2845	/*	2790	/*
2846	* Updates the canonical_key in op to value.	2791	* Updates the canonical_key in op to value.
…		…
2882	if (last)	2827	if (last)
2883	last->next = field->next;	2828	last->next = field->next;
2884	else	2829	else
2885	op->key_values = field->next;	2830	op->key_values = field->next;
2886		2831
2887	delete
2888	field;	2832	delete field;
2889	}	2833	}
2890	}	2834	}
2891	return TRUE;	2835	return TRUE;
2892	}	2836	}
2893	/* IF we get here, key doesn't exist */	2837	/* IF we get here, key doesn't exist */
…		…
2928	* Returns TRUE on success.	2872	* Returns TRUE on success.
2929	*/	2873	*/
2930	int	2874	int
2931	set_ob_key_value (object op, const char key, const char *value, int add_key)	2875	set_ob_key_value (object op, const char key, const char *value, int add_key)
2932	{	2876	{
2933	shstr
2934	key_ (key);	2877	shstr key_ (key);
2935		2878
2936	return set_ob_key_value_s (op, key_, value, add_key);	2879	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2880	}
		2881
		2882	object::depth_iterator::depth_iterator (object *container)
		2883	: iterator_base (container)
		2884	{
		2885	while (item->inv)
		2886	item = item->inv;
		2887	}
		2888
		2889	void
		2890	object::depth_iterator::next ()
		2891	{
		2892	if (item->below)
		2893	{
		2894	item = item->below;
		2895
		2896	while (item->inv)
		2897	item = item->inv;
		2898	}
		2899	else
		2900	item = item->env;
		2901	}
		2902
		2903	// return a suitable string describing an objetc in enough detail to find it
		2904	const char *
		2905	object::debug_desc (char *info) const
		2906	{
		2907	char info2[256 * 3];
		2908	char *p = info;
		2909
		2910	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2911	count,
		2912	&name,
		2913	title ? " " : "",
		2914	title ? (const char *)title : "");
		2915
		2916	if (env)
		2917	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2918
		2919	if (map)
		2920	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2921
		2922	return info;
		2923	}
		2924
		2925	const char *
		2926	object::debug_desc () const
		2927	{
		2928	static char info[256 * 3];
		2929	return debug_desc (info);
		2930	}
		2931

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.46 by root, Thu Sep 14 21:16:11 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.46 by root, Thu Sep 14 21:16:11 2006 UTC