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.34 by root, Tue Sep 12 01:09:53 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. */
…		…
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
36	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
37		38
38	object *objects; /* Pointer to the list of used objects */
39	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 */
40		40
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,	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,
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	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
43	};	43	};
…		…
49	};	49	};
50	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
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,	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,
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	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
53	};	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	}
54		131
55	/* 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. */
56	static int	133	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	135	{
…		…
254	{	331	{
255	if (inv->inv)	332	if (inv->inv)
256	sum_weight (inv);	333	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	335	}
		336
259	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
261	if (op->carrying != sum)	340	if (op->carrying != sum)
262	op->carrying = sum;	341	op->carrying = sum;
		342
263	return sum;	343	return sum;
264	}	344	}
265		345
266	/**	346	/**
267	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	375	* Some error messages.
296	* 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.
297	*/	377	*/
298		378
299	void	379	char *
300	dump_object2 (object *op)
301	{
302	errmsg[0] = 0;
303	return;
304	//TODO//D#d#
305	#if 0
306	char *cp;
307
308	/* object *tmp;*/
309
310	if (op->arch != NULL)
311	{
312	strcat (errmsg, "arch ");
313	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314	strcat (errmsg, "\n");
315	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316	strcat (errmsg, cp);
317	# if 0
318	/* Don't dump player diffs - they are too long, mostly meaningless, and
319	* will overflow the buffer.
320	* Changed so that we don't dump inventory either. This may
321	* also overflow the buffer.
322	*/
323	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324	strcat (errmsg, cp);
325	for (tmp = op->inv; tmp; tmp = tmp->below)
326	dump_object2 (tmp);
327	# endif
328	strcat (errmsg, "end\n");
329	}
330	else
331	{
332	strcat (errmsg, "Object ");
333	if (op->name == NULL)
334	strcat (errmsg, "(null)");
335	else
336	strcat (errmsg, op->name);
337	strcat (errmsg, "\n");
338	# if 0
339	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340	strcat (errmsg, cp);
341	for (tmp = op->inv; tmp; tmp = tmp->below)
342	dump_object2 (tmp);
343	# endif
344	strcat (errmsg, "end\n");
345	}
346	#endif
347	}
348
349	/*
350	* Dumps an object. Returns output in the static global errmsg array.
351	*/
352
353	void
354	dump_object (object *op)	380	dump_object (object *op)
355	{	381	{
356	if (op == NULL)	382	if (!op)
357	{	383	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		384
365	void	385	object_freezer freezer;
366	dump_all_objects (void)	386	save_object (freezer, op, 3);
367	{	387	return freezer.as_string ();
368	object *op;
369
370	for (op = objects; op != NULL; op = op->next)
371	{
372	dump_object (op);
373	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374	}
375	}	388	}
376		389
377	/*	390	/*
378	* 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
379	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
399	*/	412	*/
400		413
401	object *	414	object *
402	find_object (tag_t i)	415	find_object (tag_t i)
403	{	416	{
404	object *op;	417	for (object *op = object::first; op; op = op->next)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	418	if (op->count == i)
408	break;	419	return op;
		420
409	return op;	421	return 0;
410	}	422	}
411		423
412	/*	424	/*
413	* 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.
414	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
416	*/	428	*/
417		429
418	object *	430	object *
419	find_object_name (const char *str)	431	find_object_name (const char *str)
420	{	432	{
421	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
422	object *op;	434	object *op;
423		435
424	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	437	if (op->name == str_)
426	break;	438	break;
427		439
428	return op;	440	return op;
429	}	441	}
430		442
431	void	443	void
432	free_all_object_data ()	444	free_all_object_data ()
433	{	445	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}
436
437	/*
438	* Returns the object which this object marks as being the owner.
439	* A id-scheme is used to avoid pointing to objects which have been
440	* freed and are now reused. If this is detected, the owner is
441	* set to NULL, and NULL is returned.
442	* Changed 2004-02-12 - if the player is setting at the play again
443	* prompt, he is removed, and we don't want to treat him as an owner of
444	* anything, so check removed flag. I don't expect that this should break
445	* anything - once an object is removed, it is basically dead anyways.
446	*/
447	object *
448	object::get_owner ()
449	{
450	if (!owner
451	|| QUERY_FLAG (owner, FLAG_FREED)
452	|| QUERY_FLAG (owner, FLAG_REMOVED))
453	owner = 0;
454
455	return owner;
456	}	447	}
457		448
458	/*	449	/*
459	* 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
460	* skill and experience objects.	451	* skill and experience objects.
…		…
530		521
531	/* What is not cleared is next, prev, and count */	522	/* What is not cleared is next, prev, and count */
532		523
533	expmul = 1.0;	524	expmul = 1.0;
534	face = blank_face;	525	face = blank_face;
535	attacked_by_count = -1;
536		526
537	if (settings.casting_time)	527	if (settings.casting_time)
538	casting_time = -1;	528	casting_time = -1;
539	}	529	}
540		530
541	void object::clone (object *destination)
542	{
543	*(object_copy *)destination = *this;
544	*(object_pod *)destination = *this;
545
546	if (self || cb)
547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
548	}
549
550	/*	531	/*
551	* copy object first frees everything allocated by the second object,	532	* copy_to first frees everything allocated by the dst object,
552	* and then copies the contends of the first object into the second	533	* and then copies the contents of itself into the second
553	* object, allocating what needs to be allocated. Basically, any	534	* object, allocating what needs to be allocated. Basically, any
554	* 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,
555	* 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
556	* will point at garbage.	537	* will point at garbage.
557	*/	538	*/
558	void	539	void
559	copy_object (object *op2, object *op)	540	object::copy_to (object *dst)
560	{	541	{
561	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
562	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
563		544
564	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));
565		550
566	if (is_freed)	551	if (is_freed)
567	SET_FLAG (op, FLAG_FREED);	552	SET_FLAG (dst, FLAG_FREED);
		553
568	if (is_removed)	554	if (is_removed)
569	SET_FLAG (op, FLAG_REMOVED);	555	SET_FLAG (dst, FLAG_REMOVED);
570		556
571	if (op2->speed < 0)	557	if (speed < 0)
572	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	558	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
573		559
574	/* Copy over key_values, if any. */	560	/* Copy over key_values, if any. */
575	if (op2->key_values)	561	if (key_values)
576	{	562	{
577	key_value *tail = 0;	563	key_value *tail = 0;
578	key_value *i;	564	key_value *i;
579		565
580	op->key_values = 0;	566	dst->key_values = 0;
581		567
582	for (i = op2->key_values; i; i = i->next)	568	for (i = key_values; i; i = i->next)
583	{	569	{
584	key_value *new_link = new key_value;	570	key_value *new_link = new key_value;
585		571
586	new_link->next = 0;	572	new_link->next = 0;
587	new_link->key = i->key;	573	new_link->key = i->key;
588	new_link->value = i->value;	574	new_link->value = i->value;
589		575
590	/* Try and be clever here, too. */	576	/* Try and be clever here, too. */
591	if (!op->key_values)	577	if (!dst->key_values)
592	{	578	{
593	op->key_values = new_link;	579	dst->key_values = new_link;
594	tail = new_link;	580	tail = new_link;
595	}	581	}
596	else	582	else
597	{	583	{
598	tail->next = new_link;	584	tail->next = new_link;
599	tail = new_link;	585	tail = new_link;
600	}	586	}
601	}	587	}
602	}	588	}
603		589
604	update_ob_speed (op);	590	update_ob_speed (dst);
605	}	591	}
606		592
607	/*	593	/*
608	* 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
609	* 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
…		…
814	update_now = 1;	800	update_now = 1;
815		801
816	if ((move_slow | op->move_slow) != move_slow)	802	if ((move_slow | op->move_slow) != move_slow)
817	update_now = 1;	803	update_now = 1;
818	}	804	}
		805
819	/* if the object is being removed, we can't make intelligent	806	/* if the object is being removed, we can't make intelligent
820	* decisions, because remove_ob can't really pass the object	807	* decisions, because remove_ob can't really pass the object
821	* that is being removed.	808	* that is being removed.
822	*/	809	*/
823	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	810	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
835		822
836	if (op->more != NULL)	823	if (op->more != NULL)
837	update_object (op->more, action);	824	update_object (op->more, action);
838	}	825	}
839		826
840	static unordered_vector<object *> mortals;	827	object::vector object::mortals;
841	static std::vector<object *> freed;	828	object::vector object::objects; // not yet used
		829	object *object::first;
842		830
843	void object::free_mortals ()	831	void object::free_mortals ()
844	{	832	{
845	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	833	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
846	if ((*i)->refcnt)	834	if ((*i)->refcnt)
847	++i; // further delay freeing	835	++i; // further delay freeing
848	else	836	else
849	{	837	{
850	freed.push_back (*i);//D
851	//delete *i;	838	delete *i;
852	mortals.erase (i);	839	mortals.erase (i);
853	}	840	}
854
855	if (mortals.size())//D
856	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
857	}	841	}
858		842
859	object::object ()	843	object::object ()
860	{	844	{
861	SET_FLAG (this, FLAG_REMOVED);	845	SET_FLAG (this, FLAG_REMOVED);
862		846
863	expmul = 1.0;	847	expmul = 1.0;
864	face = blank_face;	848	face = blank_face;
865	attacked_by_count = -1;
866	}	849	}
867		850
868	object::~object ()	851	object::~object ()
869	{	852	{
870	free_key_values (this);	853	free_key_values (this);
871	}	854	}
872		855
873	void object::link ()	856	void object::link ()
874	{	857	{
875	count = ++ob_count;	858	count = ++ob_count;
		859	uuid = gen_uuid ();
876		860
877	prev = 0;	861	prev = 0;
878	next = objects;	862	next = object::first;
879		863
880	if (objects)	864	if (object::first)
881	objects->prev = this;	865	object::first->prev = this;
882		866
883	objects = this;	867	object::first = this;
884	}	868	}
885		869
886	void object::unlink ()	870	void object::unlink ()
887	{	871	{
888	count = 0;	872	if (this == object::first)
		873	object::first = next;
889		874
890	/* Remove this object from the list of used objects */	875	/* Remove this object from the list of used objects */
891	if (prev)
892	{
893	prev->next = next;	876	if (prev) prev->next = next;
		877	if (next) next->prev = prev;
		878
894	prev = 0;	879	prev = 0;
895	}
896
897	if (next)
898	{
899	next->prev = prev;
900	next = 0;	880	next = 0;
901	}
902
903	if (this == objects)
904	objects = next;
905	}	881	}
906		882
907	object *object::create ()	883	object *object::create ()
908	{	884	{
909	object *op;
910
911	if (freed.empty ())
912	op = new object;	885	object *op = new object;
913	else
914	{
915	// highly annoying, but the only way to get it stable right now
916	op = freed.back ();
917	freed.pop_back ();
918	op->~object ();
919	new ((void *) op) object;
920	}
921
922	op->link ();	886	op->link ();
923	return op;	887	return op;
924	}	888	}
925		889
926	/*	890	/*
…		…
928	* 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
929	* free objects. The IS_FREED() flag is set in the object.	893	* free objects. The IS_FREED() flag is set in the object.
930	* The object must have been removed by remove_ob() first for	894	* The object must have been removed by remove_ob() first for
931	* this function to succeed.	895	* this function to succeed.
932	*	896	*
933	* 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
934	* inventory to the ground.	898	* inventory to the ground.
935	*/	899	*/
936	void object::free (bool free_inventory)	900	void object::destroy (bool destroy_inventory)
937	{	901	{
938	if (QUERY_FLAG (this, FLAG_FREED))	902	if (QUERY_FLAG (this, FLAG_FREED))
939	return;	903	return;
940		904
941	if (QUERY_FLAG (this, FLAG_FRIENDLY))	905	if (QUERY_FLAG (this, FLAG_FRIENDLY))
942	remove_friendly_object (this);	906	remove_friendly_object (this);
943		907
944	if (!QUERY_FLAG (this, FLAG_REMOVED))	908	if (!QUERY_FLAG (this, FLAG_REMOVED))
945	remove_ob (this);	909	remove ();
946		910
947	SET_FLAG (this, FLAG_FREED);	911	SET_FLAG (this, FLAG_FREED);
948		912
949	if (more)	913	if (more)
950	{	914	{
951	more->free (free_inventory);	915	more->destroy (destroy_inventory);
952	more = 0;	916	more = 0;
953	}	917	}
954		918
955	if (inv)	919	if (inv)
956	{	920	{
957	/* Only if the space blocks everything do we not process -	921	/* Only if the space blocks everything do we not process -
958	* if some form of movement is allowed, let objects	922	* if some form of movement is allowed, let objects
959	* drop on that space.	923	* drop on that space.
960	*/	924	*/
961	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)
962	{	926	{
963	object *op = inv;	927	object *op = inv;
964		928
965	while (op)	929	while (op)
966	{	930	{
967	object *tmp = op->below;	931	object *tmp = op->below;
968	op->free (free_inventory);	932	op->destroy (destroy_inventory);
969	op = tmp;	933	op = tmp;
970	}	934	}
971	}	935	}
972	else	936	else
973	{ /* Put objects in inventory onto this space */	937	{ /* Put objects in inventory onto this space */
…		…
975		939
976	while (op)	940	while (op)
977	{	941	{
978	object *tmp = op->below;	942	object *tmp = op->below;
979		943
980	remove_ob (op);	944	op->remove ();
981		945
982	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	946	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
983	|| 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))
984	free_object (op);	948	op->destroy ();
985	else	949	else
986	{	950	{
987	op->x = x;	951	op->x = x;
988	op->y = y;	952	op->y = y;
989	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 */
…		…
992	op = tmp;	956	op = tmp;
993	}	957	}
994	}	958	}
995	}	959	}
996		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
997	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;
998		988
999	/* Remove object from the active list */	989	/* Remove object from the active list */
1000	speed = 0;	990	speed = 0;
1001	update_ob_speed (this);	991	update_ob_speed (this);
1002		992
…		…
1007		997
1008	/*	998	/*
1009	* sub_weight() recursively (outwards) subtracts a number from the	999	* sub_weight() recursively (outwards) subtracts a number from the
1010	* 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)).
1011	*/	1001	*/
1012
1013	void	1002	void
1014	sub_weight (object *op, signed long weight)	1003	sub_weight (object *op, signed long weight)
1015	{	1004	{
1016	while (op != NULL)	1005	while (op != NULL)
1017	{	1006	{
1018	if (op->type == CONTAINER)	1007	if (op->type == CONTAINER)
1019	{
1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1008	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021	}	1009
1022	op->carrying -= weight;	1010	op->carrying -= weight;
1023	op = op->env;	1011	op = op->env;
1024	}	1012	}
1025	}	1013	}
1026		1014
1027	/* remove_ob(op):	1015	/* op->remove ():
1028	* 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
1029	* 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
1030	* object will have no environment. If the object previously had an	1018	* object will have no environment. If the object previously had an
1031	* environment, the x and y coordinates will be updated to	1019	* environment, the x and y coordinates will be updated to
1032	* the previous environment.	1020	* the previous environment.
1033	* Beware: This function is called from the editor as well!	1021	* Beware: This function is called from the editor as well!
1034	*/	1022	*/
1035
1036	void	1023	void
1037	remove_ob (object *op)	1024	object::remove ()
1038	{	1025	{
		1026	object *tmp, *last = 0;
1039	object *	1027	object *otmp;
1040	tmp, *
1041	last = NULL;
1042	object *
1043	otmp;
1044		1028
1045	tag_t
1046	tag;
1047	int
1048	check_walk_off;	1029	int check_walk_off;
1049	mapstruct *
1050	m;
1051		1030
1052	sint16
1053	x,
1054	y;
1055
1056	if (QUERY_FLAG (op, FLAG_REMOVED))	1031	if (QUERY_FLAG (this, FLAG_REMOVED))
1057	return;	1032	return;
1058		1033
1059	SET_FLAG (op, FLAG_REMOVED);	1034	SET_FLAG (this, FLAG_REMOVED);
1060		1035
1061	if (op->more != NULL)	1036	if (more)
1062	remove_ob (op->more);	1037	more->remove ();
1063		1038
1064	/*	1039	/*
1065	* In this case, the object to be removed is in someones	1040	* In this case, the object to be removed is in someones
1066	* inventory.	1041	* inventory.
1067	*/	1042	*/
1068	if (op->env != NULL)	1043	if (env)
1069	{	1044	{
1070	if (op->nrof)	1045	if (nrof)
1071	sub_weight (op->env, op->weight * op->nrof);	1046	sub_weight (env, weight * nrof);
1072	else	1047	else
1073	sub_weight (op->env, op->weight + op->carrying);	1048	sub_weight (env, weight + carrying);
1074		1049
1075	/* 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
1076	* made to players inventory. If set, avoiding the call	1051	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.	1052	* to save cpu time.
1078	*/	1053	*/
1079	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))
1080	fix_player (otmp);	1055	fix_player (otmp);
1081		1056
1082	if (op->above != NULL)	1057	if (above != NULL)
1083	op->above->below = op->below;	1058	above->below = below;
1084	else	1059	else
1085	op->env->inv = op->below;	1060	env->inv = below;
1086		1061
1087	if (op->below != NULL)	1062	if (below != NULL)
1088	op->below->above = op->above;	1063	below->above = above;
1089		1064
1090	/* we set up values so that it could be inserted into	1065	/* we set up values so that it could be inserted into
1091	* 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
1092	* to the caller to decide what we want to do.	1067	* to the caller to decide what we want to do.
1093	*/	1068	*/
1094	op->x = op->env->x, op->y = op->env->y;	1069	x = env->x, y = env->y;
1095	op->map = op->env->map;	1070	map = env->map;
1096	op->above = NULL, op->below = NULL;	1071	above = 0, below = 0;
1097	op->env = NULL;	1072	env = 0;
1098	}	1073	}
1099	else if (op->map)	1074	else if (map)
1100	{	1075	{
1101	x = op->x;
1102	y = op->y;
1103	m = get_map_from_coord (op->map, &x, &y);
1104
1105	if (!m)
1106	{
1107	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1108	op->map->path, op->x, op->y);
1109	/* in old days, we used to set x and y to 0 and continue.
1110	* it seems if we get into this case, something is probablye
1111	* screwed up and should be fixed.
1112	*/
1113	abort ();
1114	}
1115
1116	if (op->map != m)
1117	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1118	op->map->path, m->path, op->x, op->y, x, y);
1119
1120	/* 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
1121	* lots of logic for things we no longer care about	1077	* lots of logic for things we no longer care about
1122	*/	1078	*/
1123		1079
1124	/* link the object above us */	1080	/* link the object above us */
1125	if (op->above)	1081	if (above)
1126	op->above->below = op->below;	1082	above->below = below;
1127	else	1083	else
1128	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 */
1129		1085
1130	/* Relink the object below us, if there is one */	1086	/* Relink the object below us, if there is one */
1131	if (op->below)	1087	if (below)
1132	op->below->above = op->above;	1088	below->above = above;
1133	else	1089	else
1134	{	1090	{
1135	/* 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
1136	* use translated coordinates in case some oddness with map tiling is	1092	* use translated coordinates in case some oddness with map tiling is
1137	* evident	1093	* evident
1138	*/	1094	*/
1139	if (GET_MAP_OB (m, x, y) != op)	1095	if (GET_MAP_OB (map, x, y) != this)
1140	{	1096	{
1141	dump_object (op);	1097	char *dump = dump_object (this);
1142	LOG (llevError,	1098	LOG (llevError,
1143	"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);
1144	dump_object (GET_MAP_OB (m, x, y));	1101	dump = dump_object (GET_MAP_OB (map, x, y));
1145	LOG (llevError, "%s\n", errmsg);	1102	LOG (llevError, "%s\n", dump);
		1103	free (dump);
1146	}	1104	}
1147		1105
1148	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1106	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1149	}	1107	}
1150		1108
1151	op->above = 0;	1109	above = 0;
1152	op->below = 0;	1110	below = 0;
1153		1111
1154	if (op->map->in_memory == MAP_SAVING)	1112	if (map->in_memory == MAP_SAVING)
1155	return;	1113	return;
1156		1114
1157	tag = op->count;
1158	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1115	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1159		1116
1160	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)
1161	{	1118	{
1162	/* 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
1163	* being removed.	1120	* being removed.
1164	*/	1121	*/
1165		1122
1166	if (tmp->type == PLAYER && tmp != op)	1123	if (tmp->type == PLAYER && tmp != this)
1167	{	1124	{
1168	/* If a container that the player is currently using somehow gets	1125	/* If a container that the player is currently using somehow gets
1169	* removed (most likely destroyed), update the player view	1126	* removed (most likely destroyed), update the player view
1170	* appropriately.	1127	* appropriately.
1171	*/	1128	*/
1172	if (tmp->container == op)	1129	if (tmp->container == this)
1173	{	1130	{
1174	CLEAR_FLAG (op, FLAG_APPLIED);	1131	CLEAR_FLAG (this, FLAG_APPLIED);
1175	tmp->container = NULL;	1132	tmp->container = 0;
1176	}	1133	}
1177		1134
1178	tmp->contr->socket.update_look = 1;	1135	tmp->contr->socket.update_look = 1;
1179	}	1136	}
1180		1137
1181	/* See if player moving off should effect something */	1138	/* See if player moving off should effect something */
1182	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))
1183	{	1142	{
1184	move_apply (tmp, op, NULL);	1143	move_apply (tmp, this, 0);
1185		1144
1186	if (was_destroyed (op, tag))	1145	if (destroyed ())
1187	{
1188	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 ());
1189	}
1190	}	1147	}
1191		1148
1192	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1149	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1193		1150
1194	if (tmp->above == tmp)	1151	if (tmp->above == tmp)
1195	tmp->above = NULL;	1152	tmp->above = 0;
1196		1153
1197	last = tmp;	1154	last = tmp;
1198	}	1155	}
1199		1156
1200	/* last == NULL of there are no objects on this space */	1157	/* last == NULL of there are no objects on this space */
1201	if (last == NULL)	1158	if (!last)
1202	{	1159	{
1203	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1160	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1204	* 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
1205	* 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
1206	* be correct anyways.	1163	* be correct anyways.
1207	*/	1164	*/
1208	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1165	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1209	update_position (op->map, op->x, op->y);	1166	update_position (map, x, y);
1210	}	1167	}
1211	else	1168	else
1212	update_object (last, UP_OBJ_REMOVE);	1169	update_object (last, UP_OBJ_REMOVE);
1213		1170
1214	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1171	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1215	update_all_los (op->map, op->x, op->y);	1172	update_all_los (map, x, y);
1216	}	1173	}
1217	}	1174	}
1218		1175
1219	/*	1176	/*
1220	* merge_ob(op,top):	1177	* merge_ob(op,top):
…		…
1222	* This function goes through all objects below and including top, and	1179	* This function goes through all objects below and including top, and
1223	* merges op to the first matching object.	1180	* merges op to the first matching object.
1224	* If top is NULL, it is calculated.	1181	* If top is NULL, it is calculated.
1225	* 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
1226	*/	1183	*/
1227
1228	object *	1184	object *
1229	merge_ob (object *op, object *top)	1185	merge_ob (object *op, object *top)
1230	{	1186	{
1231	if (!op->nrof)	1187	if (!op->nrof)
1232	return 0;	1188	return 0;
…		…
1242	{	1198	{
1243	top->nrof += op->nrof;	1199	top->nrof += op->nrof;
1244		1200
1245	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1201	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1246	op->weight = 0; /* Don't want any adjustements now */	1202	op->weight = 0; /* Don't want any adjustements now */
1247	remove_ob (op);	1203	op->destroy ();
1248	free_object (op);
1249	return top;	1204	return top;
1250	}	1205	}
1251	}	1206	}
1252		1207
1253	return NULL;	1208	return 0;
1254	}	1209	}
1255		1210
1256	/*	1211	/*
1257	* 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
1258	* job preparing multi-part monsters	1213	* job preparing multi-part monsters
1259	*/	1214	*/
1260	object *	1215	object *
1261	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)
1262	{	1217	{
1263	object *tmp;	1218	object *tmp;
1264		1219
1265	if (op->head)	1220	if (op->head)
1266	op = op->head;	1221	op = op->head;
…		…
1294	* NULL if 'op' was destroyed	1249	* NULL if 'op' was destroyed
1295	* just 'op' otherwise	1250	* just 'op' otherwise
1296	*/	1251	*/
1297		1252
1298	object *	1253	object *
1299	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)
1300	{	1255	{
1301	object *tmp, *top, *floor = NULL;	1256	object *tmp, *top, *floor = NULL;
1302	sint16 x, y;	1257	sint16 x, y;
1303		1258
1304	if (QUERY_FLAG (op, FLAG_FREED))	1259	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1307	return NULL;	1262	return NULL;
1308	}	1263	}
1309		1264
1310	if (m == NULL)	1265	if (m == NULL)
1311	{	1266	{
1312	dump_object (op);	1267	char *dump = dump_object (op);
1313	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);
1314	return op;	1270	return op;
1315	}	1271	}
1316		1272
1317	if (out_of_map (m, op->x, op->y))	1273	if (out_of_map (m, op->x, op->y))
1318	{	1274	{
1319	dump_object (op);	1275	char *dump = dump_object (op);
1320	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);
1321	#ifdef MANY_CORES	1277	#ifdef MANY_CORES
1322	/* 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
1323	* 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
1324	* improperly inserted.	1280	* improperly inserted.
1325	*/	1281	*/
1326	abort ();	1282	abort ();
1327	#endif	1283	#endif
		1284	free (dump);
1328	return op;	1285	return op;
1329	}	1286	}
1330		1287
1331	if (!QUERY_FLAG (op, FLAG_REMOVED))	1288	if (!QUERY_FLAG (op, FLAG_REMOVED))
1332	{	1289	{
1333	dump_object (op);	1290	char *dump = dump_object (op);
1334	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);
1335	return op;	1293	return op;
1336	}	1294	}
1337		1295
1338	if (op->more != NULL)	1296	if (op->more != NULL)
1339	{	1297	{
…		…
1380	if (op->nrof && !(flag & INS_NO_MERGE))	1338	if (op->nrof && !(flag & INS_NO_MERGE))
1381	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)
1382	if (CAN_MERGE (op, tmp))	1340	if (CAN_MERGE (op, tmp))
1383	{	1341	{
1384	op->nrof += tmp->nrof;	1342	op->nrof += tmp->nrof;
1385	remove_ob (tmp);	1343	tmp->destroy ();
1386	free_object (tmp);
1387	}	1344	}
1388		1345
1389	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 */
1390	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1347	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1391		1348
…		…
1577	tmp1;	1534	tmp1;
1578		1535
1579	/* first search for itself and remove any old instances */	1536	/* first search for itself and remove any old instances */
1580		1537
1581	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)
1582	{
1583	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1539	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1584	{	1540	tmp->destroy ();
1585	remove_ob (tmp);
1586	free_object (tmp);
1587	}
1588	}
1589		1541
1590	tmp1 = arch_to_object (find_archetype (arch_string));	1542	tmp1 = arch_to_object (archetype::find (arch_string));
1591		1543
1592	tmp1->x = op->x;	1544	tmp1->x = op->x;
1593	tmp1->y = op->y;	1545	tmp1->y = op->y;
1594	insert_ob_in_map (tmp1, op->map, op, 0);	1546	insert_ob_in_map (tmp1, op->map, op, 0);
1595	}	1547	}
…		…
1603	*/	1555	*/
1604		1556
1605	object *	1557	object *
1606	get_split_ob (object *orig_ob, uint32 nr)	1558	get_split_ob (object *orig_ob, uint32 nr)
1607	{	1559	{
1608	object *	1560	object *newob;
1609	newob;
1610	int
1611	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1561	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1612		1562
1613	if (orig_ob->nrof < nr)	1563	if (orig_ob->nrof < nr)
1614	{	1564	{
1615	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);
1616	return NULL;	1566	return NULL;
1617	}	1567	}
1618		1568
1619	newob = object_create_clone (orig_ob);	1569	newob = object_create_clone (orig_ob);
1620		1570
1621	if ((orig_ob->nrof -= nr) < 1)	1571	if ((orig_ob->nrof -= nr) < 1)
1622	{	1572	orig_ob->destroy (1);
1623	if (!is_removed)
1624	remove_ob (orig_ob);
1625	free_object2 (orig_ob, 1);
1626	}
1627	else if (!is_removed)	1573	else if (!is_removed)
1628	{	1574	{
1629	if (orig_ob->env != NULL)	1575	if (orig_ob->env != NULL)
1630	sub_weight (orig_ob->env, orig_ob->weight * nr);	1576	sub_weight (orig_ob->env, orig_ob->weight * nr);
1631	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)
…		…
1695	esrv_send_item (tmp, op);	1641	esrv_send_item (tmp, op);
1696	}	1642	}
1697	}	1643	}
1698	else	1644	else
1699	{	1645	{
1700	remove_ob (op);	1646	op->remove ();
1701	op->nrof = 0;	1647	op->nrof = 0;
1702	if (tmp)	1648	if (tmp)
1703	{	1649	{
1704	esrv_del_item (tmp->contr, op->count);	1650	esrv_del_item (tmp->contr, op->count);
1705	}	1651	}
…		…
1711		1657
1712	if (i < op->nrof)	1658	if (i < op->nrof)
1713	op->nrof -= i;	1659	op->nrof -= i;
1714	else	1660	else
1715	{	1661	{
1716	remove_ob (op);	1662	op->remove ();
1717	op->nrof = 0;	1663	op->nrof = 0;
1718	}	1664	}
1719		1665
1720	/* Since we just removed op, op->above is null */	1666	/* Since we just removed op, op->above is null */
1721	for (tmp = above; tmp != NULL; tmp = tmp->above)	1667	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1730		1676
1731	if (op->nrof)	1677	if (op->nrof)
1732	return op;	1678	return op;
1733	else	1679	else
1734	{	1680	{
1735	free_object (op);	1681	op->destroy ();
1736	return NULL;	1682	return NULL;
1737	}	1683	}
1738	}	1684	}
1739		1685
1740	/*	1686	/*
…		…
1753	op->carrying += weight;	1699	op->carrying += weight;
1754	op = op->env;	1700	op = op->env;
1755	}	1701	}
1756	}	1702	}
1757		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
1758	/*	1724	/*
1759	* insert_ob_in_ob(op,environment):	1725	* env->insert (op)
1760	* This function inserts the object op in the linked list	1726	* This function inserts the object op in the linked list
1761	* inside the object environment.	1727	* inside the object environment.
1762	*	1728	*
1763	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1764	* the inventory at the last position or next to other objects of the same
1765	* type.
1766	* Frank: Now sorted by type, archetype and magic!
1767	*
1768	* 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
1769	* be != op, if items are merged. -Tero	1730	* be != op, if items are merged. -Tero
1770	*/	1731	*/
1771		1732
1772	object *	1733	object *
1773	insert_ob_in_ob (object *op, object *where)	1734	object::insert (object *op)
1774	{	1735	{
1775	object *	1736	object *tmp, *otmp;
1776	tmp, *
1777	otmp;
1778		1737
1779	if (!QUERY_FLAG (op, FLAG_REMOVED))	1738	if (!QUERY_FLAG (op, FLAG_REMOVED))
1780	{	1739	op->remove ();
1781	dump_object (op);
1782	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1783	return op;
1784	}
1785
1786	if (where == NULL)
1787	{
1788	dump_object (op);
1789	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1790	return op;
1791	}
1792
1793	if (where->head)
1794	{
1795	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1796	where = where->head;
1797	}
1798		1740
1799	if (op->more)	1741	if (op->more)
1800	{	1742	{
1801	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);
1802	return op;	1744	return op;
…		…
1804		1746
1805	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1747	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1806	CLEAR_FLAG (op, FLAG_REMOVED);	1748	CLEAR_FLAG (op, FLAG_REMOVED);
1807	if (op->nrof)	1749	if (op->nrof)
1808	{	1750	{
1809	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1751	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1810	if (CAN_MERGE (tmp, op))	1752	if (CAN_MERGE (tmp, op))
1811	{	1753	{
1812	/* return the original object and remove inserted object	1754	/* return the original object and remove inserted object
1813	(client needs the original object) */	1755	(client needs the original object) */
1814	tmp->nrof += op->nrof;	1756	tmp->nrof += op->nrof;
1815	/* Weight handling gets pretty funky. Since we are adding to	1757	/* Weight handling gets pretty funky. Since we are adding to
1816	* tmp->nrof, we need to increase the weight.	1758	* tmp->nrof, we need to increase the weight.
1817	*/	1759	*/
1818	add_weight (where, op->weight * op->nrof);	1760	add_weight (this, op->weight * op->nrof);
1819	SET_FLAG (op, FLAG_REMOVED);	1761	SET_FLAG (op, FLAG_REMOVED);
1820	free_object (op); /* free the inserted object */	1762	op->destroy (); /* free the inserted object */
1821	op = tmp;	1763	op = tmp;
1822	remove_ob (op); /* and fix old object's links */	1764	op->remove (); /* and fix old object's links */
1823	CLEAR_FLAG (op, FLAG_REMOVED);	1765	CLEAR_FLAG (op, FLAG_REMOVED);
1824	break;	1766	break;
1825	}	1767	}
1826		1768
1827	/* I assume combined objects have no inventory	1769	/* I assume combined objects have no inventory
1828	* We add the weight - this object could have just been removed	1770	* We add the weight - this object could have just been removed
1829	* (if it was possible to merge). calling remove_ob will subtract	1771	* (if it was possible to merge). calling remove_ob will subtract
1830	* 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
1831	* the linking below	1773	* the linking below
1832	*/	1774	*/
1833	add_weight (where, op->weight * op->nrof);	1775	add_weight (this, op->weight * op->nrof);
1834	}	1776	}
1835	else	1777	else
1836	add_weight (where, (op->weight + op->carrying));	1778	add_weight (this, (op->weight + op->carrying));
1837		1779
1838	otmp = is_player_inv (where);	1780	otmp = is_player_inv (this);
1839	if (otmp && otmp->contr != NULL)	1781	if (otmp && otmp->contr)
1840	{
1841	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1782	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1842	fix_player (otmp);	1783	fix_player (otmp);
1843	}
1844		1784
1845	op->map = NULL;	1785	op->map = NULL;
1846	op->env = where;	1786	op->env = this;
1847	op->above = NULL;	1787	op->above = NULL;
1848	op->below = NULL;	1788	op->below = NULL;
1849	op->x = 0, op->y = 0;	1789	op->x = 0, op->y = 0;
1850		1790
1851	/* 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 */
1852	if ((op->glow_radius != 0) && where->map)	1792	if ((op->glow_radius != 0) && map)
1853	{	1793	{
1854	#ifdef DEBUG_LIGHTS	1794	#ifdef DEBUG_LIGHTS
1855	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);
1856	#endif /* DEBUG_LIGHTS */	1796	#endif /* DEBUG_LIGHTS */
1857	if (MAP_DARKNESS (where->map))	1797	if (MAP_DARKNESS (map))
1858	update_all_los (where->map, where->x, where->y);	1798	update_all_los (map, x, y);
1859	}	1799	}
1860		1800
1861	/* 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.
1862	* It sure simplifies this function...	1802	* It sure simplifies this function...
1863	*/	1803	*/
1864	if (where->inv == NULL)	1804	if (!inv)
1865	where->inv = op;	1805	inv = op;
1866	else	1806	else
1867	{	1807	{
1868	op->below = where->inv;	1808	op->below = inv;
1869	op->below->above = op;	1809	op->below->above = op;
1870	where->inv = op;	1810	inv = op;
1871	}	1811	}
		1812
1872	return op;	1813	return op;
1873	}	1814	}
1874		1815
1875	/*	1816	/*
1876	* Checks if any objects has a move_type that matches objects	1817	* Checks if any objects has a move_type that matches objects
…		…
1894	*/	1835	*/
1895		1836
1896	int	1837	int
1897	check_move_on (object *op, object *originator)	1838	check_move_on (object *op, object *originator)
1898	{	1839	{
1899	object *	1840	object *tmp;
1900	tmp;	1841	maptile *m = op->map;
1901	tag_t
1902	tag;
1903	mapstruct *
1904	m = op->map;
1905	int
1906	x = op->x, y = op->y;	1842	int x = op->x, y = op->y;
1907		1843
1908	MoveType	1844	MoveType move_on, move_slow, move_block;
1909	move_on,
1910	move_slow,
1911	move_block;
1912		1845
1913	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1846	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1914	return 0;	1847	return 0;
1915
1916	tag = op->count;
1917		1848
1918	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);
1919	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);
1920	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);
1921		1852
…		…
1982	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1913	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1983	((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))
1984	{	1915	{
1985	move_apply (tmp, op, originator);	1916	move_apply (tmp, op, originator);
1986		1917
1987	if (was_destroyed (op, tag))	1918	if (op->destroyed ())
1988	return 1;	1919	return 1;
1989		1920
1990	/* what the person/creature stepped onto has moved the object	1921	/* what the person/creature stepped onto has moved the object
1991	* someplace new. Don't process any further - if we did,	1922	* someplace new. Don't process any further - if we did,
1992	* have a feeling strange problems would result.	1923	* have a feeling strange problems would result.
…		…
2004	* a matching archetype at the given map and coordinates.	1935	* a matching archetype at the given map and coordinates.
2005	* The first matching object is returned, or NULL if none.	1936	* The first matching object is returned, or NULL if none.
2006	*/	1937	*/
2007		1938
2008	object *	1939	object *
2009	present_arch (const archetype *at, mapstruct *m, int x, int y)	1940	present_arch (const archetype *at, maptile *m, int x, int y)
2010	{	1941	{
2011	object *	1942	object *
2012	tmp;	1943	tmp;
2013		1944
2014	if (m == NULL || out_of_map (m, x, y))	1945	if (m == NULL || out_of_map (m, x, y))
…		…
2027	* a matching type variable at the given map and coordinates.	1958	* a matching type variable at the given map and coordinates.
2028	* The first matching object is returned, or NULL if none.	1959	* The first matching object is returned, or NULL if none.
2029	*/	1960	*/
2030		1961
2031	object *	1962	object *
2032	present (unsigned char type, mapstruct *m, int x, int y)	1963	present (unsigned char type, maptile *m, int x, int y)
2033	{	1964	{
2034	object *	1965	object *
2035	tmp;	1966	tmp;
2036		1967
2037	if (out_of_map (m, x, y))	1968	if (out_of_map (m, x, y))
…		…
2177	* 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
2178	* customized, changed states, etc.	2109	* customized, changed states, etc.
2179	*/	2110	*/
2180		2111
2181	int	2112	int
2182	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)
2183	{	2114	{
2184	int	2115	int
2185	i,	2116	i,
2186	index = 0, flag;	2117	index = 0, flag;
2187	static int	2118	static int
…		…
2208	return -1;	2139	return -1;
2209	return altern[RANDOM () % index];	2140	return altern[RANDOM () % index];
2210	}	2141	}
2211		2142
2212	/*	2143	/*
2213	* find_first_free_spot(archetype, mapstruct, x, y) works like	2144	* find_first_free_spot(archetype, maptile, x, y) works like
2214	* find_free_spot(), but it will search max number of squares.	2145	* find_free_spot(), but it will search max number of squares.
2215	* 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.
2216	* 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.
2217	*/	2148	*/
2218		2149
2219	int	2150	int
2220	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)
2221	{	2152	{
2222	int	2153	int
2223	i;	2154	i;
2224		2155
2225	for (i = 0; i < SIZEOFFREE; i++)	2156	for (i = 0; i < SIZEOFFREE; i++)
…		…
2289	* 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
2290	* there is capable of.	2221	* there is capable of.
2291	*/	2222	*/
2292		2223
2293	int	2224	int
2294	find_dir (mapstruct *m, int x, int y, object *exclude)	2225	find_dir (maptile *m, int x, int y, object *exclude)
2295	{	2226	{
2296	int	2227	int
2297	i,	2228	i,
2298	max = SIZEOFFREE, mflags;	2229	max = SIZEOFFREE, mflags;
2299		2230
2300	sint16 nx, ny;	2231	sint16 nx, ny;
2301	object *	2232	object *
2302	tmp;	2233	tmp;
2303	mapstruct *	2234	maptile *
2304	mp;	2235	mp;
2305		2236
2306	MoveType blocked, move_type;	2237	MoveType blocked, move_type;
2307		2238
2308	if (exclude && exclude->head)	2239	if (exclude && exclude->head)
…		…
2516	* Modified to be map tile aware -.MSW	2447	* Modified to be map tile aware -.MSW
2517	*/	2448	*/
2518		2449
2519		2450
2520	int	2451	int
2521	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2452	can_see_monsterP (maptile *m, int x, int y, int dir)
2522	{	2453	{
2523	sint16 dx, dy;	2454	sint16 dx, dy;
2524	int	2455	int
2525	mflags;	2456	mflags;
2526		2457
…		…
2575	* create clone from object to another	2506	* create clone from object to another
2576	*/	2507	*/
2577	object *	2508	object *
2578	object_create_clone (object *asrc)	2509	object_create_clone (object *asrc)
2579	{	2510	{
2580	object *
2581	dst = NULL, *tmp, *src, *part, *prev, *item;	2511	object *dst = 0, *tmp, *src, *part, *prev, *item;
2582		2512
2583	if (!asrc)	2513	if (!asrc)
2584	return NULL;	2514	return 0;
		2515
2585	src = asrc;	2516	src = asrc;
2586	if (src->head)	2517	if (src->head)
2587	src = src->head;	2518	src = src->head;
2588		2519
2589	prev = NULL;	2520	prev = 0;
2590	for (part = src; part; part = part->more)	2521	for (part = src; part; part = part->more)
2591	{	2522	{
2592	tmp = get_object ();	2523	tmp = object::create ();
2593	copy_object (part, tmp);	2524	part->copy_to (tmp);
2594	tmp->x -= src->x;	2525	tmp->x -= src->x;
2595	tmp->y -= src->y;	2526	tmp->y -= src->y;
		2527
2596	if (!part->head)	2528	if (!part->head)
2597	{	2529	{
2598	dst = tmp;	2530	dst = tmp;
2599	tmp->head = NULL;	2531	tmp->head = 0;
2600	}	2532	}
2601	else	2533	else
2602	{	2534	{
2603	tmp->head = dst;	2535	tmp->head = dst;
2604	}	2536	}
		2537
2605	tmp->more = NULL;	2538	tmp->more = 0;
		2539
2606	if (prev)	2540	if (prev)
2607	prev->more = tmp;	2541	prev->more = tmp;
		2542
2608	prev = tmp;	2543	prev = tmp;
2609	}	2544	}
2610		2545
2611	/*** copy inventory ***/
2612	for (item = src->inv; item; item = item->below)	2546	for (item = src->inv; item; item = item->below)
2613	{
2614	(void) insert_ob_in_ob (object_create_clone (item), dst);	2547	insert_ob_in_ob (object_create_clone (item), dst);
2615	}
2616		2548
2617	return dst;	2549	return dst;
2618	}	2550	}
2619		2551
2620	/* return true if the object was destroyed, 0 otherwise */
2621	int
2622	was_destroyed (const object *op, tag_t old_tag)
2623	{
2624	/* checking for FLAG_FREED isn't necessary, but makes this function more
2625	* robust */
2626	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2627	}
2628
2629	/* GROS - Creates an object using a string representing its content. */	2552	/* GROS - Creates an object using a string representing its content. */
2630
2631	/* 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 */
2632
2633	/* 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, */
2634
2635	/* 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. */
2636
2637	/* 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. */
2638
2639	/* Also remember that multiparts objects are not supported for now. */	2557	/* Also remember that multiparts objects are not supported for now. */
2640		2558
2641	object *	2559	object *
2642	load_object_str (const char *obstr)	2560	load_object_str (const char *obstr)
2643	{	2561	{
2644	object *	2562	object *op;
2645	op;
2646	char
2647	filename[MAX_BUF];	2563	char filename[MAX_BUF];
2648		2564
2649	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2565	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2650		2566
2651	FILE *
2652	tempfile = fopen (filename, "w");	2567	FILE *tempfile = fopen (filename, "w");
2653		2568
2654	if (tempfile == NULL)	2569	if (tempfile == NULL)
2655	{	2570	{
2656	LOG (llevError, "Error - Unable to access load object temp file\n");	2571	LOG (llevError, "Error - Unable to access load object temp file\n");
2657	return NULL;	2572	return NULL;
2658	};	2573	}
		2574
2659	fprintf (tempfile, obstr);	2575	fprintf (tempfile, obstr);
2660	fclose (tempfile);	2576	fclose (tempfile);
2661		2577
2662	op = get_object ();	2578	op = object::create ();
2663		2579
2664	object_thawer thawer (filename);	2580	object_thawer thawer (filename);
2665		2581
2666	if (thawer)	2582	if (thawer)
2667	load_object (thawer, op, 0);	2583	load_object (thawer, op, 0);
…		…
2677	* returns NULL if no match.	2593	* returns NULL if no match.
2678	*/	2594	*/
2679	object *	2595	object *
2680	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)
2681	{	2597	{
2682	object *	2598	object *tmp;
2683	tmp;
2684		2599
2685	for (tmp = who->inv; tmp; tmp = tmp->below)	2600	for (tmp = who->inv; tmp; tmp = tmp->below)
2686	if (tmp->type == type && tmp->subtype == subtype)	2601	if (tmp->type == type && tmp->subtype == subtype)
2687	return tmp;	2602	return tmp;
2688		2603
…		…
2696	* do the desired thing.	2611	* do the desired thing.
2697	*/	2612	*/
2698	key_value *	2613	key_value *
2699	get_ob_key_link (const object *ob, const char *key)	2614	get_ob_key_link (const object *ob, const char *key)
2700	{	2615	{
2701	key_value *	2616	key_value *link;
2702	link;
2703		2617
2704	for (link = ob->key_values; link != NULL; link = link->next)	2618	for (link = ob->key_values; link != NULL; link = link->next)
2705	{
2706	if (link->key == key)	2619	if (link->key == key)
2707	{
2708	return link;	2620	return link;
2709	}
2710	}
2711		2621
2712	return NULL;	2622	return NULL;
2713	}	2623	}
2714		2624
2715	/*	2625	/*
…		…
2720	* The returned string is shared.	2630	* The returned string is shared.
2721	*/	2631	*/
2722	const char *	2632	const char *
2723	get_ob_key_value (const object *op, const char *const key)	2633	get_ob_key_value (const object *op, const char *const key)
2724	{	2634	{
2725	key_value *	2635	key_value *link;
2726	link;	2636	shstr_cmp canonical_key (key);
2727	const char *
2728	canonical_key;
2729		2637
2730	canonical_key = shstr::find (key);
2731
2732	if (canonical_key == NULL)	2638	if (!canonical_key)
2733	{	2639	{
2734	/* 1. There being a field named key on any object	2640	/* 1. There being a field named key on any object
2735	* implies there'd be a shared string to find.	2641	* implies there'd be a shared string to find.
2736	* 2. Since there isn't, no object has this field.	2642	* 2. Since there isn't, no object has this field.
2737	* 3. Therefore, *this* object doesn't have this field.	2643	* 3. Therefore, *this* object doesn't have this field.
2738	*/	2644	*/
2739	return NULL;	2645	return 0;
2740	}	2646	}
2741		2647
2742	/* This is copied from get_ob_key_link() above -	2648	/* This is copied from get_ob_key_link() above -
2743	* only 4 lines, and saves the function call overhead.	2649	* only 4 lines, and saves the function call overhead.
2744	*/	2650	*/
2745	for (link = op->key_values; link != NULL; link = link->next)	2651	for (link = op->key_values; link; link = link->next)
2746	{
2747	if (link->key == canonical_key)	2652	if (link->key == canonical_key)
2748	{
2749	return link->value;	2653	return link->value;
2750	}	2654
2751	}
2752	return NULL;	2655	return 0;
2753	}	2656	}
2754		2657
2755		2658
2756	/*	2659	/*
2757	* Updates the canonical_key in op to value.	2660	* Updates the canonical_key in op to value.
…		…
2864	}	2767	}
2865	else	2768	else
2866	item = item->env;	2769	item = item->env;
2867	}	2770	}
2868		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