ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.63 by root, Tue Dec 12 20:53:02 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	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
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	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>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <skills.h>
35	#include <loader.h>	33	#include <loader.h>
36		34
37	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
38		38
39	object *objects; /* Pointer to the list of used objects */
40	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 */
41		40
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,	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,
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	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
44	};	43	};
…		…
50	};	49	};
51	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
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,	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,
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	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
54	};	53	};
		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
55		131
56	/* 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. */
57	static int	133	static int
58	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
59	{	135	{
…		…
255	{	331	{
256	if (inv->inv)	332	if (inv->inv)
257	sum_weight (inv);	333	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	335	}
		336
260	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
262	if (op->carrying != sum)	340	if (op->carrying != sum)
263	op->carrying = sum;	341	op->carrying = sum;
		342
264	return sum;	343	return sum;
265	}	344	}
266		345
267	/**	346	/**
268	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	375	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	376	* The result of the dump is stored in the static global errmsg array.
298	*/	377	*/
299		378
300	void	379	char *
301	dump_object2 (object *op)
302	{
303	errmsg[0] = 0;
304	return;
305	//TODO//D#d#
306	#if 0
307	char *cp;
308
309	/* object *tmp;*/
310
311	if (op->arch != NULL)
312	{
313	strcat (errmsg, "arch ");
314	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315	strcat (errmsg, "\n");
316	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317	strcat (errmsg, cp);
318	# if 0
319	/* Don't dump player diffs - they are too long, mostly meaningless, and
320	* will overflow the buffer.
321	* Changed so that we don't dump inventory either. This may
322	* also overflow the buffer.
323	*/
324	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325	strcat (errmsg, cp);
326	for (tmp = op->inv; tmp; tmp = tmp->below)
327	dump_object2 (tmp);
328	# endif
329	strcat (errmsg, "end\n");
330	}
331	else
332	{
333	strcat (errmsg, "Object ");
334	if (op->name == NULL)
335	strcat (errmsg, "(null)");
336	else
337	strcat (errmsg, op->name);
338	strcat (errmsg, "\n");
339	# if 0
340	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341	strcat (errmsg, cp);
342	for (tmp = op->inv; tmp; tmp = tmp->below)
343	dump_object2 (tmp);
344	# endif
345	strcat (errmsg, "end\n");
346	}
347	#endif
348	}
349
350	/*
351	* Dumps an object. Returns output in the static global errmsg array.
352	*/
353
354	void
355	dump_object (object *op)	380	dump_object (object *op)
356	{	381	{
357	if (op == NULL)	382	if (!op)
358	{	383	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		384
366	void	385	object_freezer freezer;
367	dump_all_objects (void)	386	save_object (freezer, op, 3);
368	{	387	return freezer.as_string ();
369	object *op;
370
371	for (op = objects; op != NULL; op = op->next)
372	{
373	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375	}
376	}	388	}
377		389
378	/*	390	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	391	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
400	*/	412	*/
401		413
402	object *	414	object *
403	find_object (tag_t i)	415	find_object (tag_t i)
404	{	416	{
405	object *op;	417	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	418	if (op->count == i)
409	break;	419	return op;
		420
410	return op;	421	return 0;
411	}	422	}
412		423
413	/*	424	/*
414	* Returns the first object which has a name equal to the argument.	425	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
417	*/	428	*/
418		429
419	object *	430	object *
420	find_object_name (const char *str)	431	find_object_name (const char *str)
421	{	432	{
422	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
423	object *op;	434	object *op;
424		435
425	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	437	if (op->name == str_)
427	break;	438	break;
428		439
429	return op;	440	return op;
430	}	441	}
431		442
432	void	443	void
433	free_all_object_data ()	444	free_all_object_data ()
434	{	445	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}
437
438	/*
439	* Returns the object which this object marks as being the owner.
440	* A id-scheme is used to avoid pointing to objects which have been
441	* freed and are now reused. If this is detected, the owner is
442	* set to NULL, and NULL is returned.
443	* Changed 2004-02-12 - if the player is setting at the play again
444	* prompt, he is removed, and we don't want to treat him as an owner of
445	* anything, so check removed flag. I don't expect that this should break
446	* anything - once an object is removed, it is basically dead anyways.
447	*/
448	object *
449	object::get_owner ()
450	{
451	if (!owner
452	|| QUERY_FLAG (owner, FLAG_FREED)
453	|| QUERY_FLAG (owner, FLAG_REMOVED))
454	owner = 0;
455
456	return owner;
457	}	447	}
458		448
459	/*	449	/*
460	* Sets the owner and sets the skill and exp pointers to owner's current	450	* Sets the owner and sets the skill and exp pointers to owner's current
461	* skill and experience objects.	451	* skill and experience objects.
…		…
531		521
532	/* What is not cleared is next, prev, and count */	522	/* What is not cleared is next, prev, and count */
533		523
534	expmul = 1.0;	524	expmul = 1.0;
535	face = blank_face;	525	face = blank_face;
536	attacked_by_count = -1;
537		526
538	if (settings.casting_time)	527	if (settings.casting_time)
539	casting_time = -1;	528	casting_time = -1;
540	}	529	}
541		530
…		…
564		553
565	op2->clone (op);	554	op2->clone (op);
566		555
567	if (is_freed)	556	if (is_freed)
568	SET_FLAG (op, FLAG_FREED);	557	SET_FLAG (op, FLAG_FREED);
		558
569	if (is_removed)	559	if (is_removed)
570	SET_FLAG (op, FLAG_REMOVED);	560	SET_FLAG (op, FLAG_REMOVED);
571		561
572	if (op2->speed < 0)	562	if (op2->speed < 0)
573	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	563	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
…		…
623	/*	613	/*
624	* Updates the speed of an object. If the speed changes from 0 to another	614	* Updates the speed of an object. If the speed changes from 0 to another
625	* value, or vice versa, then add/remove the object from the active list.	615	* value, or vice versa, then add/remove the object from the active list.
626	* This function needs to be called whenever the speed of an object changes.	616	* This function needs to be called whenever the speed of an object changes.
627	*/	617	*/
628
629	void	618	void
630	update_ob_speed (object *op)	619	update_ob_speed (object *op)
631	{	620	{
632	extern int arch_init;	621	extern int arch_init;
633		622
…		…
642	abort ();	631	abort ();
643	#else	632	#else
644	op->speed = 0;	633	op->speed = 0;
645	#endif	634	#endif
646	}	635	}
		636
647	if (arch_init)	637	if (arch_init)
648	{
649	return;	638	return;
650	}	639
651	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	640	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
652	{	641	{
653	/* If already on active list, don't do anything */	642	/* If already on active list, don't do anything */
654	if (op->active_next || op->active_prev || op == active_objects)	643	if (op->active_next || op->active_prev || op == active_objects)
655	return;	644	return;
656		645
657	/* process_events() expects us to insert the object at the beginning	646	/* process_events() expects us to insert the object at the beginning
658	* of the list. */	647	* of the list. */
659	op->active_next = active_objects;	648	op->active_next = active_objects;
		649
660	if (op->active_next != NULL)	650	if (op->active_next != NULL)
661	op->active_next->active_prev = op;	651	op->active_next->active_prev = op;
		652
662	active_objects = op;	653	active_objects = op;
663	}	654	}
664	else	655	else
665	{	656	{
666	/* If not on the active list, nothing needs to be done */	657	/* If not on the active list, nothing needs to be done */
…		…
668	return;	659	return;
669		660
670	if (op->active_prev == NULL)	661	if (op->active_prev == NULL)
671	{	662	{
672	active_objects = op->active_next;	663	active_objects = op->active_next;
		664
673	if (op->active_next != NULL)	665	if (op->active_next != NULL)
674	op->active_next->active_prev = NULL;	666	op->active_next->active_prev = NULL;
675	}	667	}
676	else	668	else
677	{	669	{
678	op->active_prev->active_next = op->active_next;	670	op->active_prev->active_next = op->active_next;
		671
679	if (op->active_next)	672	if (op->active_next)
680	op->active_next->active_prev = op->active_prev;	673	op->active_next->active_prev = op->active_prev;
681	}	674	}
		675
682	op->active_next = NULL;	676	op->active_next = NULL;
683	op->active_prev = NULL;	677	op->active_prev = NULL;
684	}	678	}
685	}	679	}
686		680
…		…
811	update_now = 1;	805	update_now = 1;
812		806
813	if ((move_slow | op->move_slow) != move_slow)	807	if ((move_slow | op->move_slow) != move_slow)
814	update_now = 1;	808	update_now = 1;
815	}	809	}
		810
816	/* if the object is being removed, we can't make intelligent	811	/* if the object is being removed, we can't make intelligent
817	* decisions, because remove_ob can't really pass the object	812	* decisions, because remove_ob can't really pass the object
818	* that is being removed.	813	* that is being removed.
819	*/	814	*/
820	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
832		827
833	if (op->more != NULL)	828	if (op->more != NULL)
834	update_object (op->more, action);	829	update_object (op->more, action);
835	}	830	}
836		831
837	static unordered_vector<object *> mortals;	832	object::vector object::mortals;
838	static std::vector<object *> freed;	833	object::vector object::objects; // not yet used
		834	object *object::first;
839		835
840	void object::free_mortals ()	836	void object::free_mortals ()
841	{	837	{
842	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
843	if ((*i)->refcnt)	839	if ((*i)->refcnt)
844	++i; // further delay freeing	840	++i; // further delay freeing
845	else	841	else
846	{	842	{
847	freed.push_back (*i);//D
848	//delete *i;	843	delete *i;
849	mortals.erase (i);	844	mortals.erase (i);
850	}	845	}
851
852	if (mortals.size())//D
853	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
854	}	846	}
855		847
856	object::object ()	848	object::object ()
857	{	849	{
858	SET_FLAG (this, FLAG_REMOVED);	850	SET_FLAG (this, FLAG_REMOVED);
859		851
860	expmul = 1.0;	852	expmul = 1.0;
861	face = blank_face;	853	face = blank_face;
862	attacked_by_count = -1;
863	}	854	}
864		855
865	object::~object ()	856	object::~object ()
866	{	857	{
867	free_key_values (this);	858	free_key_values (this);
868	}	859	}
869		860
870	void object::link ()	861	void object::link ()
871	{	862	{
872	count = ++ob_count;	863	count = ++ob_count;
		864	uuid = gen_uuid ();
873		865
874	prev = 0;	866	prev = 0;
875	next = objects;	867	next = object::first;
876		868
877	if (objects)	869	if (object::first)
878	objects->prev = this;	870	object::first->prev = this;
879		871
880	objects = this;	872	object::first = this;
881	}	873	}
882		874
883	void object::unlink ()	875	void object::unlink ()
884	{	876	{
885	count = 0;	877	if (this == object::first)
		878	object::first = next;
886		879
887	/* Remove this object from the list of used objects */	880	/* Remove this object from the list of used objects */
888	if (prev)
889	{
890	prev->next = next;	881	if (prev) prev->next = next;
		882	if (next) next->prev = prev;
		883
891	prev = 0;	884	prev = 0;
892	}
893
894	if (next)
895	{
896	next->prev = prev;
897	next = 0;	885	next = 0;
898	}
899
900	if (this == objects)
901	objects = next;
902	}	886	}
903		887
904	object *object::create ()	888	object *object::create ()
905	{	889	{
906	object *
907	op;
908
909	if (freed.empty ())
910	op = new object;	890	object *op = new object;
911	else
912	{
913	// highly annoying, but the only way to get it stable right now
914	op = freed.back ();
915	freed.pop_back ();
916	op->~object ();
917	new ((void *) op) object;
918	}
919
920	op->link ();	891	op->link ();
921	return op;	892	return op;
922	}	893	}
923		894
924	/*	895	/*
…		…
926	* it from the list of used objects, and puts it on the list of	897	* it from the list of used objects, and puts it on the list of
927	* free objects. The IS_FREED() flag is set in the object.	898	* free objects. The IS_FREED() flag is set in the object.
928	* The object must have been removed by remove_ob() first for	899	* The object must have been removed by remove_ob() first for
929	* this function to succeed.	900	* this function to succeed.
930	*	901	*
931	* If free_inventory is set, free inventory as well. Else drop items in	902	* If destroy_inventory is set, free inventory as well. Else drop items in
932	* inventory to the ground.	903	* inventory to the ground.
933	*/	904	*/
934	void object::free (bool free_inventory)	905	void object::destroy (bool destroy_inventory)
935	{	906	{
936	if (QUERY_FLAG (this, FLAG_FREED))	907	if (QUERY_FLAG (this, FLAG_FREED))
937	return;	908	return;
938		909
939	if (!QUERY_FLAG (this, FLAG_REMOVED))
940	remove_ob (this);
941
942	if (QUERY_FLAG (this, FLAG_FRIENDLY))	910	if (QUERY_FLAG (this, FLAG_FRIENDLY))
943	remove_friendly_object (this);	911	remove_friendly_object (this);
944		912
		913	if (!QUERY_FLAG (this, FLAG_REMOVED))
		914	remove ();
		915
945	SET_FLAG (this, FLAG_FREED);	916	SET_FLAG (this, FLAG_FREED);
946		917
947	if (more)	918	if (more)
948	{	919	{
949	more->free (free_inventory);	920	more->destroy (destroy_inventory);
950	more = 0;	921	more = 0;
951	}	922	}
952		923
953	if (inv)	924	if (inv)
954	{	925	{
955	/* Only if the space blocks everything do we not process -	926	/* Only if the space blocks everything do we not process -
956	* if some form of movement is allowed, let objects	927	* if some form of movement is allowed, let objects
957	* drop on that space.	928	* drop on that space.
958	*/	929	*/
959	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	930	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
960	{	931	{
961	object *op = inv;	932	object *op = inv;
962		933
963	while (op)	934	while (op)
964	{	935	{
965	object *tmp = op->below;	936	object *tmp = op->below;
966	op->free (free_inventory);	937	op->destroy (destroy_inventory);
967	op = tmp;	938	op = tmp;
968	}	939	}
969	}	940	}
970	else	941	else
971	{ /* Put objects in inventory onto this space */	942	{ /* Put objects in inventory onto this space */
…		…
973		944
974	while (op)	945	while (op)
975	{	946	{
976	object *tmp = op->below;	947	object *tmp = op->below;
977		948
978	remove_ob (op);	949	op->remove ();
979		950
980	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	951	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
981	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	952	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
982	free_object (op);	953	op->destroy (0);
983	else	954	else
984	{	955	{
985	op->x = x;	956	op->x = x;
986	op->y = y;	957	op->y = y;
987	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	958	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
990	op = tmp;	961	op = tmp;
991	}	962	}
992	}	963	}
993	}	964	}
994		965
		966	// hack to ensure that freed objects still have a valid map
		967	{
		968	static maptile *freed_map; // freed objects are moved here to avoid crashes
		969
		970	if (!freed_map)
		971	{
		972	freed_map = new maptile;
		973
		974	freed_map->name = "/internal/freed_objects_map";
		975	freed_map->width = 3;
		976	freed_map->height = 3;
		977
		978	freed_map->allocate ();
		979	}
		980
		981	map = freed_map;
		982	x = 1;
		983	y = 1;
		984	}
		985
		986	// clear those pointers that likely might have circular references to us
995	owner = 0;	987	owner = 0;
		988	enemy = 0;
		989	attacked_by = 0;
		990
		991	// only relevant for players(?), but make sure of it anyways
		992	contr = 0;
996		993
997	/* Remove object from the active list */	994	/* Remove object from the active list */
998	speed = 0;	995	speed = 0;
999	update_ob_speed (this);	996	update_ob_speed (this);
1000		997
…		…
1005		1002
1006	/*	1003	/*
1007	* sub_weight() recursively (outwards) subtracts a number from the	1004	* sub_weight() recursively (outwards) subtracts a number from the
1008	* weight of an object (and what is carried by it's environment(s)).	1005	* weight of an object (and what is carried by it's environment(s)).
1009	*/	1006	*/
1010
1011	void	1007	void
1012	sub_weight (object *op, signed long weight)	1008	sub_weight (object *op, signed long weight)
1013	{	1009	{
1014	while (op != NULL)	1010	while (op != NULL)
1015	{	1011	{
1016	if (op->type == CONTAINER)	1012	if (op->type == CONTAINER)
1017	{
1018	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1013	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1019	}	1014
1020	op->carrying -= weight;	1015	op->carrying -= weight;
1021	op = op->env;	1016	op = op->env;
1022	}	1017	}
1023	}	1018	}
1024		1019
1025	/* remove_ob(op):	1020	/* op->remove ():
1026	* This function removes the object op from the linked list of objects	1021	* This function removes the object op from the linked list of objects
1027	* which it is currently tied to. When this function is done, the	1022	* which it is currently tied to. When this function is done, the
1028	* object will have no environment. If the object previously had an	1023	* object will have no environment. If the object previously had an
1029	* environment, the x and y coordinates will be updated to	1024	* environment, the x and y coordinates will be updated to
1030	* the previous environment.	1025	* the previous environment.
1031	* Beware: This function is called from the editor as well!	1026	* Beware: This function is called from the editor as well!
1032	*/	1027	*/
1033
1034	void	1028	void
1035	remove_ob (object *op)	1029	object::remove ()
1036	{	1030	{
		1031	object *tmp, *last = 0;
1037	object *	1032	object *otmp;
1038	tmp, *
1039	last = NULL;
1040	object *
1041	otmp;
1042		1033
1043	tag_t
1044	tag;
1045	int
1046	check_walk_off;	1034	int check_walk_off;
1047	mapstruct *
1048	m;
1049		1035
1050	sint16
1051	x,
1052	y;
1053
1054	if (QUERY_FLAG (op, FLAG_REMOVED))	1036	if (QUERY_FLAG (this, FLAG_REMOVED))
1055	return;	1037	return;
1056		1038
1057	SET_FLAG (op, FLAG_REMOVED);	1039	SET_FLAG (this, FLAG_REMOVED);
1058		1040
1059	if (op->more != NULL)	1041	if (more)
1060	remove_ob (op->more);	1042	more->remove ();
1061		1043
1062	/*	1044	/*
1063	* In this case, the object to be removed is in someones	1045	* In this case, the object to be removed is in someones
1064	* inventory.	1046	* inventory.
1065	*/	1047	*/
1066	if (op->env != NULL)	1048	if (env)
1067	{	1049	{
1068	if (op->nrof)	1050	if (nrof)
1069	sub_weight (op->env, op->weight * op->nrof);	1051	sub_weight (env, weight * nrof);
1070	else	1052	else
1071	sub_weight (op->env, op->weight + op->carrying);	1053	sub_weight (env, weight + carrying);
1072		1054
1073	/* NO_FIX_PLAYER is set when a great many changes are being	1055	/* NO_FIX_PLAYER is set when a great many changes are being
1074	* made to players inventory. If set, avoiding the call	1056	* made to players inventory. If set, avoiding the call
1075	* to save cpu time.	1057	* to save cpu time.
1076	*/	1058	*/
1077	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1059	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1078	fix_player (otmp);	1060	fix_player (otmp);
1079		1061
1080	if (op->above != NULL)	1062	if (above != NULL)
1081	op->above->below = op->below;	1063	above->below = below;
1082	else	1064	else
1083	op->env->inv = op->below;	1065	env->inv = below;
1084		1066
1085	if (op->below != NULL)	1067	if (below != NULL)
1086	op->below->above = op->above;	1068	below->above = above;
1087		1069
1088	/* we set up values so that it could be inserted into	1070	/* we set up values so that it could be inserted into
1089	* the map, but we don't actually do that - it is up	1071	* the map, but we don't actually do that - it is up
1090	* to the caller to decide what we want to do.	1072	* to the caller to decide what we want to do.
1091	*/	1073	*/
1092	op->x = op->env->x, op->y = op->env->y;	1074	x = env->x, y = env->y;
1093	op->map = op->env->map;	1075	map = env->map;
1094	op->above = NULL, op->below = NULL;	1076	above = 0, below = 0;
1095	op->env = NULL;	1077	env = 0;
1096	}	1078	}
1097	else if (op->map)	1079	else if (map)
1098	{	1080	{
1099	x = op->x;
1100	y = op->y;
1101	m = get_map_from_coord (op->map, &x, &y);
1102
1103	if (!m)
1104	{
1105	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1106	op->map->path, op->x, op->y);
1107	/* in old days, we used to set x and y to 0 and continue.
1108	* it seems if we get into this case, something is probablye
1109	* screwed up and should be fixed.
1110	*/
1111	abort ();
1112	}
1113
1114	if (op->map != m)
1115	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1116	op->map->path, m->path, op->x, op->y, x, y);
1117
1118	/* Re did the following section of code - it looks like it had	1081	/* Re did the following section of code - it looks like it had
1119	* lots of logic for things we no longer care about	1082	* lots of logic for things we no longer care about
1120	*/	1083	*/
1121		1084
1122	/* link the object above us */	1085	/* link the object above us */
1123	if (op->above)	1086	if (above)
1124	op->above->below = op->below;	1087	above->below = below;
1125	else	1088	else
1126	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1089	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1127		1090
1128	/* Relink the object below us, if there is one */	1091	/* Relink the object below us, if there is one */
1129	if (op->below)	1092	if (below)
1130	op->below->above = op->above;	1093	below->above = above;
1131	else	1094	else
1132	{	1095	{
1133	/* Nothing below, which means we need to relink map object for this space	1096	/* Nothing below, which means we need to relink map object for this space
1134	* use translated coordinates in case some oddness with map tiling is	1097	* use translated coordinates in case some oddness with map tiling is
1135	* evident	1098	* evident
1136	*/	1099	*/
1137	if (GET_MAP_OB (m, x, y) != op)	1100	if (GET_MAP_OB (map, x, y) != this)
1138	{	1101	{
1139	dump_object (op);	1102	char *dump = dump_object (this);
1140	LOG (llevError,	1103	LOG (llevError,
1141	"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);	1104	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1105	free (dump);
1142	dump_object (GET_MAP_OB (m, x, y));	1106	dump = dump_object (GET_MAP_OB (map, x, y));
1143	LOG (llevError, "%s\n", errmsg);	1107	LOG (llevError, "%s\n", dump);
		1108	free (dump);
1144	}	1109	}
1145		1110
1146	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1111	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1147	}	1112	}
1148		1113
1149	op->above = 0;	1114	above = 0;
1150	op->below = 0;	1115	below = 0;
1151		1116
1152	if (op->map->in_memory == MAP_SAVING)	1117	if (map->in_memory == MAP_SAVING)
1153	return;	1118	return;
1154		1119
1155	tag = op->count;
1156	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1120	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1157		1121
1158	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1122	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1159	{	1123	{
1160	/* No point updating the players look faces if he is the object	1124	/* No point updating the players look faces if he is the object
1161	* being removed.	1125	* being removed.
1162	*/	1126	*/
1163		1127
1164	if (tmp->type == PLAYER && tmp != op)	1128	if (tmp->type == PLAYER && tmp != this)
1165	{	1129	{
1166	/* If a container that the player is currently using somehow gets	1130	/* If a container that the player is currently using somehow gets
1167	* removed (most likely destroyed), update the player view	1131	* removed (most likely destroyed), update the player view
1168	* appropriately.	1132	* appropriately.
1169	*/	1133	*/
1170	if (tmp->container == op)	1134	if (tmp->container == this)
1171	{	1135	{
1172	CLEAR_FLAG (op, FLAG_APPLIED);	1136	CLEAR_FLAG (this, FLAG_APPLIED);
1173	tmp->container = NULL;	1137	tmp->container = 0;
1174	}	1138	}
1175		1139
1176	tmp->contr->socket.update_look = 1;	1140	tmp->contr->socket.update_look = 1;
1177	}	1141	}
1178		1142
1179	/* See if player moving off should effect something */	1143	/* See if player moving off should effect something */
1180	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1144	if (check_walk_off
		1145	&& ((move_type & tmp->move_off)
		1146	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1181	{	1147	{
1182	move_apply (tmp, op, NULL);	1148	move_apply (tmp, this, 0);
1183		1149
1184	if (was_destroyed (op, tag))	1150	if (destroyed ())
1185	{
1186	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1151	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1187	}
1188	}	1152	}
1189		1153
1190	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1154	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1191		1155
1192	if (tmp->above == tmp)	1156	if (tmp->above == tmp)
1193	tmp->above = NULL;	1157	tmp->above = 0;
1194		1158
1195	last = tmp;	1159	last = tmp;
1196	}	1160	}
1197		1161
1198	/* last == NULL of there are no objects on this space */	1162	/* last == NULL of there are no objects on this space */
1199	if (last == NULL)	1163	if (!last)
1200	{	1164	{
1201	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1165	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1202	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1166	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1203	* those out anyways, and if there are any flags set right now, they won't	1167	* those out anyways, and if there are any flags set right now, they won't
1204	* be correct anyways.	1168	* be correct anyways.
1205	*/	1169	*/
1206	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1170	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1207	update_position (op->map, op->x, op->y);	1171	update_position (map, x, y);
1208	}	1172	}
1209	else	1173	else
1210	update_object (last, UP_OBJ_REMOVE);	1174	update_object (last, UP_OBJ_REMOVE);
1211		1175
1212	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1176	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1213	update_all_los (op->map, op->x, op->y);	1177	update_all_los (map, x, y);
1214	}	1178	}
1215	}	1179	}
1216		1180
1217	/*	1181	/*
1218	* merge_ob(op,top):	1182	* merge_ob(op,top):
…		…
1220	* This function goes through all objects below and including top, and	1184	* This function goes through all objects below and including top, and
1221	* merges op to the first matching object.	1185	* merges op to the first matching object.
1222	* If top is NULL, it is calculated.	1186	* If top is NULL, it is calculated.
1223	* Returns pointer to object if it succeded in the merge, otherwise NULL	1187	* Returns pointer to object if it succeded in the merge, otherwise NULL
1224	*/	1188	*/
1225
1226	object *	1189	object *
1227	merge_ob (object *op, object *top)	1190	merge_ob (object *op, object *top)
1228	{	1191	{
1229	if (!op->nrof)	1192	if (!op->nrof)
1230	return 0;	1193	return 0;
…		…
1240	{	1203	{
1241	top->nrof += op->nrof;	1204	top->nrof += op->nrof;
1242		1205
1243	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1206	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1244	op->weight = 0; /* Don't want any adjustements now */	1207	op->weight = 0; /* Don't want any adjustements now */
1245	remove_ob (op);	1208	op->remove ();
1246	free_object (op);	1209	op->destroy (0);
1247	return top;	1210	return top;
1248	}	1211	}
1249	}	1212	}
1250		1213
1251	return NULL;	1214	return 0;
1252	}	1215	}
1253		1216
1254	/*	1217	/*
1255	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1218	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1256	* job preparing multi-part monsters	1219	* job preparing multi-part monsters
1257	*/	1220	*/
1258	object *	1221	object *
1259	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1222	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1260	{	1223	{
1261	object *tmp;	1224	object *tmp;
1262		1225
1263	if (op->head)	1226	if (op->head)
1264	op = op->head;	1227	op = op->head;
…		…
1292	* NULL if 'op' was destroyed	1255	* NULL if 'op' was destroyed
1293	* just 'op' otherwise	1256	* just 'op' otherwise
1294	*/	1257	*/
1295		1258
1296	object *	1259	object *
1297	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1260	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1298	{	1261	{
1299	object *tmp, *top, *floor = NULL;	1262	object *tmp, *top, *floor = NULL;
1300	sint16 x, y;	1263	sint16 x, y;
1301		1264
1302	if (QUERY_FLAG (op, FLAG_FREED))	1265	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1305	return NULL;	1268	return NULL;
1306	}	1269	}
1307		1270
1308	if (m == NULL)	1271	if (m == NULL)
1309	{	1272	{
1310	dump_object (op);	1273	char *dump = dump_object (op);
1311	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1274	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1275	free (dump);
1312	return op;	1276	return op;
1313	}	1277	}
1314		1278
1315	if (out_of_map (m, op->x, op->y))	1279	if (out_of_map (m, op->x, op->y))
1316	{	1280	{
1317	dump_object (op);	1281	char *dump = dump_object (op);
1318	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1282	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1319	#ifdef MANY_CORES	1283	#ifdef MANY_CORES
1320	/* Better to catch this here, as otherwise the next use of this object	1284	/* Better to catch this here, as otherwise the next use of this object
1321	* is likely to cause a crash. Better to find out where it is getting	1285	* is likely to cause a crash. Better to find out where it is getting
1322	* improperly inserted.	1286	* improperly inserted.
1323	*/	1287	*/
1324	abort ();	1288	abort ();
1325	#endif	1289	#endif
		1290	free (dump);
1326	return op;	1291	return op;
1327	}	1292	}
1328		1293
1329	if (!QUERY_FLAG (op, FLAG_REMOVED))	1294	if (!QUERY_FLAG (op, FLAG_REMOVED))
1330	{	1295	{
1331	dump_object (op);	1296	char *dump = dump_object (op);
1332	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1297	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1298	free (dump);
1333	return op;	1299	return op;
1334	}	1300	}
1335		1301
1336	if (op->more != NULL)	1302	if (op->more != NULL)
1337	{	1303	{
…		…
1378	if (op->nrof && !(flag & INS_NO_MERGE))	1344	if (op->nrof && !(flag & INS_NO_MERGE))
1379	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1345	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1380	if (CAN_MERGE (op, tmp))	1346	if (CAN_MERGE (op, tmp))
1381	{	1347	{
1382	op->nrof += tmp->nrof;	1348	op->nrof += tmp->nrof;
1383	remove_ob (tmp);	1349	tmp->remove ();
1384	free_object (tmp);	1350	tmp->destroy (0);
1385	}	1351	}
1386		1352
1387	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1353	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1388	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1389		1355
…		…
1578		1544
1579	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1580	{	1546	{
1581	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1582	{	1548	{
1583	remove_ob (tmp);	1549	tmp->remove ();
1584	free_object (tmp);	1550	tmp->destroy (0);
1585	}	1551	}
1586	}	1552	}
1587		1553
1588	tmp1 = arch_to_object (find_archetype (arch_string));	1554	tmp1 = arch_to_object (archetype::find (arch_string));
1589		1555
1590	tmp1->x = op->x;	1556	tmp1->x = op->x;
1591	tmp1->y = op->y;	1557	tmp1->y = op->y;
1592	insert_ob_in_map (tmp1, op->map, op, 0);	1558	insert_ob_in_map (tmp1, op->map, op, 0);
1593	}	1559	}
…		…
1615	}	1581	}
1616		1582
1617	newob = object_create_clone (orig_ob);	1583	newob = object_create_clone (orig_ob);
1618		1584
1619	if ((orig_ob->nrof -= nr) < 1)	1585	if ((orig_ob->nrof -= nr) < 1)
1620	{	1586	orig_ob->destroy (1);
1621	if (!is_removed)
1622	remove_ob (orig_ob);
1623	free_object2 (orig_ob, 1);
1624	}
1625	else if (!is_removed)	1587	else if (!is_removed)
1626	{	1588	{
1627	if (orig_ob->env != NULL)	1589	if (orig_ob->env != NULL)
1628	sub_weight (orig_ob->env, orig_ob->weight * nr);	1590	sub_weight (orig_ob->env, orig_ob->weight * nr);
1629	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1591	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1693	esrv_send_item (tmp, op);	1655	esrv_send_item (tmp, op);
1694	}	1656	}
1695	}	1657	}
1696	else	1658	else
1697	{	1659	{
1698	remove_ob (op);	1660	op->remove ();
1699	op->nrof = 0;	1661	op->nrof = 0;
1700	if (tmp)	1662	if (tmp)
1701	{	1663	{
1702	esrv_del_item (tmp->contr, op->count);	1664	esrv_del_item (tmp->contr, op->count);
1703	}	1665	}
…		…
1709		1671
1710	if (i < op->nrof)	1672	if (i < op->nrof)
1711	op->nrof -= i;	1673	op->nrof -= i;
1712	else	1674	else
1713	{	1675	{
1714	remove_ob (op);	1676	op->remove ();
1715	op->nrof = 0;	1677	op->nrof = 0;
1716	}	1678	}
1717		1679
1718	/* Since we just removed op, op->above is null */	1680	/* Since we just removed op, op->above is null */
1719	for (tmp = above; tmp != NULL; tmp = tmp->above)	1681	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1728		1690
1729	if (op->nrof)	1691	if (op->nrof)
1730	return op;	1692	return op;
1731	else	1693	else
1732	{	1694	{
1733	free_object (op);	1695	op->destroy (0);
1734	return NULL;	1696	return NULL;
1735	}	1697	}
1736	}	1698	}
1737		1699
1738	/*	1700	/*
…		…
1751	op->carrying += weight;	1713	op->carrying += weight;
1752	op = op->env;	1714	op = op->env;
1753	}	1715	}
1754	}	1716	}
1755		1717
		1718	object *
		1719	insert_ob_in_ob (object *op, object *where)
		1720	{
		1721	if (!where)
		1722	{
		1723	char *dump = dump_object (op);
		1724	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1725	free (dump);
		1726	return op;
		1727	}
		1728
		1729	if (where->head)
		1730	{
		1731	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1732	where = where->head;
		1733	}
		1734
		1735	return where->insert (op);
		1736	}
		1737
1756	/*	1738	/*
1757	* insert_ob_in_ob(op,environment):	1739	* env->insert (op)
1758	* This function inserts the object op in the linked list	1740	* This function inserts the object op in the linked list
1759	* inside the object environment.	1741	* inside the object environment.
1760	*	1742	*
1761	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1762	* the inventory at the last position or next to other objects of the same
1763	* type.
1764	* Frank: Now sorted by type, archetype and magic!
1765	*
1766	* The function returns now pointer to inserted item, and return value can	1743	* The function returns now pointer to inserted item, and return value can
1767	* be != op, if items are merged. -Tero	1744	* be != op, if items are merged. -Tero
1768	*/	1745	*/
1769		1746
1770	object *	1747	object *
1771	insert_ob_in_ob (object *op, object *where)	1748	object::insert (object *op)
1772	{	1749	{
1773	object *	1750	object *tmp, *otmp;
1774	tmp, *
1775	otmp;
1776		1751
1777	if (!QUERY_FLAG (op, FLAG_REMOVED))	1752	if (!QUERY_FLAG (op, FLAG_REMOVED))
1778	{	1753	op->remove ();
1779	dump_object (op);
1780	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1781	return op;
1782	}
1783
1784	if (where == NULL)
1785	{
1786	dump_object (op);
1787	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1788	return op;
1789	}
1790
1791	if (where->head)
1792	{
1793	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1794	where = where->head;
1795	}
1796		1754
1797	if (op->more)	1755	if (op->more)
1798	{	1756	{
1799	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1757	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1800	return op;	1758	return op;
…		…
1802		1760
1803	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1761	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1804	CLEAR_FLAG (op, FLAG_REMOVED);	1762	CLEAR_FLAG (op, FLAG_REMOVED);
1805	if (op->nrof)	1763	if (op->nrof)
1806	{	1764	{
1807	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1765	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1808	if (CAN_MERGE (tmp, op))	1766	if (CAN_MERGE (tmp, op))
1809	{	1767	{
1810	/* return the original object and remove inserted object	1768	/* return the original object and remove inserted object
1811	(client needs the original object) */	1769	(client needs the original object) */
1812	tmp->nrof += op->nrof;	1770	tmp->nrof += op->nrof;
1813	/* Weight handling gets pretty funky. Since we are adding to	1771	/* Weight handling gets pretty funky. Since we are adding to
1814	* tmp->nrof, we need to increase the weight.	1772	* tmp->nrof, we need to increase the weight.
1815	*/	1773	*/
1816	add_weight (where, op->weight * op->nrof);	1774	add_weight (this, op->weight * op->nrof);
1817	SET_FLAG (op, FLAG_REMOVED);	1775	SET_FLAG (op, FLAG_REMOVED);
1818	free_object (op); /* free the inserted object */	1776	op->destroy (); /* free the inserted object */
1819	op = tmp;	1777	op = tmp;
1820	remove_ob (op); /* and fix old object's links */	1778	op->remove (); /* and fix old object's links */
1821	CLEAR_FLAG (op, FLAG_REMOVED);	1779	CLEAR_FLAG (op, FLAG_REMOVED);
1822	break;	1780	break;
1823	}	1781	}
1824		1782
1825	/* I assume combined objects have no inventory	1783	/* I assume combined objects have no inventory
1826	* We add the weight - this object could have just been removed	1784	* We add the weight - this object could have just been removed
1827	* (if it was possible to merge). calling remove_ob will subtract	1785	* (if it was possible to merge). calling remove_ob will subtract
1828	* the weight, so we need to add it in again, since we actually do	1786	* the weight, so we need to add it in again, since we actually do
1829	* the linking below	1787	* the linking below
1830	*/	1788	*/
1831	add_weight (where, op->weight * op->nrof);	1789	add_weight (this, op->weight * op->nrof);
1832	}	1790	}
1833	else	1791	else
1834	add_weight (where, (op->weight + op->carrying));	1792	add_weight (this, (op->weight + op->carrying));
1835		1793
1836	otmp = is_player_inv (where);	1794	otmp = is_player_inv (this);
1837	if (otmp && otmp->contr != NULL)	1795	if (otmp && otmp->contr)
1838	{
1839	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1796	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1840	fix_player (otmp);	1797	fix_player (otmp);
1841	}
1842		1798
1843	op->map = NULL;	1799	op->map = NULL;
1844	op->env = where;	1800	op->env = this;
1845	op->above = NULL;	1801	op->above = NULL;
1846	op->below = NULL;	1802	op->below = NULL;
1847	op->x = 0, op->y = 0;	1803	op->x = 0, op->y = 0;
1848		1804
1849	/* reset the light list and los of the players on the map */	1805	/* reset the light list and los of the players on the map */
1850	if ((op->glow_radius != 0) && where->map)	1806	if ((op->glow_radius != 0) && map)
1851	{	1807	{
1852	#ifdef DEBUG_LIGHTS	1808	#ifdef DEBUG_LIGHTS
1853	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1809	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1854	#endif /* DEBUG_LIGHTS */	1810	#endif /* DEBUG_LIGHTS */
1855	if (MAP_DARKNESS (where->map))	1811	if (MAP_DARKNESS (map))
1856	update_all_los (where->map, where->x, where->y);	1812	update_all_los (map, x, y);
1857	}	1813	}
1858		1814
1859	/* Client has no idea of ordering so lets not bother ordering it here.	1815	/* Client has no idea of ordering so lets not bother ordering it here.
1860	* It sure simplifies this function...	1816	* It sure simplifies this function...
1861	*/	1817	*/
1862	if (where->inv == NULL)	1818	if (!inv)
1863	where->inv = op;	1819	inv = op;
1864	else	1820	else
1865	{	1821	{
1866	op->below = where->inv;	1822	op->below = inv;
1867	op->below->above = op;	1823	op->below->above = op;
1868	where->inv = op;	1824	inv = op;
1869	}	1825	}
		1826
1870	return op;	1827	return op;
1871	}	1828	}
1872		1829
1873	/*	1830	/*
1874	* Checks if any objects has a move_type that matches objects	1831	* Checks if any objects has a move_type that matches objects
…		…
1892	*/	1849	*/
1893		1850
1894	int	1851	int
1895	check_move_on (object *op, object *originator)	1852	check_move_on (object *op, object *originator)
1896	{	1853	{
1897	object *	1854	object *tmp;
1898	tmp;	1855	maptile *m = op->map;
1899	tag_t
1900	tag;
1901	mapstruct *
1902	m = op->map;
1903	int
1904	x = op->x, y = op->y;	1856	int x = op->x, y = op->y;
1905		1857
1906	MoveType	1858	MoveType move_on, move_slow, move_block;
1907	move_on,
1908	move_slow,
1909	move_block;
1910		1859
1911	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1860	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1912	return 0;	1861	return 0;
1913
1914	tag = op->count;
1915		1862
1916	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1863	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1917	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1864	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1918	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1865	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1919		1866
…		…
1980	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1927	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1981	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1928	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1982	{	1929	{
1983	move_apply (tmp, op, originator);	1930	move_apply (tmp, op, originator);
1984		1931
1985	if (was_destroyed (op, tag))	1932	if (op->destroyed ())
1986	return 1;	1933	return 1;
1987		1934
1988	/* what the person/creature stepped onto has moved the object	1935	/* what the person/creature stepped onto has moved the object
1989	* someplace new. Don't process any further - if we did,	1936	* someplace new. Don't process any further - if we did,
1990	* have a feeling strange problems would result.	1937	* have a feeling strange problems would result.
…		…
2002	* a matching archetype at the given map and coordinates.	1949	* a matching archetype at the given map and coordinates.
2003	* The first matching object is returned, or NULL if none.	1950	* The first matching object is returned, or NULL if none.
2004	*/	1951	*/
2005		1952
2006	object *	1953	object *
2007	present_arch (const archetype *at, mapstruct *m, int x, int y)	1954	present_arch (const archetype *at, maptile *m, int x, int y)
2008	{	1955	{
2009	object *	1956	object *
2010	tmp;	1957	tmp;
2011		1958
2012	if (m == NULL || out_of_map (m, x, y))	1959	if (m == NULL || out_of_map (m, x, y))
…		…
2025	* a matching type variable at the given map and coordinates.	1972	* a matching type variable at the given map and coordinates.
2026	* The first matching object is returned, or NULL if none.	1973	* The first matching object is returned, or NULL if none.
2027	*/	1974	*/
2028		1975
2029	object *	1976	object *
2030	present (unsigned char type, mapstruct *m, int x, int y)	1977	present (unsigned char type, maptile *m, int x, int y)
2031	{	1978	{
2032	object *	1979	object *
2033	tmp;	1980	tmp;
2034		1981
2035	if (out_of_map (m, x, y))	1982	if (out_of_map (m, x, y))
…		…
2175	* the archetype because that isn't correct if the monster has been	2122	* the archetype because that isn't correct if the monster has been
2176	* customized, changed states, etc.	2123	* customized, changed states, etc.
2177	*/	2124	*/
2178		2125
2179	int	2126	int
2180	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2127	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2181	{	2128	{
2182	int	2129	int
2183	i,	2130	i,
2184	index = 0, flag;	2131	index = 0, flag;
2185	static int	2132	static int
…		…
2206	return -1;	2153	return -1;
2207	return altern[RANDOM () % index];	2154	return altern[RANDOM () % index];
2208	}	2155	}
2209		2156
2210	/*	2157	/*
2211	* find_first_free_spot(archetype, mapstruct, x, y) works like	2158	* find_first_free_spot(archetype, maptile, x, y) works like
2212	* find_free_spot(), but it will search max number of squares.	2159	* find_free_spot(), but it will search max number of squares.
2213	* But it will return the first available spot, not a random choice.	2160	* But it will return the first available spot, not a random choice.
2214	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2161	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2215	*/	2162	*/
2216		2163
2217	int	2164	int
2218	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2165	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2219	{	2166	{
2220	int	2167	int
2221	i;	2168	i;
2222		2169
2223	for (i = 0; i < SIZEOFFREE; i++)	2170	for (i = 0; i < SIZEOFFREE; i++)
…		…
2287	* because we have to know what movement the thing looking to move	2234	* because we have to know what movement the thing looking to move
2288	* there is capable of.	2235	* there is capable of.
2289	*/	2236	*/
2290		2237
2291	int	2238	int
2292	find_dir (mapstruct *m, int x, int y, object *exclude)	2239	find_dir (maptile *m, int x, int y, object *exclude)
2293	{	2240	{
2294	int	2241	int
2295	i,	2242	i,
2296	max = SIZEOFFREE, mflags;	2243	max = SIZEOFFREE, mflags;
2297		2244
2298	sint16 nx, ny;	2245	sint16 nx, ny;
2299	object *	2246	object *
2300	tmp;	2247	tmp;
2301	mapstruct *	2248	maptile *
2302	mp;	2249	mp;
2303		2250
2304	MoveType blocked, move_type;	2251	MoveType blocked, move_type;
2305		2252
2306	if (exclude && exclude->head)	2253	if (exclude && exclude->head)
…		…
2514	* Modified to be map tile aware -.MSW	2461	* Modified to be map tile aware -.MSW
2515	*/	2462	*/
2516		2463
2517		2464
2518	int	2465	int
2519	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2466	can_see_monsterP (maptile *m, int x, int y, int dir)
2520	{	2467	{
2521	sint16 dx, dy;	2468	sint16 dx, dy;
2522	int	2469	int
2523	mflags;	2470	mflags;
2524		2471
…		…
2573	* create clone from object to another	2520	* create clone from object to another
2574	*/	2521	*/
2575	object *	2522	object *
2576	object_create_clone (object *asrc)	2523	object_create_clone (object *asrc)
2577	{	2524	{
2578	object *
2579	dst = NULL, *tmp, *src, *part, *prev, *item;	2525	object *dst = 0, *tmp, *src, *part, *prev, *item;
2580		2526
2581	if (!asrc)	2527	if (!asrc)
2582	return NULL;	2528	return 0;
		2529
2583	src = asrc;	2530	src = asrc;
2584	if (src->head)	2531	if (src->head)
2585	src = src->head;	2532	src = src->head;
2586		2533
2587	prev = NULL;	2534	prev = 0;
2588	for (part = src; part; part = part->more)	2535	for (part = src; part; part = part->more)
2589	{	2536	{
2590	tmp = get_object ();	2537	tmp = get_object ();
2591	copy_object (part, tmp);	2538	copy_object (part, tmp);
2592	tmp->x -= src->x;	2539	tmp->x -= src->x;
2593	tmp->y -= src->y;	2540	tmp->y -= src->y;
		2541
2594	if (!part->head)	2542	if (!part->head)
2595	{	2543	{
2596	dst = tmp;	2544	dst = tmp;
2597	tmp->head = NULL;	2545	tmp->head = 0;
2598	}	2546	}
2599	else	2547	else
2600	{	2548	{
2601	tmp->head = dst;	2549	tmp->head = dst;
2602	}	2550	}
		2551
2603	tmp->more = NULL;	2552	tmp->more = 0;
		2553
2604	if (prev)	2554	if (prev)
2605	prev->more = tmp;	2555	prev->more = tmp;
		2556
2606	prev = tmp;	2557	prev = tmp;
2607	}	2558	}
2608		2559
2609	/*** copy inventory ***/
2610	for (item = src->inv; item; item = item->below)	2560	for (item = src->inv; item; item = item->below)
2611	{
2612	(void) insert_ob_in_ob (object_create_clone (item), dst);	2561	insert_ob_in_ob (object_create_clone (item), dst);
2613	}
2614		2562
2615	return dst;	2563	return dst;
2616	}	2564	}
2617		2565
2618	/* return true if the object was destroyed, 0 otherwise */
2619	int
2620	was_destroyed (const object *op, tag_t old_tag)
2621	{
2622	/* checking for FLAG_FREED isn't necessary, but makes this function more
2623	* robust */
2624	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2625	}
2626
2627	/* GROS - Creates an object using a string representing its content. */	2566	/* GROS - Creates an object using a string representing its content. */
2628
2629	/* Basically, we save the content of the string to a temp file, then call */	2567	/* Basically, we save the content of the string to a temp file, then call */
2630
2631	/* load_object on it. I admit it is a highly inefficient way to make things, */	2568	/* load_object on it. I admit it is a highly inefficient way to make things, */
2632
2633	/* but it was simple to make and allows reusing the load_object function. */	2569	/* but it was simple to make and allows reusing the load_object function. */
2634
2635	/* Remember not to use load_object_str in a time-critical situation. */	2570	/* Remember not to use load_object_str in a time-critical situation. */
2636
2637	/* Also remember that multiparts objects are not supported for now. */	2571	/* Also remember that multiparts objects are not supported for now. */
2638		2572
2639	object *	2573	object *
2640	load_object_str (const char *obstr)	2574	load_object_str (const char *obstr)
2641	{	2575	{
2642	object *	2576	object *op;
2643	op;
2644	char
2645	filename[MAX_BUF];	2577	char filename[MAX_BUF];
2646		2578
2647	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2579	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2648		2580
2649	FILE *
2650	tempfile = fopen (filename, "w");	2581	FILE *tempfile = fopen (filename, "w");
2651		2582
2652	if (tempfile == NULL)	2583	if (tempfile == NULL)
2653	{	2584	{
2654	LOG (llevError, "Error - Unable to access load object temp file\n");	2585	LOG (llevError, "Error - Unable to access load object temp file\n");
2655	return NULL;	2586	return NULL;
2656	};	2587	}
		2588
2657	fprintf (tempfile, obstr);	2589	fprintf (tempfile, obstr);
2658	fclose (tempfile);	2590	fclose (tempfile);
2659		2591
2660	op = get_object ();	2592	op = get_object ();
2661		2593
…		…
2675	* returns NULL if no match.	2607	* returns NULL if no match.
2676	*/	2608	*/
2677	object *	2609	object *
2678	find_obj_by_type_subtype (const object *who, int type, int subtype)	2610	find_obj_by_type_subtype (const object *who, int type, int subtype)
2679	{	2611	{
2680	object *	2612	object *tmp;
2681	tmp;
2682		2613
2683	for (tmp = who->inv; tmp; tmp = tmp->below)	2614	for (tmp = who->inv; tmp; tmp = tmp->below)
2684	if (tmp->type == type && tmp->subtype == subtype)	2615	if (tmp->type == type && tmp->subtype == subtype)
2685	return tmp;	2616	return tmp;
2686		2617
…		…
2694	* do the desired thing.	2625	* do the desired thing.
2695	*/	2626	*/
2696	key_value *	2627	key_value *
2697	get_ob_key_link (const object *ob, const char *key)	2628	get_ob_key_link (const object *ob, const char *key)
2698	{	2629	{
2699	key_value *	2630	key_value *link;
2700	link;
2701		2631
2702	for (link = ob->key_values; link != NULL; link = link->next)	2632	for (link = ob->key_values; link != NULL; link = link->next)
2703	{
2704	if (link->key == key)	2633	if (link->key == key)
2705	{
2706	return link;	2634	return link;
2707	}
2708	}
2709		2635
2710	return NULL;	2636	return NULL;
2711	}	2637	}
2712		2638
2713	/*	2639	/*
…		…
2718	* The returned string is shared.	2644	* The returned string is shared.
2719	*/	2645	*/
2720	const char *	2646	const char *
2721	get_ob_key_value (const object *op, const char *const key)	2647	get_ob_key_value (const object *op, const char *const key)
2722	{	2648	{
2723	key_value *	2649	key_value *link;
2724	link;	2650	shstr_cmp canonical_key (key);
2725	const char *
2726	canonical_key;
2727		2651
2728	canonical_key = shstr::find (key);
2729
2730	if (canonical_key == NULL)	2652	if (!canonical_key)
2731	{	2653	{
2732	/* 1. There being a field named key on any object	2654	/* 1. There being a field named key on any object
2733	* implies there'd be a shared string to find.	2655	* implies there'd be a shared string to find.
2734	* 2. Since there isn't, no object has this field.	2656	* 2. Since there isn't, no object has this field.
2735	* 3. Therefore, *this* object doesn't have this field.	2657	* 3. Therefore, *this* object doesn't have this field.
2736	*/	2658	*/
2737	return NULL;	2659	return 0;
2738	}	2660	}
2739		2661
2740	/* This is copied from get_ob_key_link() above -	2662	/* This is copied from get_ob_key_link() above -
2741	* only 4 lines, and saves the function call overhead.	2663	* only 4 lines, and saves the function call overhead.
2742	*/	2664	*/
2743	for (link = op->key_values; link != NULL; link = link->next)	2665	for (link = op->key_values; link; link = link->next)
2744	{
2745	if (link->key == canonical_key)	2666	if (link->key == canonical_key)
2746	{
2747	return link->value;	2667	return link->value;
2748	}	2668
2749	}
2750	return NULL;	2669	return 0;
2751	}	2670	}
2752		2671
2753		2672
2754	/*	2673	/*
2755	* Updates the canonical_key in op to value.	2674	* Updates the canonical_key in op to value.
…		…
2840	{	2759	{
2841	shstr key_ (key);	2760	shstr key_ (key);
2842		2761
2843	return set_ob_key_value_s (op, key_, value, add_key);	2762	return set_ob_key_value_s (op, key_, value, add_key);
2844	}	2763	}
		2764
		2765	object::depth_iterator::depth_iterator (object *container)
		2766	: iterator_base (container)
		2767	{
		2768	while (item->inv)
		2769	item = item->inv;
		2770	}
		2771
		2772	void
		2773	object::depth_iterator::next ()
		2774	{
		2775	if (item->below)
		2776	{
		2777	item = item->below;
		2778
		2779	while (item->inv)
		2780	item = item->inv;
		2781	}
		2782	else
		2783	item = item->env;
		2784	}
		2785
		2786	// return a suitable string describing an objetc in enough detail to find it
		2787	const char *
		2788	object::debug_desc (char *info) const
		2789	{
		2790	char info2[256 * 3];
		2791	char *p = info;
		2792
		2793	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2794	count,
		2795	&name,
		2796	title ? " " : "",
		2797	title ? (const char *)title : "");
		2798
		2799	if (env)
		2800	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2801
		2802	if (map)
		2803	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2804
		2805	return info;
		2806	}
		2807
		2808	const char *
		2809	object::debug_desc () const
		2810	{
		2811	static char info[256 * 3];
		2812	return debug_desc (info);
		2813	}
		2814

Diff Legend

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