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.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.64 by root, Tue Dec 12 21:39:56 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
542	void object::clone (object *destination)
543	{
544	*(object_copy *)destination = *this;
545	*(object_pod *)destination = *this;
546
547	if (self || cb)
548	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
549	}
550
551	/*	531	/*
552	* copy object first frees everything allocated by the second object,	532	* copy_to first frees everything allocated by the dst object,
553	* and then copies the contends of the first object into the second	533	* and then copies the contents of itself into the second
554	* object, allocating what needs to be allocated. Basically, any	534	* object, allocating what needs to be allocated. Basically, any
555	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	535	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
556	* if the first object is freed, the pointers in the new object	536	* if the first object is freed, the pointers in the new object
557	* will point at garbage.	537	* will point at garbage.
558	*/	538	*/
559	void	539	void
560	copy_object (object *op2, object *op)	540	object::copy_to (object *dst)
561	{	541	{
562	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
563	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
564		544
565	op2->clone (op);	545	*(object_copy *)dst = *this;
		546	*(object_pod *)dst = *this;
		547
		548	if (self || cb)
		549	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
566		550
567	if (is_freed)	551	if (is_freed)
568	SET_FLAG (op, FLAG_FREED);	552	SET_FLAG (dst, FLAG_FREED);
		553
569	if (is_removed)	554	if (is_removed)
570	SET_FLAG (op, FLAG_REMOVED);	555	SET_FLAG (dst, FLAG_REMOVED);
571		556
572	if (op2->speed < 0)	557	if (speed < 0)
573	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	558	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
574		559
575	/* Copy over key_values, if any. */	560	/* Copy over key_values, if any. */
576	if (op2->key_values)	561	if (key_values)
577	{	562	{
578	key_value *tail = 0;	563	key_value *tail = 0;
579	key_value *i;	564	key_value *i;
580		565
581	op->key_values = 0;	566	dst->key_values = 0;
582		567
583	for (i = op2->key_values; i; i = i->next)	568	for (i = key_values; i; i = i->next)
584	{	569	{
585	key_value *new_link = new key_value;	570	key_value *new_link = new key_value;
586		571
587	new_link->next = 0;	572	new_link->next = 0;
588	new_link->key = i->key;	573	new_link->key = i->key;
589	new_link->value = i->value;	574	new_link->value = i->value;
590		575
591	/* Try and be clever here, too. */	576	/* Try and be clever here, too. */
592	if (!op->key_values)	577	if (!dst->key_values)
593	{	578	{
594	op->key_values = new_link;	579	dst->key_values = new_link;
595	tail = new_link;	580	tail = new_link;
596	}	581	}
597	else	582	else
598	{	583	{
599	tail->next = new_link;	584	tail->next = new_link;
600	tail = new_link;	585	tail = new_link;
601	}	586	}
602	}	587	}
603	}	588	}
604		589
605	update_ob_speed (op);	590	update_ob_speed (dst);
606	}	591	}
607		592
608	/*	593	/*
609	* If an object with the IS_TURNABLE() flag needs to be turned due	594	* If an object with the IS_TURNABLE() flag needs to be turned due
610	* to the closest player being on the other side, this function can	595	* to the closest player being on the other side, this function can
…		…
815	update_now = 1;	800	update_now = 1;
816		801
817	if ((move_slow | op->move_slow) != move_slow)	802	if ((move_slow | op->move_slow) != move_slow)
818	update_now = 1;	803	update_now = 1;
819	}	804	}
		805
820	/* if the object is being removed, we can't make intelligent	806	/* if the object is being removed, we can't make intelligent
821	* decisions, because remove_ob can't really pass the object	807	* decisions, because remove_ob can't really pass the object
822	* that is being removed.	808	* that is being removed.
823	*/	809	*/
824	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	810	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
836		822
837	if (op->more != NULL)	823	if (op->more != NULL)
838	update_object (op->more, action);	824	update_object (op->more, action);
839	}	825	}
840		826
841	static unordered_vector<object *> mortals;	827	object::vector object::mortals;
842	static std::vector<object *> freed;	828	object::vector object::objects; // not yet used
		829	object *object::first;
843		830
844	void object::free_mortals ()	831	void object::free_mortals ()
845	{	832	{
846	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	833	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
847	if ((*i)->refcnt)	834	if ((*i)->refcnt)
848	++i; // further delay freeing	835	++i; // further delay freeing
849	else	836	else
850	{	837	{
851	freed.push_back (*i);//D
852	//delete *i;	838	delete *i;
853	mortals.erase (i);	839	mortals.erase (i);
854	}	840	}
855
856	if (mortals.size())//D
857	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
858	}	841	}
859		842
860	object::object ()	843	object::object ()
861	{	844	{
862	SET_FLAG (this, FLAG_REMOVED);	845	SET_FLAG (this, FLAG_REMOVED);
863		846
864	expmul = 1.0;	847	expmul = 1.0;
865	face = blank_face;	848	face = blank_face;
866	attacked_by_count = -1;
867	}	849	}
868		850
869	object::~object ()	851	object::~object ()
870	{	852	{
871	free_key_values (this);	853	free_key_values (this);
872	}	854	}
873		855
874	void object::link ()	856	void object::link ()
875	{	857	{
876	count = ++ob_count;	858	count = ++ob_count;
		859	uuid = gen_uuid ();
877		860
878	prev = 0;	861	prev = 0;
879	next = objects;	862	next = object::first;
880		863
881	if (objects)	864	if (object::first)
882	objects->prev = this;	865	object::first->prev = this;
883		866
884	objects = this;	867	object::first = this;
885	}	868	}
886		869
887	void object::unlink ()	870	void object::unlink ()
888	{	871	{
889	count = 0;	872	if (this == object::first)
		873	object::first = next;
890		874
891	/* Remove this object from the list of used objects */	875	/* Remove this object from the list of used objects */
892	if (prev)
893	{
894	prev->next = next;	876	if (prev) prev->next = next;
		877	if (next) next->prev = prev;
		878
895	prev = 0;	879	prev = 0;
896	}
897
898	if (next)
899	{
900	next->prev = prev;
901	next = 0;	880	next = 0;
902	}
903
904	if (this == objects)
905	objects = next;
906	}	881	}
907		882
908	object *object::create ()	883	object *object::create ()
909	{	884	{
910	object *op;
911
912	if (freed.empty ())
913	op = new object;	885	object *op = new object;
914	else
915	{
916	// highly annoying, but the only way to get it stable right now
917	op = freed.back ();
918	freed.pop_back ();
919	op->~object ();
920	new ((void *) op) object;
921	}
922
923	op->link ();	886	op->link ();
924	return op;	887	return op;
925	}	888	}
926		889
927	/*	890	/*
…		…
929	* it from the list of used objects, and puts it on the list of	892	* it from the list of used objects, and puts it on the list of
930	* free objects. The IS_FREED() flag is set in the object.	893	* free objects. The IS_FREED() flag is set in the object.
931	* The object must have been removed by remove_ob() first for	894	* The object must have been removed by remove_ob() first for
932	* this function to succeed.	895	* this function to succeed.
933	*	896	*
934	* If free_inventory is set, free inventory as well. Else drop items in	897	* If destroy_inventory is set, free inventory as well. Else drop items in
935	* inventory to the ground.	898	* inventory to the ground.
936	*/	899	*/
937	void object::free (bool free_inventory)	900	void object::destroy (bool destroy_inventory)
938	{	901	{
939	if (QUERY_FLAG (this, FLAG_FREED))	902	if (QUERY_FLAG (this, FLAG_FREED))
940	return;	903	return;
941		904
942	if (QUERY_FLAG (this, FLAG_FRIENDLY))	905	if (QUERY_FLAG (this, FLAG_FRIENDLY))
943	remove_friendly_object (this);	906	remove_friendly_object (this);
944		907
945	if (!QUERY_FLAG (this, FLAG_REMOVED))	908	if (!QUERY_FLAG (this, FLAG_REMOVED))
946	remove_ob (this);	909	remove ();
947		910
948	SET_FLAG (this, FLAG_FREED);	911	SET_FLAG (this, FLAG_FREED);
949		912
950	if (more)	913	if (more)
951	{	914	{
952	more->free (free_inventory);	915	more->destroy (destroy_inventory);
953	more = 0;	916	more = 0;
954	}	917	}
955		918
956	if (inv)	919	if (inv)
957	{	920	{
958	/* Only if the space blocks everything do we not process -	921	/* Only if the space blocks everything do we not process -
959	* if some form of movement is allowed, let objects	922	* if some form of movement is allowed, let objects
960	* drop on that space.	923	* drop on that space.
961	*/	924	*/
962	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	925	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
963	{	926	{
964	object *op = inv;	927	object *op = inv;
965		928
966	while (op)	929	while (op)
967	{	930	{
968	object *tmp = op->below;	931	object *tmp = op->below;
969	op->free (free_inventory);	932	op->destroy (destroy_inventory);
970	op = tmp;	933	op = tmp;
971	}	934	}
972	}	935	}
973	else	936	else
974	{ /* Put objects in inventory onto this space */	937	{ /* Put objects in inventory onto this space */
…		…
976		939
977	while (op)	940	while (op)
978	{	941	{
979	object *tmp = op->below;	942	object *tmp = op->below;
980		943
981	remove_ob (op);	944	op->remove ();
982		945
983	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	946	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
984	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	947	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
985	free_object (op);	948	op->destroy ();
986	else	949	else
987	{	950	{
988	op->x = x;	951	op->x = x;
989	op->y = y;	952	op->y = y;
990	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	953	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
993	op = tmp;	956	op = tmp;
994	}	957	}
995	}	958	}
996	}	959	}
997		960
		961	// hack to ensure that freed objects still have a valid map
		962	{
		963	static maptile *freed_map; // freed objects are moved here to avoid crashes
		964
		965	if (!freed_map)
		966	{
		967	freed_map = new maptile;
		968
		969	freed_map->name = "/internal/freed_objects_map";
		970	freed_map->width = 3;
		971	freed_map->height = 3;
		972
		973	freed_map->allocate ();
		974	}
		975
		976	map = freed_map;
		977	x = 1;
		978	y = 1;
		979	}
		980
		981	// clear those pointers that likely might have circular references to us
998	owner = 0;	982	owner = 0;
		983	enemy = 0;
		984	attacked_by = 0;
		985
		986	// only relevant for players(?), but make sure of it anyways
		987	contr = 0;
999		988
1000	/* Remove object from the active list */	989	/* Remove object from the active list */
1001	speed = 0;	990	speed = 0;
1002	update_ob_speed (this);	991	update_ob_speed (this);
1003		992
…		…
1008		997
1009	/*	998	/*
1010	* sub_weight() recursively (outwards) subtracts a number from the	999	* sub_weight() recursively (outwards) subtracts a number from the
1011	* weight of an object (and what is carried by it's environment(s)).	1000	* weight of an object (and what is carried by it's environment(s)).
1012	*/	1001	*/
1013
1014	void	1002	void
1015	sub_weight (object *op, signed long weight)	1003	sub_weight (object *op, signed long weight)
1016	{	1004	{
1017	while (op != NULL)	1005	while (op != NULL)
1018	{	1006	{
1019	if (op->type == CONTAINER)	1007	if (op->type == CONTAINER)
1020	{
1021	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1008	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1022	}	1009
1023	op->carrying -= weight;	1010	op->carrying -= weight;
1024	op = op->env;	1011	op = op->env;
1025	}	1012	}
1026	}	1013	}
1027		1014
1028	/* remove_ob(op):	1015	/* op->remove ():
1029	* This function removes the object op from the linked list of objects	1016	* This function removes the object op from the linked list of objects
1030	* which it is currently tied to. When this function is done, the	1017	* which it is currently tied to. When this function is done, the
1031	* object will have no environment. If the object previously had an	1018	* object will have no environment. If the object previously had an
1032	* environment, the x and y coordinates will be updated to	1019	* environment, the x and y coordinates will be updated to
1033	* the previous environment.	1020	* the previous environment.
1034	* Beware: This function is called from the editor as well!	1021	* Beware: This function is called from the editor as well!
1035	*/	1022	*/
1036
1037	void	1023	void
1038	remove_ob (object *op)	1024	object::remove ()
1039	{	1025	{
		1026	object *tmp, *last = 0;
1040	object *	1027	object *otmp;
1041	tmp, *
1042	last = NULL;
1043	object *
1044	otmp;
1045		1028
1046	tag_t
1047	tag;
1048	int
1049	check_walk_off;	1029	int check_walk_off;
1050	mapstruct *
1051	m;
1052		1030
1053	sint16
1054	x,
1055	y;
1056
1057	if (QUERY_FLAG (op, FLAG_REMOVED))	1031	if (QUERY_FLAG (this, FLAG_REMOVED))
1058	return;	1032	return;
1059		1033
1060	SET_FLAG (op, FLAG_REMOVED);	1034	SET_FLAG (this, FLAG_REMOVED);
1061		1035
1062	if (op->more != NULL)	1036	if (more)
1063	remove_ob (op->more);	1037	more->remove ();
1064		1038
1065	/*	1039	/*
1066	* In this case, the object to be removed is in someones	1040	* In this case, the object to be removed is in someones
1067	* inventory.	1041	* inventory.
1068	*/	1042	*/
1069	if (op->env != NULL)	1043	if (env)
1070	{	1044	{
1071	if (op->nrof)	1045	if (nrof)
1072	sub_weight (op->env, op->weight * op->nrof);	1046	sub_weight (env, weight * nrof);
1073	else	1047	else
1074	sub_weight (op->env, op->weight + op->carrying);	1048	sub_weight (env, weight + carrying);
1075		1049
1076	/* NO_FIX_PLAYER is set when a great many changes are being	1050	/* NO_FIX_PLAYER is set when a great many changes are being
1077	* made to players inventory. If set, avoiding the call	1051	* made to players inventory. If set, avoiding the call
1078	* to save cpu time.	1052	* to save cpu time.
1079	*/	1053	*/
1080	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1054	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1081	fix_player (otmp);	1055	fix_player (otmp);
1082		1056
1083	if (op->above != NULL)	1057	if (above != NULL)
1084	op->above->below = op->below;	1058	above->below = below;
1085	else	1059	else
1086	op->env->inv = op->below;	1060	env->inv = below;
1087		1061
1088	if (op->below != NULL)	1062	if (below != NULL)
1089	op->below->above = op->above;	1063	below->above = above;
1090		1064
1091	/* we set up values so that it could be inserted into	1065	/* we set up values so that it could be inserted into
1092	* the map, but we don't actually do that - it is up	1066	* the map, but we don't actually do that - it is up
1093	* to the caller to decide what we want to do.	1067	* to the caller to decide what we want to do.
1094	*/	1068	*/
1095	op->x = op->env->x, op->y = op->env->y;	1069	x = env->x, y = env->y;
1096	op->map = op->env->map;	1070	map = env->map;
1097	op->above = NULL, op->below = NULL;	1071	above = 0, below = 0;
1098	op->env = NULL;	1072	env = 0;
1099	}	1073	}
1100	else if (op->map)	1074	else if (map)
1101	{	1075	{
1102	x = op->x;
1103	y = op->y;
1104	m = get_map_from_coord (op->map, &x, &y);
1105
1106	if (!m)
1107	{
1108	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1109	op->map->path, op->x, op->y);
1110	/* in old days, we used to set x and y to 0 and continue.
1111	* it seems if we get into this case, something is probablye
1112	* screwed up and should be fixed.
1113	*/
1114	abort ();
1115	}
1116
1117	if (op->map != m)
1118	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1119	op->map->path, m->path, op->x, op->y, x, y);
1120
1121	/* Re did the following section of code - it looks like it had	1076	/* Re did the following section of code - it looks like it had
1122	* lots of logic for things we no longer care about	1077	* lots of logic for things we no longer care about
1123	*/	1078	*/
1124		1079
1125	/* link the object above us */	1080	/* link the object above us */
1126	if (op->above)	1081	if (above)
1127	op->above->below = op->below;	1082	above->below = below;
1128	else	1083	else
1129	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1084	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1130		1085
1131	/* Relink the object below us, if there is one */	1086	/* Relink the object below us, if there is one */
1132	if (op->below)	1087	if (below)
1133	op->below->above = op->above;	1088	below->above = above;
1134	else	1089	else
1135	{	1090	{
1136	/* Nothing below, which means we need to relink map object for this space	1091	/* Nothing below, which means we need to relink map object for this space
1137	* use translated coordinates in case some oddness with map tiling is	1092	* use translated coordinates in case some oddness with map tiling is
1138	* evident	1093	* evident
1139	*/	1094	*/
1140	if (GET_MAP_OB (m, x, y) != op)	1095	if (GET_MAP_OB (map, x, y) != this)
1141	{	1096	{
1142	dump_object (op);	1097	char *dump = dump_object (this);
1143	LOG (llevError,	1098	LOG (llevError,
1144	"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);	1099	"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);
		1100	free (dump);
1145	dump_object (GET_MAP_OB (m, x, y));	1101	dump = dump_object (GET_MAP_OB (map, x, y));
1146	LOG (llevError, "%s\n", errmsg);	1102	LOG (llevError, "%s\n", dump);
		1103	free (dump);
1147	}	1104	}
1148		1105
1149	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1106	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1150	}	1107	}
1151		1108
1152	op->above = 0;	1109	above = 0;
1153	op->below = 0;	1110	below = 0;
1154		1111
1155	if (op->map->in_memory == MAP_SAVING)	1112	if (map->in_memory == MAP_SAVING)
1156	return;	1113	return;
1157		1114
1158	tag = op->count;
1159	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1115	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1160		1116
1161	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1117	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1162	{	1118	{
1163	/* No point updating the players look faces if he is the object	1119	/* No point updating the players look faces if he is the object
1164	* being removed.	1120	* being removed.
1165	*/	1121	*/
1166		1122
1167	if (tmp->type == PLAYER && tmp != op)	1123	if (tmp->type == PLAYER && tmp != this)
1168	{	1124	{
1169	/* If a container that the player is currently using somehow gets	1125	/* If a container that the player is currently using somehow gets
1170	* removed (most likely destroyed), update the player view	1126	* removed (most likely destroyed), update the player view
1171	* appropriately.	1127	* appropriately.
1172	*/	1128	*/
1173	if (tmp->container == op)	1129	if (tmp->container == this)
1174	{	1130	{
1175	CLEAR_FLAG (op, FLAG_APPLIED);	1131	CLEAR_FLAG (this, FLAG_APPLIED);
1176	tmp->container = NULL;	1132	tmp->container = 0;
1177	}	1133	}
1178		1134
1179	tmp->contr->socket.update_look = 1;	1135	tmp->contr->socket.update_look = 1;
1180	}	1136	}
1181		1137
1182	/* See if player moving off should effect something */	1138	/* See if player moving off should effect something */
1183	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1139	if (check_walk_off
		1140	&& ((move_type & tmp->move_off)
		1141	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1184	{	1142	{
1185	move_apply (tmp, op, NULL);	1143	move_apply (tmp, this, 0);
1186		1144
1187	if (was_destroyed (op, tag))	1145	if (destroyed ())
1188	{
1189	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1146	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1190	}
1191	}	1147	}
1192		1148
1193	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1149	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1194		1150
1195	if (tmp->above == tmp)	1151	if (tmp->above == tmp)
1196	tmp->above = NULL;	1152	tmp->above = 0;
1197		1153
1198	last = tmp;	1154	last = tmp;
1199	}	1155	}
1200		1156
1201	/* last == NULL of there are no objects on this space */	1157	/* last == NULL of there are no objects on this space */
1202	if (last == NULL)	1158	if (!last)
1203	{	1159	{
1204	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1160	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1205	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1161	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1206	* those out anyways, and if there are any flags set right now, they won't	1162	* those out anyways, and if there are any flags set right now, they won't
1207	* be correct anyways.	1163	* be correct anyways.
1208	*/	1164	*/
1209	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1165	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1210	update_position (op->map, op->x, op->y);	1166	update_position (map, x, y);
1211	}	1167	}
1212	else	1168	else
1213	update_object (last, UP_OBJ_REMOVE);	1169	update_object (last, UP_OBJ_REMOVE);
1214		1170
1215	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1171	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1216	update_all_los (op->map, op->x, op->y);	1172	update_all_los (map, x, y);
1217	}	1173	}
1218	}	1174	}
1219		1175
1220	/*	1176	/*
1221	* merge_ob(op,top):	1177	* merge_ob(op,top):
…		…
1223	* This function goes through all objects below and including top, and	1179	* This function goes through all objects below and including top, and
1224	* merges op to the first matching object.	1180	* merges op to the first matching object.
1225	* If top is NULL, it is calculated.	1181	* If top is NULL, it is calculated.
1226	* Returns pointer to object if it succeded in the merge, otherwise NULL	1182	* Returns pointer to object if it succeded in the merge, otherwise NULL
1227	*/	1183	*/
1228
1229	object *	1184	object *
1230	merge_ob (object *op, object *top)	1185	merge_ob (object *op, object *top)
1231	{	1186	{
1232	if (!op->nrof)	1187	if (!op->nrof)
1233	return 0;	1188	return 0;
…		…
1243	{	1198	{
1244	top->nrof += op->nrof;	1199	top->nrof += op->nrof;
1245		1200
1246	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1201	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1247	op->weight = 0; /* Don't want any adjustements now */	1202	op->weight = 0; /* Don't want any adjustements now */
1248	remove_ob (op);	1203	op->destroy ();
1249	free_object (op);
1250	return top;	1204	return top;
1251	}	1205	}
1252	}	1206	}
1253		1207
1254	return NULL;	1208	return 0;
1255	}	1209	}
1256		1210
1257	/*	1211	/*
1258	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1212	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1259	* job preparing multi-part monsters	1213	* job preparing multi-part monsters
1260	*/	1214	*/
1261	object *	1215	object *
1262	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1216	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1263	{	1217	{
1264	object *tmp;	1218	object *tmp;
1265		1219
1266	if (op->head)	1220	if (op->head)
1267	op = op->head;	1221	op = op->head;
…		…
1295	* NULL if 'op' was destroyed	1249	* NULL if 'op' was destroyed
1296	* just 'op' otherwise	1250	* just 'op' otherwise
1297	*/	1251	*/
1298		1252
1299	object *	1253	object *
1300	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1254	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1301	{	1255	{
1302	object *tmp, *top, *floor = NULL;	1256	object *tmp, *top, *floor = NULL;
1303	sint16 x, y;	1257	sint16 x, y;
1304		1258
1305	if (QUERY_FLAG (op, FLAG_FREED))	1259	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1308	return NULL;	1262	return NULL;
1309	}	1263	}
1310		1264
1311	if (m == NULL)	1265	if (m == NULL)
1312	{	1266	{
1313	dump_object (op);	1267	char *dump = dump_object (op);
1314	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1268	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1269	free (dump);
1315	return op;	1270	return op;
1316	}	1271	}
1317		1272
1318	if (out_of_map (m, op->x, op->y))	1273	if (out_of_map (m, op->x, op->y))
1319	{	1274	{
1320	dump_object (op);	1275	char *dump = dump_object (op);
1321	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1276	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1322	#ifdef MANY_CORES	1277	#ifdef MANY_CORES
1323	/* Better to catch this here, as otherwise the next use of this object	1278	/* Better to catch this here, as otherwise the next use of this object
1324	* is likely to cause a crash. Better to find out where it is getting	1279	* is likely to cause a crash. Better to find out where it is getting
1325	* improperly inserted.	1280	* improperly inserted.
1326	*/	1281	*/
1327	abort ();	1282	abort ();
1328	#endif	1283	#endif
		1284	free (dump);
1329	return op;	1285	return op;
1330	}	1286	}
1331		1287
1332	if (!QUERY_FLAG (op, FLAG_REMOVED))	1288	if (!QUERY_FLAG (op, FLAG_REMOVED))
1333	{	1289	{
1334	dump_object (op);	1290	char *dump = dump_object (op);
1335	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1291	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1292	free (dump);
1336	return op;	1293	return op;
1337	}	1294	}
1338		1295
1339	if (op->more != NULL)	1296	if (op->more != NULL)
1340	{	1297	{
…		…
1381	if (op->nrof && !(flag & INS_NO_MERGE))	1338	if (op->nrof && !(flag & INS_NO_MERGE))
1382	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1339	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1383	if (CAN_MERGE (op, tmp))	1340	if (CAN_MERGE (op, tmp))
1384	{	1341	{
1385	op->nrof += tmp->nrof;	1342	op->nrof += tmp->nrof;
1386	remove_ob (tmp);	1343	tmp->destroy ();
1387	free_object (tmp);
1388	}	1344	}
1389		1345
1390	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1346	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1391	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1347	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1392		1348
…		…
1578	tmp1;	1534	tmp1;
1579		1535
1580	/* first search for itself and remove any old instances */	1536	/* first search for itself and remove any old instances */
1581		1537
1582	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1538	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1583	{
1584	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1539	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1585	{	1540	tmp->destroy ();
1586	remove_ob (tmp);
1587	free_object (tmp);
1588	}
1589	}
1590		1541
1591	tmp1 = arch_to_object (find_archetype (arch_string));	1542	tmp1 = arch_to_object (archetype::find (arch_string));
1592		1543
1593	tmp1->x = op->x;	1544	tmp1->x = op->x;
1594	tmp1->y = op->y;	1545	tmp1->y = op->y;
1595	insert_ob_in_map (tmp1, op->map, op, 0);	1546	insert_ob_in_map (tmp1, op->map, op, 0);
1596	}	1547	}
…		…
1604	*/	1555	*/
1605		1556
1606	object *	1557	object *
1607	get_split_ob (object *orig_ob, uint32 nr)	1558	get_split_ob (object *orig_ob, uint32 nr)
1608	{	1559	{
1609	object *	1560	object *newob;
1610	newob;
1611	int
1612	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1561	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1613		1562
1614	if (orig_ob->nrof < nr)	1563	if (orig_ob->nrof < nr)
1615	{	1564	{
1616	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1565	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1617	return NULL;	1566	return NULL;
1618	}	1567	}
1619		1568
1620	newob = object_create_clone (orig_ob);	1569	newob = object_create_clone (orig_ob);
1621		1570
1622	if ((orig_ob->nrof -= nr) < 1)	1571	if ((orig_ob->nrof -= nr) < 1)
1623	{	1572	orig_ob->destroy (1);
1624	if (!is_removed)
1625	remove_ob (orig_ob);
1626	free_object2 (orig_ob, 1);
1627	}
1628	else if (!is_removed)	1573	else if (!is_removed)
1629	{	1574	{
1630	if (orig_ob->env != NULL)	1575	if (orig_ob->env != NULL)
1631	sub_weight (orig_ob->env, orig_ob->weight * nr);	1576	sub_weight (orig_ob->env, orig_ob->weight * nr);
1632	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1577	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1696	esrv_send_item (tmp, op);	1641	esrv_send_item (tmp, op);
1697	}	1642	}
1698	}	1643	}
1699	else	1644	else
1700	{	1645	{
1701	remove_ob (op);	1646	op->remove ();
1702	op->nrof = 0;	1647	op->nrof = 0;
1703	if (tmp)	1648	if (tmp)
1704	{	1649	{
1705	esrv_del_item (tmp->contr, op->count);	1650	esrv_del_item (tmp->contr, op->count);
1706	}	1651	}
…		…
1712		1657
1713	if (i < op->nrof)	1658	if (i < op->nrof)
1714	op->nrof -= i;	1659	op->nrof -= i;
1715	else	1660	else
1716	{	1661	{
1717	remove_ob (op);	1662	op->remove ();
1718	op->nrof = 0;	1663	op->nrof = 0;
1719	}	1664	}
1720		1665
1721	/* Since we just removed op, op->above is null */	1666	/* Since we just removed op, op->above is null */
1722	for (tmp = above; tmp != NULL; tmp = tmp->above)	1667	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1731		1676
1732	if (op->nrof)	1677	if (op->nrof)
1733	return op;	1678	return op;
1734	else	1679	else
1735	{	1680	{
1736	free_object (op);	1681	op->destroy ();
1737	return NULL;	1682	return NULL;
1738	}	1683	}
1739	}	1684	}
1740		1685
1741	/*	1686	/*
…		…
1754	op->carrying += weight;	1699	op->carrying += weight;
1755	op = op->env;	1700	op = op->env;
1756	}	1701	}
1757	}	1702	}
1758		1703
		1704	object *
		1705	insert_ob_in_ob (object *op, object *where)
		1706	{
		1707	if (!where)
		1708	{
		1709	char *dump = dump_object (op);
		1710	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1711	free (dump);
		1712	return op;
		1713	}
		1714
		1715	if (where->head)
		1716	{
		1717	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1718	where = where->head;
		1719	}
		1720
		1721	return where->insert (op);
		1722	}
		1723
1759	/*	1724	/*
1760	* insert_ob_in_ob(op,environment):	1725	* env->insert (op)
1761	* This function inserts the object op in the linked list	1726	* This function inserts the object op in the linked list
1762	* inside the object environment.	1727	* inside the object environment.
1763	*	1728	*
1764	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1765	* the inventory at the last position or next to other objects of the same
1766	* type.
1767	* Frank: Now sorted by type, archetype and magic!
1768	*
1769	* The function returns now pointer to inserted item, and return value can	1729	* The function returns now pointer to inserted item, and return value can
1770	* be != op, if items are merged. -Tero	1730	* be != op, if items are merged. -Tero
1771	*/	1731	*/
1772		1732
1773	object *	1733	object *
1774	insert_ob_in_ob (object *op, object *where)	1734	object::insert (object *op)
1775	{	1735	{
1776	object *	1736	object *tmp, *otmp;
1777	tmp, *
1778	otmp;
1779		1737
1780	if (!QUERY_FLAG (op, FLAG_REMOVED))	1738	if (!QUERY_FLAG (op, FLAG_REMOVED))
1781	{	1739	op->remove ();
1782	dump_object (op);
1783	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1784	return op;
1785	}
1786
1787	if (where == NULL)
1788	{
1789	dump_object (op);
1790	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1791	return op;
1792	}
1793
1794	if (where->head)
1795	{
1796	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1797	where = where->head;
1798	}
1799		1740
1800	if (op->more)	1741	if (op->more)
1801	{	1742	{
1802	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1743	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1803	return op;	1744	return op;
…		…
1805		1746
1806	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1747	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1807	CLEAR_FLAG (op, FLAG_REMOVED);	1748	CLEAR_FLAG (op, FLAG_REMOVED);
1808	if (op->nrof)	1749	if (op->nrof)
1809	{	1750	{
1810	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1751	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1811	if (CAN_MERGE (tmp, op))	1752	if (CAN_MERGE (tmp, op))
1812	{	1753	{
1813	/* return the original object and remove inserted object	1754	/* return the original object and remove inserted object
1814	(client needs the original object) */	1755	(client needs the original object) */
1815	tmp->nrof += op->nrof;	1756	tmp->nrof += op->nrof;
1816	/* Weight handling gets pretty funky. Since we are adding to	1757	/* Weight handling gets pretty funky. Since we are adding to
1817	* tmp->nrof, we need to increase the weight.	1758	* tmp->nrof, we need to increase the weight.
1818	*/	1759	*/
1819	add_weight (where, op->weight * op->nrof);	1760	add_weight (this, op->weight * op->nrof);
1820	SET_FLAG (op, FLAG_REMOVED);	1761	SET_FLAG (op, FLAG_REMOVED);
1821	free_object (op); /* free the inserted object */	1762	op->destroy (); /* free the inserted object */
1822	op = tmp;	1763	op = tmp;
1823	remove_ob (op); /* and fix old object's links */	1764	op->remove (); /* and fix old object's links */
1824	CLEAR_FLAG (op, FLAG_REMOVED);	1765	CLEAR_FLAG (op, FLAG_REMOVED);
1825	break;	1766	break;
1826	}	1767	}
1827		1768
1828	/* I assume combined objects have no inventory	1769	/* I assume combined objects have no inventory
1829	* We add the weight - this object could have just been removed	1770	* We add the weight - this object could have just been removed
1830	* (if it was possible to merge). calling remove_ob will subtract	1771	* (if it was possible to merge). calling remove_ob will subtract
1831	* the weight, so we need to add it in again, since we actually do	1772	* the weight, so we need to add it in again, since we actually do
1832	* the linking below	1773	* the linking below
1833	*/	1774	*/
1834	add_weight (where, op->weight * op->nrof);	1775	add_weight (this, op->weight * op->nrof);
1835	}	1776	}
1836	else	1777	else
1837	add_weight (where, (op->weight + op->carrying));	1778	add_weight (this, (op->weight + op->carrying));
1838		1779
1839	otmp = is_player_inv (where);	1780	otmp = is_player_inv (this);
1840	if (otmp && otmp->contr != NULL)	1781	if (otmp && otmp->contr)
1841	{
1842	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1782	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1843	fix_player (otmp);	1783	fix_player (otmp);
1844	}
1845		1784
1846	op->map = NULL;	1785	op->map = NULL;
1847	op->env = where;	1786	op->env = this;
1848	op->above = NULL;	1787	op->above = NULL;
1849	op->below = NULL;	1788	op->below = NULL;
1850	op->x = 0, op->y = 0;	1789	op->x = 0, op->y = 0;
1851		1790
1852	/* reset the light list and los of the players on the map */	1791	/* reset the light list and los of the players on the map */
1853	if ((op->glow_radius != 0) && where->map)	1792	if ((op->glow_radius != 0) && map)
1854	{	1793	{
1855	#ifdef DEBUG_LIGHTS	1794	#ifdef DEBUG_LIGHTS
1856	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1795	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1857	#endif /* DEBUG_LIGHTS */	1796	#endif /* DEBUG_LIGHTS */
1858	if (MAP_DARKNESS (where->map))	1797	if (MAP_DARKNESS (map))
1859	update_all_los (where->map, where->x, where->y);	1798	update_all_los (map, x, y);
1860	}	1799	}
1861		1800
1862	/* Client has no idea of ordering so lets not bother ordering it here.	1801	/* Client has no idea of ordering so lets not bother ordering it here.
1863	* It sure simplifies this function...	1802	* It sure simplifies this function...
1864	*/	1803	*/
1865	if (where->inv == NULL)	1804	if (!inv)
1866	where->inv = op;	1805	inv = op;
1867	else	1806	else
1868	{	1807	{
1869	op->below = where->inv;	1808	op->below = inv;
1870	op->below->above = op;	1809	op->below->above = op;
1871	where->inv = op;	1810	inv = op;
1872	}	1811	}
		1812
1873	return op;	1813	return op;
1874	}	1814	}
1875		1815
1876	/*	1816	/*
1877	* Checks if any objects has a move_type that matches objects	1817	* Checks if any objects has a move_type that matches objects
…		…
1895	*/	1835	*/
1896		1836
1897	int	1837	int
1898	check_move_on (object *op, object *originator)	1838	check_move_on (object *op, object *originator)
1899	{	1839	{
1900	object *	1840	object *tmp;
1901	tmp;	1841	maptile *m = op->map;
1902	tag_t
1903	tag;
1904	mapstruct *
1905	m = op->map;
1906	int
1907	x = op->x, y = op->y;	1842	int x = op->x, y = op->y;
1908		1843
1909	MoveType	1844	MoveType move_on, move_slow, move_block;
1910	move_on,
1911	move_slow,
1912	move_block;
1913		1845
1914	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1846	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1915	return 0;	1847	return 0;
1916
1917	tag = op->count;
1918		1848
1919	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1849	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1920	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1850	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1921	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1851	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1922		1852
…		…
1983	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1913	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1984	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1914	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1985	{	1915	{
1986	move_apply (tmp, op, originator);	1916	move_apply (tmp, op, originator);
1987		1917
1988	if (was_destroyed (op, tag))	1918	if (op->destroyed ())
1989	return 1;	1919	return 1;
1990		1920
1991	/* what the person/creature stepped onto has moved the object	1921	/* what the person/creature stepped onto has moved the object
1992	* someplace new. Don't process any further - if we did,	1922	* someplace new. Don't process any further - if we did,
1993	* have a feeling strange problems would result.	1923	* have a feeling strange problems would result.
…		…
2005	* a matching archetype at the given map and coordinates.	1935	* a matching archetype at the given map and coordinates.
2006	* The first matching object is returned, or NULL if none.	1936	* The first matching object is returned, or NULL if none.
2007	*/	1937	*/
2008		1938
2009	object *	1939	object *
2010	present_arch (const archetype *at, mapstruct *m, int x, int y)	1940	present_arch (const archetype *at, maptile *m, int x, int y)
2011	{	1941	{
2012	object *	1942	object *
2013	tmp;	1943	tmp;
2014		1944
2015	if (m == NULL || out_of_map (m, x, y))	1945	if (m == NULL || out_of_map (m, x, y))
…		…
2028	* a matching type variable at the given map and coordinates.	1958	* a matching type variable at the given map and coordinates.
2029	* The first matching object is returned, or NULL if none.	1959	* The first matching object is returned, or NULL if none.
2030	*/	1960	*/
2031		1961
2032	object *	1962	object *
2033	present (unsigned char type, mapstruct *m, int x, int y)	1963	present (unsigned char type, maptile *m, int x, int y)
2034	{	1964	{
2035	object *	1965	object *
2036	tmp;	1966	tmp;
2037		1967
2038	if (out_of_map (m, x, y))	1968	if (out_of_map (m, x, y))
…		…
2178	* the archetype because that isn't correct if the monster has been	2108	* the archetype because that isn't correct if the monster has been
2179	* customized, changed states, etc.	2109	* customized, changed states, etc.
2180	*/	2110	*/
2181		2111
2182	int	2112	int
2183	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2113	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2184	{	2114	{
2185	int	2115	int
2186	i,	2116	i,
2187	index = 0, flag;	2117	index = 0, flag;
2188	static int	2118	static int
…		…
2209	return -1;	2139	return -1;
2210	return altern[RANDOM () % index];	2140	return altern[RANDOM () % index];
2211	}	2141	}
2212		2142
2213	/*	2143	/*
2214	* find_first_free_spot(archetype, mapstruct, x, y) works like	2144	* find_first_free_spot(archetype, maptile, x, y) works like
2215	* find_free_spot(), but it will search max number of squares.	2145	* find_free_spot(), but it will search max number of squares.
2216	* But it will return the first available spot, not a random choice.	2146	* But it will return the first available spot, not a random choice.
2217	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2147	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2218	*/	2148	*/
2219		2149
2220	int	2150	int
2221	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2151	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2222	{	2152	{
2223	int	2153	int
2224	i;	2154	i;
2225		2155
2226	for (i = 0; i < SIZEOFFREE; i++)	2156	for (i = 0; i < SIZEOFFREE; i++)
…		…
2290	* because we have to know what movement the thing looking to move	2220	* because we have to know what movement the thing looking to move
2291	* there is capable of.	2221	* there is capable of.
2292	*/	2222	*/
2293		2223
2294	int	2224	int
2295	find_dir (mapstruct *m, int x, int y, object *exclude)	2225	find_dir (maptile *m, int x, int y, object *exclude)
2296	{	2226	{
2297	int	2227	int
2298	i,	2228	i,
2299	max = SIZEOFFREE, mflags;	2229	max = SIZEOFFREE, mflags;
2300		2230
2301	sint16 nx, ny;	2231	sint16 nx, ny;
2302	object *	2232	object *
2303	tmp;	2233	tmp;
2304	mapstruct *	2234	maptile *
2305	mp;	2235	mp;
2306		2236
2307	MoveType blocked, move_type;	2237	MoveType blocked, move_type;
2308		2238
2309	if (exclude && exclude->head)	2239	if (exclude && exclude->head)
…		…
2517	* Modified to be map tile aware -.MSW	2447	* Modified to be map tile aware -.MSW
2518	*/	2448	*/
2519		2449
2520		2450
2521	int	2451	int
2522	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2452	can_see_monsterP (maptile *m, int x, int y, int dir)
2523	{	2453	{
2524	sint16 dx, dy;	2454	sint16 dx, dy;
2525	int	2455	int
2526	mflags;	2456	mflags;
2527		2457
…		…
2576	* create clone from object to another	2506	* create clone from object to another
2577	*/	2507	*/
2578	object *	2508	object *
2579	object_create_clone (object *asrc)	2509	object_create_clone (object *asrc)
2580	{	2510	{
2581	object *
2582	dst = NULL, *tmp, *src, *part, *prev, *item;	2511	object *dst = 0, *tmp, *src, *part, *prev, *item;
2583		2512
2584	if (!asrc)	2513	if (!asrc)
2585	return NULL;	2514	return 0;
		2515
2586	src = asrc;	2516	src = asrc;
2587	if (src->head)	2517	if (src->head)
2588	src = src->head;	2518	src = src->head;
2589		2519
2590	prev = NULL;	2520	prev = 0;
2591	for (part = src; part; part = part->more)	2521	for (part = src; part; part = part->more)
2592	{	2522	{
2593	tmp = get_object ();	2523	tmp = object::create ();
2594	copy_object (part, tmp);	2524	part->copy_to (tmp);
2595	tmp->x -= src->x;	2525	tmp->x -= src->x;
2596	tmp->y -= src->y;	2526	tmp->y -= src->y;
		2527
2597	if (!part->head)	2528	if (!part->head)
2598	{	2529	{
2599	dst = tmp;	2530	dst = tmp;
2600	tmp->head = NULL;	2531	tmp->head = 0;
2601	}	2532	}
2602	else	2533	else
2603	{	2534	{
2604	tmp->head = dst;	2535	tmp->head = dst;
2605	}	2536	}
		2537
2606	tmp->more = NULL;	2538	tmp->more = 0;
		2539
2607	if (prev)	2540	if (prev)
2608	prev->more = tmp;	2541	prev->more = tmp;
		2542
2609	prev = tmp;	2543	prev = tmp;
2610	}	2544	}
2611		2545
2612	/*** copy inventory ***/
2613	for (item = src->inv; item; item = item->below)	2546	for (item = src->inv; item; item = item->below)
2614	{
2615	(void) insert_ob_in_ob (object_create_clone (item), dst);	2547	insert_ob_in_ob (object_create_clone (item), dst);
2616	}
2617		2548
2618	return dst;	2549	return dst;
2619	}	2550	}
2620		2551
2621	/* return true if the object was destroyed, 0 otherwise */
2622	int
2623	was_destroyed (const object *op, tag_t old_tag)
2624	{
2625	/* checking for FLAG_FREED isn't necessary, but makes this function more
2626	* robust */
2627	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2628	}
2629
2630	/* GROS - Creates an object using a string representing its content. */	2552	/* GROS - Creates an object using a string representing its content. */
2631
2632	/* Basically, we save the content of the string to a temp file, then call */	2553	/* Basically, we save the content of the string to a temp file, then call */
2633
2634	/* load_object on it. I admit it is a highly inefficient way to make things, */	2554	/* load_object on it. I admit it is a highly inefficient way to make things, */
2635
2636	/* but it was simple to make and allows reusing the load_object function. */	2555	/* but it was simple to make and allows reusing the load_object function. */
2637
2638	/* Remember not to use load_object_str in a time-critical situation. */	2556	/* Remember not to use load_object_str in a time-critical situation. */
2639
2640	/* Also remember that multiparts objects are not supported for now. */	2557	/* Also remember that multiparts objects are not supported for now. */
2641		2558
2642	object *	2559	object *
2643	load_object_str (const char *obstr)	2560	load_object_str (const char *obstr)
2644	{	2561	{
2645	object *	2562	object *op;
2646	op;
2647	char
2648	filename[MAX_BUF];	2563	char filename[MAX_BUF];
2649		2564
2650	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2565	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2651		2566
2652	FILE *
2653	tempfile = fopen (filename, "w");	2567	FILE *tempfile = fopen (filename, "w");
2654		2568
2655	if (tempfile == NULL)	2569	if (tempfile == NULL)
2656	{	2570	{
2657	LOG (llevError, "Error - Unable to access load object temp file\n");	2571	LOG (llevError, "Error - Unable to access load object temp file\n");
2658	return NULL;	2572	return NULL;
2659	};	2573	}
		2574
2660	fprintf (tempfile, obstr);	2575	fprintf (tempfile, obstr);
2661	fclose (tempfile);	2576	fclose (tempfile);
2662		2577
2663	op = get_object ();	2578	op = object::create ();
2664		2579
2665	object_thawer thawer (filename);	2580	object_thawer thawer (filename);
2666		2581
2667	if (thawer)	2582	if (thawer)
2668	load_object (thawer, op, 0);	2583	load_object (thawer, op, 0);
…		…
2678	* returns NULL if no match.	2593	* returns NULL if no match.
2679	*/	2594	*/
2680	object *	2595	object *
2681	find_obj_by_type_subtype (const object *who, int type, int subtype)	2596	find_obj_by_type_subtype (const object *who, int type, int subtype)
2682	{	2597	{
2683	object *	2598	object *tmp;
2684	tmp;
2685		2599
2686	for (tmp = who->inv; tmp; tmp = tmp->below)	2600	for (tmp = who->inv; tmp; tmp = tmp->below)
2687	if (tmp->type == type && tmp->subtype == subtype)	2601	if (tmp->type == type && tmp->subtype == subtype)
2688	return tmp;	2602	return tmp;
2689		2603
…		…
2697	* do the desired thing.	2611	* do the desired thing.
2698	*/	2612	*/
2699	key_value *	2613	key_value *
2700	get_ob_key_link (const object *ob, const char *key)	2614	get_ob_key_link (const object *ob, const char *key)
2701	{	2615	{
2702	key_value *	2616	key_value *link;
2703	link;
2704		2617
2705	for (link = ob->key_values; link != NULL; link = link->next)	2618	for (link = ob->key_values; link != NULL; link = link->next)
2706	{
2707	if (link->key == key)	2619	if (link->key == key)
2708	{
2709	return link;	2620	return link;
2710	}
2711	}
2712		2621
2713	return NULL;	2622	return NULL;
2714	}	2623	}
2715		2624
2716	/*	2625	/*
…		…
2721	* The returned string is shared.	2630	* The returned string is shared.
2722	*/	2631	*/
2723	const char *	2632	const char *
2724	get_ob_key_value (const object *op, const char *const key)	2633	get_ob_key_value (const object *op, const char *const key)
2725	{	2634	{
2726	key_value *	2635	key_value *link;
2727	link;	2636	shstr_cmp canonical_key (key);
2728	const char *
2729	canonical_key;
2730		2637
2731	canonical_key = shstr::find (key);
2732
2733	if (canonical_key == NULL)	2638	if (!canonical_key)
2734	{	2639	{
2735	/* 1. There being a field named key on any object	2640	/* 1. There being a field named key on any object
2736	* implies there'd be a shared string to find.	2641	* implies there'd be a shared string to find.
2737	* 2. Since there isn't, no object has this field.	2642	* 2. Since there isn't, no object has this field.
2738	* 3. Therefore, *this* object doesn't have this field.	2643	* 3. Therefore, *this* object doesn't have this field.
2739	*/	2644	*/
2740	return NULL;	2645	return 0;
2741	}	2646	}
2742		2647
2743	/* This is copied from get_ob_key_link() above -	2648	/* This is copied from get_ob_key_link() above -
2744	* only 4 lines, and saves the function call overhead.	2649	* only 4 lines, and saves the function call overhead.
2745	*/	2650	*/
2746	for (link = op->key_values; link != NULL; link = link->next)	2651	for (link = op->key_values; link; link = link->next)
2747	{
2748	if (link->key == canonical_key)	2652	if (link->key == canonical_key)
2749	{
2750	return link->value;	2653	return link->value;
2751	}	2654
2752	}
2753	return NULL;	2655	return 0;
2754	}	2656	}
2755		2657
2756		2658
2757	/*	2659	/*
2758	* Updates the canonical_key in op to value.	2660	* Updates the canonical_key in op to value.
…		…
2844	shstr key_ (key);	2746	shstr key_ (key);
2845		2747
2846	return set_ob_key_value_s (op, key_, value, add_key);	2748	return set_ob_key_value_s (op, key_, value, add_key);
2847	}	2749	}
2848		2750
		2751	object::depth_iterator::depth_iterator (object *container)
		2752	: iterator_base (container)
		2753	{
		2754	while (item->inv)
		2755	item = item->inv;
		2756	}
		2757
2849	void	2758	void
2850	object::deep_iterator::next ()	2759	object::depth_iterator::next ()
2851	{	2760	{
2852	if (item->inv)
2853	item = item->inv;
2854	else if (item->below)	2761	if (item->below)
		2762	{
2855	item = item->below;	2763	item = item->below;
		2764
		2765	while (item->inv)
		2766	item = item->inv;
		2767	}
2856	else	2768	else
2857	item = item->env->below;	2769	item = item->env;
2858	}	2770	}
		2771
		2772	// return a suitable string describing an objetc in enough detail to find it
		2773	const char *
		2774	object::debug_desc (char *info) const
		2775	{
		2776	char info2[256 * 3];
		2777	char *p = info;
		2778
		2779	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2780	count,
		2781	&name,
		2782	title ? " " : "",
		2783	title ? (const char *)title : "");
		2784
		2785	if (env)
		2786	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2787
		2788	if (map)
		2789	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2790
		2791	return info;
		2792	}
		2793
		2794	const char *
		2795	object::debug_desc () const
		2796	{
		2797	static char info[256 * 3];
		2798	return debug_desc (info);
		2799	}
		2800

Diff Legend

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