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.37 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.66 by root, Wed Dec 13 03:28:42 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	};
…		…
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		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	}
		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	{
59	key_value *wants_field;	136	key_value *wants_field;
…		…
106	*	183	*
107	* Note that this function appears a lot longer than the macro it	184	* Note that this function appears a lot longer than the macro it
108	* replaces - this is mostly for clarity - a decent compiler should hopefully	185	* replaces - this is mostly for clarity - a decent compiler should hopefully
109	* reduce this to the same efficiency.	186	* reduce this to the same efficiency.
110	*	187	*
111	* Check nrof variable *before* calling CAN_MERGE()	188	* Check nrof variable *before* calling can_merge()
112	*	189	*
113	* Improvements made with merge: Better checking on potion, and also	190	* Improvements made with merge: Better checking on potion, and also
114	* check weight	191	* check weight
115	*/	192	*/
116		193
117	bool object::can_merge (object *ob1, object *ob2)	194	bool object::can_merge_slow (object *ob1, object *ob2)
118	{	195	{
119	/* A couple quicksanity checks */	196	/* A couple quicksanity checks */
120	if ((ob1 == ob2) || (ob1->type != ob2->type))	197	if (ob1 == ob2
		198	|| ob1->type != ob2->type
		199	|| ob1->speed != ob2->speed
		200	|| ob1->value != ob2->value
		201	|| ob1->name != ob2->name)
121	return 0;	202	return 0;
122		203
123	if (ob1->speed != ob2->speed)	204	//TODO: this ain't working well, use nicer and correct overflow check
124	return 0;
125
126	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	205	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
127	* value could not be stored in a sint32 (which unfortunately sometimes is	206	* value could not be stored in a sint32 (which unfortunately sometimes is
128	* used to store nrof).	207	* used to store nrof).
129	*/	208	*/
130	if (ob1->nrof + ob2->nrof >= 1UL << 31)	209	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
183	/* if one object has inventory but the other doesn't, not equiv */	262	/* if one object has inventory but the other doesn't, not equiv */
184	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	263	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
185	return 0;	264	return 0;
186		265
187	/* Now check to see if the two inventory objects could merge */	266	/* Now check to see if the two inventory objects could merge */
188	if (!CAN_MERGE (ob1->inv, ob2->inv))	267	if (!object::can_merge (ob1->inv, ob2->inv))
189	return 0;	268	return 0;
190		269
191	/* inventory ok - still need to check rest of this object to see	270	/* inventory ok - still need to check rest of this object to see
192	* if it is valid.	271	* if it is valid.
193	*/	272	*/
…		…
297	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	376	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
298	* Some error messages.	377	* Some error messages.
299	* The result of the dump is stored in the static global errmsg array.	378	* The result of the dump is stored in the static global errmsg array.
300	*/	379	*/
301		380
302	void	381	char *
303	dump_object2 (object *op)
304	{
305	errmsg[0] = 0;
306	return;
307	//TODO//D#d#
308	#if 0
309	char *cp;
310
311	/* object *tmp;*/
312
313	if (op->arch != NULL)
314	{
315	strcat (errmsg, "arch ");
316	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
317	strcat (errmsg, "\n");
318	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
319	strcat (errmsg, cp);
320	# if 0
321	/* Don't dump player diffs - they are too long, mostly meaningless, and
322	* will overflow the buffer.
323	* Changed so that we don't dump inventory either. This may
324	* also overflow the buffer.
325	*/
326	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
327	strcat (errmsg, cp);
328	for (tmp = op->inv; tmp; tmp = tmp->below)
329	dump_object2 (tmp);
330	# endif
331	strcat (errmsg, "end\n");
332	}
333	else
334	{
335	strcat (errmsg, "Object ");
336	if (op->name == NULL)
337	strcat (errmsg, "(null)");
338	else
339	strcat (errmsg, op->name);
340	strcat (errmsg, "\n");
341	# if 0
342	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
343	strcat (errmsg, cp);
344	for (tmp = op->inv; tmp; tmp = tmp->below)
345	dump_object2 (tmp);
346	# endif
347	strcat (errmsg, "end\n");
348	}
349	#endif
350	}
351
352	/*
353	* Dumps an object. Returns output in the static global errmsg array.
354	*/
355
356	void
357	dump_object (object *op)	382	dump_object (object *op)
358	{	383	{
359	if (op == NULL)	384	if (!op)
360	{	385	return strdup ("[NULLOBJ]");
361	strcpy (errmsg, "[NULL pointer]");
362	return;
363	}
364	errmsg[0] = '\0';
365	dump_object2 (op);
366	}
367		386
368	void	387	object_freezer freezer;
369	dump_all_objects (void)	388	save_object (freezer, op, 3);
370	{	389	return freezer.as_string ();
371	object *op;
372
373	for (op = objects; op != NULL; op = op->next)
374	{
375	dump_object (op);
376	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
377	}
378	}	390	}
379		391
380	/*	392	/*
381	* get_nearest_part(multi-object, object 2) returns the part of the	393	* get_nearest_part(multi-object, object 2) returns the part of the
382	* multi-object 1 which is closest to the second object.	394	* multi-object 1 which is closest to the second object.
…		…
402	*/	414	*/
403		415
404	object *	416	object *
405	find_object (tag_t i)	417	find_object (tag_t i)
406	{	418	{
407	object *op;	419	for (object *op = object::first; op; op = op->next)
408
409	for (op = objects; op != NULL; op = op->next)
410	if (op->count == i)	420	if (op->count == i)
411	break;	421	return op;
		422
412	return op;	423	return 0;
413	}	424	}
414		425
415	/*	426	/*
416	* Returns the first object which has a name equal to the argument.	427	* Returns the first object which has a name equal to the argument.
417	* Used only by the patch command, but not all that useful.	428	* Used only by the patch command, but not all that useful.
…		…
422	find_object_name (const char *str)	433	find_object_name (const char *str)
423	{	434	{
424	shstr_cmp str_ (str);	435	shstr_cmp str_ (str);
425	object *op;	436	object *op;
426		437
427	for (op = objects; op != NULL; op = op->next)	438	for (op = object::first; op != NULL; op = op->next)
428	if (op->name == str_)	439	if (op->name == str_)
429	break;	440	break;
430		441
431	return op;	442	return op;
432	}	443	}
433		444
434	void	445	void
435	free_all_object_data ()	446	free_all_object_data ()
436	{	447	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	448	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}
439
440	/*
441	* Returns the object which this object marks as being the owner.
442	* A id-scheme is used to avoid pointing to objects which have been
443	* freed and are now reused. If this is detected, the owner is
444	* set to NULL, and NULL is returned.
445	* Changed 2004-02-12 - if the player is setting at the play again
446	* prompt, he is removed, and we don't want to treat him as an owner of
447	* anything, so check removed flag. I don't expect that this should break
448	* anything - once an object is removed, it is basically dead anyways.
449	*/
450	object *
451	object::get_owner ()
452	{
453	if (!owner
454	|| QUERY_FLAG (owner, FLAG_FREED)
455	|| QUERY_FLAG (owner, FLAG_REMOVED))
456	owner = 0;
457
458	return owner;
459	}	449	}
460		450
461	/*	451	/*
462	* Sets the owner and sets the skill and exp pointers to owner's current	452	* Sets the owner and sets the skill and exp pointers to owner's current
463	* skill and experience objects.	453	* skill and experience objects.
…		…
533		523
534	/* What is not cleared is next, prev, and count */	524	/* What is not cleared is next, prev, and count */
535		525
536	expmul = 1.0;	526	expmul = 1.0;
537	face = blank_face;	527	face = blank_face;
538	attacked_by_count = -1;
539		528
540	if (settings.casting_time)	529	if (settings.casting_time)
541	casting_time = -1;	530	casting_time = -1;
542	}	531	}
543		532
544	void object::clone (object *destination)
545	{
546	*(object_copy *)destination = *this;
547	*(object_pod *)destination = *this;
548
549	if (self || cb)
550	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
551	}
552
553	/*	533	/*
554	* copy object first frees everything allocated by the second object,	534	* copy_to first frees everything allocated by the dst object,
555	* and then copies the contends of the first object into the second	535	* and then copies the contents of itself into the second
556	* object, allocating what needs to be allocated. Basically, any	536	* object, allocating what needs to be allocated. Basically, any
557	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	537	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
558	* if the first object is freed, the pointers in the new object	538	* if the first object is freed, the pointers in the new object
559	* will point at garbage.	539	* will point at garbage.
560	*/	540	*/
561	void	541	void
562	copy_object (object *op2, object *op)	542	object::copy_to (object *dst)
563	{	543	{
564	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	544	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
565	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	545	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
566		546
567	op2->clone (op);	547	*(object_copy *)dst = *this;
		548	*(object_pod *)dst = *this;
		549
		550	if (self || cb)
		551	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
568		552
569	if (is_freed)	553	if (is_freed)
570	SET_FLAG (op, FLAG_FREED);	554	SET_FLAG (dst, FLAG_FREED);
		555
571	if (is_removed)	556	if (is_removed)
572	SET_FLAG (op, FLAG_REMOVED);	557	SET_FLAG (dst, FLAG_REMOVED);
573		558
574	if (op2->speed < 0)	559	if (speed < 0)
575	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	560	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
576		561
577	/* Copy over key_values, if any. */	562	/* Copy over key_values, if any. */
578	if (op2->key_values)	563	if (key_values)
579	{	564	{
580	key_value *tail = 0;	565	key_value *tail = 0;
581	key_value *i;	566	key_value *i;
582		567
583	op->key_values = 0;	568	dst->key_values = 0;
584		569
585	for (i = op2->key_values; i; i = i->next)	570	for (i = key_values; i; i = i->next)
586	{	571	{
587	key_value *new_link = new key_value;	572	key_value *new_link = new key_value;
588		573
589	new_link->next = 0;	574	new_link->next = 0;
590	new_link->key = i->key;	575	new_link->key = i->key;
591	new_link->value = i->value;	576	new_link->value = i->value;
592		577
593	/* Try and be clever here, too. */	578	/* Try and be clever here, too. */
594	if (!op->key_values)	579	if (!dst->key_values)
595	{	580	{
596	op->key_values = new_link;	581	dst->key_values = new_link;
597	tail = new_link;	582	tail = new_link;
598	}	583	}
599	else	584	else
600	{	585	{
601	tail->next = new_link;	586	tail->next = new_link;
602	tail = new_link;	587	tail = new_link;
603	}	588	}
604	}	589	}
605	}	590	}
606		591
607	update_ob_speed (op);	592	update_ob_speed (dst);
		593	}
		594
		595	object *
		596	object::clone ()
		597	{
		598	object *neu = create ();
		599	copy_to (neu);
		600	return neu;
608	}	601	}
609		602
610	/*	603	/*
611	* If an object with the IS_TURNABLE() flag needs to be turned due	604	* If an object with the IS_TURNABLE() flag needs to be turned due
612	* to the closest player being on the other side, this function can	605	* to the closest player being on the other side, this function can
…		…
817	update_now = 1;	810	update_now = 1;
818		811
819	if ((move_slow | op->move_slow) != move_slow)	812	if ((move_slow | op->move_slow) != move_slow)
820	update_now = 1;	813	update_now = 1;
821	}	814	}
		815
822	/* if the object is being removed, we can't make intelligent	816	/* if the object is being removed, we can't make intelligent
823	* decisions, because remove_ob can't really pass the object	817	* decisions, because remove_ob can't really pass the object
824	* that is being removed.	818	* that is being removed.
825	*/	819	*/
826	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	820	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
838		832
839	if (op->more != NULL)	833	if (op->more != NULL)
840	update_object (op->more, action);	834	update_object (op->more, action);
841	}	835	}
842		836
843	static unordered_vector<object *> mortals;	837	object::vector object::mortals;
844	static std::vector<object *, slice_allocator <object *> > freed;	838	object::vector object::objects; // not yet used
		839	object *object::first;
845		840
846	void object::free_mortals ()	841	void object::free_mortals ()
847	{	842	{
848	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	843	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
849	if ((*i)->refcnt)	844	if ((*i)->refcnt)
850	++i; // further delay freeing	845	++i; // further delay freeing
851	else	846	else
852	{	847	{
853	freed.push_back (*i);//D
854	//delete *i;	848	delete *i;
855	mortals.erase (i);	849	mortals.erase (i);
856	}	850	}
857
858	if (mortals.size() && 0)//D
859	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
860	}	851	}
861		852
862	object::object ()	853	object::object ()
863	{	854	{
864	SET_FLAG (this, FLAG_REMOVED);	855	SET_FLAG (this, FLAG_REMOVED);
865		856
866	expmul = 1.0;	857	expmul = 1.0;
867	face = blank_face;	858	face = blank_face;
868	attacked_by_count = -1;
869	}	859	}
870		860
871	object::~object ()	861	object::~object ()
872	{	862	{
873	free_key_values (this);	863	free_key_values (this);
874	}	864	}
875		865
876	void object::link ()	866	void object::link ()
877	{	867	{
878	count = ++ob_count;	868	count = ++ob_count;
		869	uuid = gen_uuid ();
879		870
880	prev = 0;	871	prev = 0;
881	next = objects;	872	next = object::first;
882		873
883	if (objects)	874	if (object::first)
884	objects->prev = this;	875	object::first->prev = this;
885		876
886	objects = this;	877	object::first = this;
887	}	878	}
888		879
889	void object::unlink ()	880	void object::unlink ()
890	{	881	{
891	count = 0;	882	if (this == object::first)
		883	object::first = next;
892		884
893	/* Remove this object from the list of used objects */	885	/* Remove this object from the list of used objects */
894	if (prev)
895	{
896	prev->next = next;	886	if (prev) prev->next = next;
		887	if (next) next->prev = prev;
		888
897	prev = 0;	889	prev = 0;
898	}
899
900	if (next)
901	{
902	next->prev = prev;
903	next = 0;	890	next = 0;
904	}
905
906	if (this == objects)
907	objects = next;
908	}	891	}
909		892
910	object *object::create ()	893	object *object::create ()
911	{	894	{
912	object *op;
913
914	if (freed.empty ())
915	op = new object;	895	object *op = new object;
916	else
917	{
918	// highly annoying, but the only way to get it stable right now
919	op = freed.back ();
920	freed.pop_back ();
921	op->~object ();
922	new ((void *) op) object;
923	}
924
925	op->link ();	896	op->link ();
926	return op;	897	return op;
927	}	898	}
928		899
929	/*	900	/*
…		…
931	* it from the list of used objects, and puts it on the list of	902	* it from the list of used objects, and puts it on the list of
932	* free objects. The IS_FREED() flag is set in the object.	903	* free objects. The IS_FREED() flag is set in the object.
933	* The object must have been removed by remove_ob() first for	904	* The object must have been removed by remove_ob() first for
934	* this function to succeed.	905	* this function to succeed.
935	*	906	*
936	* If free_inventory is set, free inventory as well. Else drop items in	907	* If destroy_inventory is set, free inventory as well. Else drop items in
937	* inventory to the ground.	908	* inventory to the ground.
938	*/	909	*/
939	void object::free (bool free_inventory)	910	void object::destroy (bool destroy_inventory)
940	{	911	{
941	if (QUERY_FLAG (this, FLAG_FREED))	912	if (QUERY_FLAG (this, FLAG_FREED))
942	return;	913	return;
943		914
944	if (QUERY_FLAG (this, FLAG_FRIENDLY))	915	if (QUERY_FLAG (this, FLAG_FRIENDLY))
945	remove_friendly_object (this);	916	remove_friendly_object (this);
946		917
947	if (!QUERY_FLAG (this, FLAG_REMOVED))	918	if (!QUERY_FLAG (this, FLAG_REMOVED))
948	remove_ob (this);	919	remove ();
949		920
950	SET_FLAG (this, FLAG_FREED);	921	SET_FLAG (this, FLAG_FREED);
951		922
952	if (more)	923	if (more)
953	{	924	{
954	more->free (free_inventory);	925	more->destroy (destroy_inventory);
955	more = 0;	926	more = 0;
956	}	927	}
957		928
958	if (inv)	929	if (inv)
959	{	930	{
960	/* Only if the space blocks everything do we not process -	931	/* Only if the space blocks everything do we not process -
961	* if some form of movement is allowed, let objects	932	* if some form of movement is allowed, let objects
962	* drop on that space.	933	* drop on that space.
963	*/	934	*/
964	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	935	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
965	{	936	{
966	object *op = inv;	937	object *op = inv;
967		938
968	while (op)	939	while (op)
969	{	940	{
970	object *tmp = op->below;	941	object *tmp = op->below;
971	op->free (free_inventory);	942	op->destroy (destroy_inventory);
972	op = tmp;	943	op = tmp;
973	}	944	}
974	}	945	}
975	else	946	else
976	{ /* Put objects in inventory onto this space */	947	{ /* Put objects in inventory onto this space */
…		…
978		949
979	while (op)	950	while (op)
980	{	951	{
981	object *tmp = op->below;	952	object *tmp = op->below;
982		953
983	remove_ob (op);	954	op->remove ();
984		955
985	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	956	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
986	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	957	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
987	free_object (op);	958	op->destroy ();
988	else	959	else
989	{	960	{
990	op->x = x;	961	op->x = x;
991	op->y = y;	962	op->y = y;
992	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	963	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
995	op = tmp;	966	op = tmp;
996	}	967	}
997	}	968	}
998	}	969	}
999		970
		971	// hack to ensure that freed objects still have a valid map
		972	{
		973	static maptile *freed_map; // freed objects are moved here to avoid crashes
		974
		975	if (!freed_map)
		976	{
		977	freed_map = new maptile;
		978
		979	freed_map->name = "/internal/freed_objects_map";
		980	freed_map->width = 3;
		981	freed_map->height = 3;
		982
		983	freed_map->allocate ();
		984	}
		985
		986	map = freed_map;
		987	x = 1;
		988	y = 1;
		989	}
		990
		991	// clear those pointers that likely might have circular references to us
1000	owner = 0;	992	owner = 0;
		993	enemy = 0;
		994	attacked_by = 0;
		995
		996	// only relevant for players(?), but make sure of it anyways
		997	contr = 0;
1001		998
1002	/* Remove object from the active list */	999	/* Remove object from the active list */
1003	speed = 0;	1000	speed = 0;
1004	update_ob_speed (this);	1001	update_ob_speed (this);
1005		1002
…		…
1010		1007
1011	/*	1008	/*
1012	* sub_weight() recursively (outwards) subtracts a number from the	1009	* sub_weight() recursively (outwards) subtracts a number from the
1013	* weight of an object (and what is carried by it's environment(s)).	1010	* weight of an object (and what is carried by it's environment(s)).
1014	*/	1011	*/
1015
1016	void	1012	void
1017	sub_weight (object *op, signed long weight)	1013	sub_weight (object *op, signed long weight)
1018	{	1014	{
1019	while (op != NULL)	1015	while (op != NULL)
1020	{	1016	{
1021	if (op->type == CONTAINER)	1017	if (op->type == CONTAINER)
1022	{
1023	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1018	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024	}	1019
1025	op->carrying -= weight;	1020	op->carrying -= weight;
1026	op = op->env;	1021	op = op->env;
1027	}	1022	}
1028	}	1023	}
1029		1024
1030	/* remove_ob(op):	1025	/* op->remove ():
1031	* This function removes the object op from the linked list of objects	1026	* This function removes the object op from the linked list of objects
1032	* which it is currently tied to. When this function is done, the	1027	* which it is currently tied to. When this function is done, the
1033	* object will have no environment. If the object previously had an	1028	* object will have no environment. If the object previously had an
1034	* environment, the x and y coordinates will be updated to	1029	* environment, the x and y coordinates will be updated to
1035	* the previous environment.	1030	* the previous environment.
1036	* Beware: This function is called from the editor as well!	1031	* Beware: This function is called from the editor as well!
1037	*/	1032	*/
1038
1039	void	1033	void
1040	remove_ob (object *op)	1034	object::remove ()
1041	{	1035	{
		1036	object *tmp, *last = 0;
1042	object *	1037	object *otmp;
1043	tmp, *
1044	last = NULL;
1045	object *
1046	otmp;
1047		1038
1048	tag_t
1049	tag;
1050	int
1051	check_walk_off;	1039	int check_walk_off;
1052	mapstruct *
1053	m;
1054		1040
1055	sint16
1056	x,
1057	y;
1058
1059	if (QUERY_FLAG (op, FLAG_REMOVED))	1041	if (QUERY_FLAG (this, FLAG_REMOVED))
1060	return;	1042	return;
1061		1043
1062	SET_FLAG (op, FLAG_REMOVED);	1044	SET_FLAG (this, FLAG_REMOVED);
1063		1045
1064	if (op->more != NULL)	1046	if (more)
1065	remove_ob (op->more);	1047	more->remove ();
1066		1048
1067	/*	1049	/*
1068	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
1069	* inventory.	1051	* inventory.
1070	*/	1052	*/
1071	if (op->env != NULL)	1053	if (env)
1072	{	1054	{
1073	if (op->nrof)	1055	if (nrof)
1074	sub_weight (op->env, op->weight * op->nrof);	1056	sub_weight (env, weight * nrof);
1075	else	1057	else
1076	sub_weight (op->env, op->weight + op->carrying);	1058	sub_weight (env, weight + carrying);
1077		1059
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1060	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	1061	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1062	* to save cpu time.
1081	*/	1063	*/
1082	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1064	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1083	fix_player (otmp);	1065	fix_player (otmp);
1084		1066
1085	if (op->above != NULL)	1067	if (above != NULL)
1086	op->above->below = op->below;	1068	above->below = below;
1087	else	1069	else
1088	op->env->inv = op->below;	1070	env->inv = below;
1089		1071
1090	if (op->below != NULL)	1072	if (below != NULL)
1091	op->below->above = op->above;	1073	below->above = above;
1092		1074
1093	/* we set up values so that it could be inserted into	1075	/* we set up values so that it could be inserted into
1094	* the map, but we don't actually do that - it is up	1076	* the map, but we don't actually do that - it is up
1095	* to the caller to decide what we want to do.	1077	* to the caller to decide what we want to do.
1096	*/	1078	*/
1097	op->x = op->env->x, op->y = op->env->y;	1079	x = env->x, y = env->y;
1098	op->map = op->env->map;	1080	map = env->map;
1099	op->above = NULL, op->below = NULL;	1081	above = 0, below = 0;
1100	op->env = NULL;	1082	env = 0;
1101	}	1083	}
1102	else if (op->map)	1084	else if (map)
1103	{	1085	{
1104	x = op->x;
1105	y = op->y;
1106	m = get_map_from_coord (op->map, &x, &y);
1107
1108	if (!m)
1109	{
1110	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1111	op->map->path, op->x, op->y);
1112	/* in old days, we used to set x and y to 0 and continue.
1113	* it seems if we get into this case, something is probablye
1114	* screwed up and should be fixed.
1115	*/
1116	abort ();
1117	}
1118
1119	if (op->map != m)
1120	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1121	op->map->path, m->path, op->x, op->y, x, y);
1122
1123	/* Re did the following section of code - it looks like it had	1086	/* Re did the following section of code - it looks like it had
1124	* lots of logic for things we no longer care about	1087	* lots of logic for things we no longer care about
1125	*/	1088	*/
1126		1089
1127	/* link the object above us */	1090	/* link the object above us */
1128	if (op->above)	1091	if (above)
1129	op->above->below = op->below;	1092	above->below = below;
1130	else	1093	else
1131	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1094	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1132		1095
1133	/* Relink the object below us, if there is one */	1096	/* Relink the object below us, if there is one */
1134	if (op->below)	1097	if (below)
1135	op->below->above = op->above;	1098	below->above = above;
1136	else	1099	else
1137	{	1100	{
1138	/* Nothing below, which means we need to relink map object for this space	1101	/* Nothing below, which means we need to relink map object for this space
1139	* use translated coordinates in case some oddness with map tiling is	1102	* use translated coordinates in case some oddness with map tiling is
1140	* evident	1103	* evident
1141	*/	1104	*/
1142	if (GET_MAP_OB (m, x, y) != op)	1105	if (GET_MAP_OB (map, x, y) != this)
1143	{	1106	{
1144	dump_object (op);	1107	char *dump = dump_object (this);
1145	LOG (llevError,	1108	LOG (llevError,
1146	"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);	1109	"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);
		1110	free (dump);
1147	dump_object (GET_MAP_OB (m, x, y));	1111	dump = dump_object (GET_MAP_OB (map, x, y));
1148	LOG (llevError, "%s\n", errmsg);	1112	LOG (llevError, "%s\n", dump);
		1113	free (dump);
1149	}	1114	}
1150		1115
1151	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1116	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1152	}	1117	}
1153		1118
1154	op->above = 0;	1119	above = 0;
1155	op->below = 0;	1120	below = 0;
1156		1121
1157	if (op->map->in_memory == MAP_SAVING)	1122	if (map->in_memory == MAP_SAVING)
1158	return;	1123	return;
1159		1124
1160	tag = op->count;
1161	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1125	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1162		1126
1163	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1127	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1164	{	1128	{
1165	/* No point updating the players look faces if he is the object	1129	/* No point updating the players look faces if he is the object
1166	* being removed.	1130	* being removed.
1167	*/	1131	*/
1168		1132
1169	if (tmp->type == PLAYER && tmp != op)	1133	if (tmp->type == PLAYER && tmp != this)
1170	{	1134	{
1171	/* If a container that the player is currently using somehow gets	1135	/* If a container that the player is currently using somehow gets
1172	* removed (most likely destroyed), update the player view	1136	* removed (most likely destroyed), update the player view
1173	* appropriately.	1137	* appropriately.
1174	*/	1138	*/
1175	if (tmp->container == op)	1139	if (tmp->container == this)
1176	{	1140	{
1177	CLEAR_FLAG (op, FLAG_APPLIED);	1141	CLEAR_FLAG (this, FLAG_APPLIED);
1178	tmp->container = NULL;	1142	tmp->container = 0;
1179	}	1143	}
1180		1144
1181	tmp->contr->socket.update_look = 1;	1145	tmp->contr->socket.update_look = 1;
1182	}	1146	}
1183		1147
1184	/* See if player moving off should effect something */	1148	/* See if player moving off should effect something */
1185	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1149	if (check_walk_off
		1150	&& ((move_type & tmp->move_off)
		1151	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1186	{	1152	{
1187	move_apply (tmp, op, NULL);	1153	move_apply (tmp, this, 0);
1188		1154
1189	if (was_destroyed (op, tag))	1155	if (destroyed ())
1190	{
1191	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1156	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1192	}
1193	}	1157	}
1194		1158
1195	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1159	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196		1160
1197	if (tmp->above == tmp)	1161	if (tmp->above == tmp)
1198	tmp->above = NULL;	1162	tmp->above = 0;
1199		1163
1200	last = tmp;	1164	last = tmp;
1201	}	1165	}
1202		1166
1203	/* last == NULL of there are no objects on this space */	1167	/* last == NULL of there are no objects on this space */
1204	if (last == NULL)	1168	if (!last)
1205	{	1169	{
1206	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1170	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1207	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1171	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1208	* those out anyways, and if there are any flags set right now, they won't	1172	* those out anyways, and if there are any flags set right now, they won't
1209	* be correct anyways.	1173	* be correct anyways.
1210	*/	1174	*/
1211	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1175	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1212	update_position (op->map, op->x, op->y);	1176	update_position (map, x, y);
1213	}	1177	}
1214	else	1178	else
1215	update_object (last, UP_OBJ_REMOVE);	1179	update_object (last, UP_OBJ_REMOVE);
1216		1180
1217	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1181	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1218	update_all_los (op->map, op->x, op->y);	1182	update_all_los (map, x, y);
1219	}	1183	}
1220	}	1184	}
1221		1185
1222	/*	1186	/*
1223	* merge_ob(op,top):	1187	* merge_ob(op,top):
…		…
1238		1202
1239	for (; top != NULL; top = top->below)	1203	for (; top != NULL; top = top->below)
1240	{	1204	{
1241	if (top == op)	1205	if (top == op)
1242	continue;	1206	continue;
1243	if (CAN_MERGE (op, top))	1207
		1208	if (object::can_merge (op, top))
1244	{	1209	{
1245	top->nrof += op->nrof;	1210	top->nrof += op->nrof;
1246		1211
1247	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1212	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1248	op->weight = 0; /* Don't want any adjustements now */	1213	op->weight = 0; /* Don't want any adjustements now */
1249	remove_ob (op);	1214	op->destroy ();
1250	free_object (op);
1251	return top;	1215	return top;
1252	}	1216	}
1253	}	1217	}
1254		1218
1255	return NULL;	1219	return 0;
1256	}	1220	}
1257		1221
1258	/*	1222	/*
1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1223	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1260	* job preparing multi-part monsters	1224	* job preparing multi-part monsters
1261	*/	1225	*/
1262	object *	1226	object *
1263	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1227	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1264	{	1228	{
1265	object *tmp;	1229	object *tmp;
1266		1230
1267	if (op->head)	1231	if (op->head)
1268	op = op->head;	1232	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1260	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1261	* just 'op' otherwise
1298	*/	1262	*/
1299		1263
1300	object *	1264	object *
1301	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1265	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302	{	1266	{
1303	object *tmp, *top, *floor = NULL;	1267	object *tmp, *top, *floor = NULL;
1304	sint16 x, y;	1268	sint16 x, y;
1305		1269
1306	if (QUERY_FLAG (op, FLAG_FREED))	1270	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1309	return NULL;	1273	return NULL;
1310	}	1274	}
1311		1275
1312	if (m == NULL)	1276	if (m == NULL)
1313	{	1277	{
1314	dump_object (op);	1278	char *dump = dump_object (op);
1315	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1279	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1280	free (dump);
1316	return op;	1281	return op;
1317	}	1282	}
1318		1283
1319	if (out_of_map (m, op->x, op->y))	1284	if (out_of_map (m, op->x, op->y))
1320	{	1285	{
1321	dump_object (op);	1286	char *dump = dump_object (op);
1322	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1287	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1323	#ifdef MANY_CORES	1288	#ifdef MANY_CORES
1324	/* Better to catch this here, as otherwise the next use of this object	1289	/* Better to catch this here, as otherwise the next use of this object
1325	* is likely to cause a crash. Better to find out where it is getting	1290	* is likely to cause a crash. Better to find out where it is getting
1326	* improperly inserted.	1291	* improperly inserted.
1327	*/	1292	*/
1328	abort ();	1293	abort ();
1329	#endif	1294	#endif
		1295	free (dump);
1330	return op;	1296	return op;
1331	}	1297	}
1332		1298
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1299	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1300	{
1335	dump_object (op);	1301	char *dump = dump_object (op);
1336	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1302	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1303	free (dump);
1337	return op;	1304	return op;
1338	}	1305	}
1339		1306
1340	if (op->more != NULL)	1307	if (op->more != NULL)
1341	{	1308	{
…		…
1379		1346
1380	/* this has to be done after we translate the coordinates.	1347	/* this has to be done after we translate the coordinates.
1381	*/	1348	*/
1382	if (op->nrof && !(flag & INS_NO_MERGE))	1349	if (op->nrof && !(flag & INS_NO_MERGE))
1383	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1350	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1384	if (CAN_MERGE (op, tmp))	1351	if (object::can_merge (op, tmp))
1385	{	1352	{
1386	op->nrof += tmp->nrof;	1353	op->nrof += tmp->nrof;
1387	remove_ob (tmp);	1354	tmp->destroy ();
1388	free_object (tmp);
1389	}	1355	}
1390		1356
1391	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1357	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1392	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1358	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1393		1359
…		…
1579	tmp1;	1545	tmp1;
1580		1546
1581	/* first search for itself and remove any old instances */	1547	/* first search for itself and remove any old instances */
1582		1548
1583	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1549	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1584	{
1585	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1550	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1586	{	1551	tmp->destroy ();
1587	remove_ob (tmp);
1588	free_object (tmp);
1589	}
1590	}
1591		1552
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1553	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1554
1594	tmp1->x = op->x;	1555	tmp1->x = op->x;
1595	tmp1->y = op->y;	1556	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1557	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1558	}
…		…
1605	*/	1566	*/
1606		1567
1607	object *	1568	object *
1608	get_split_ob (object *orig_ob, uint32 nr)	1569	get_split_ob (object *orig_ob, uint32 nr)
1609	{	1570	{
1610	object *	1571	object *newob;
1611	newob;
1612	int
1613	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1572	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1614		1573
1615	if (orig_ob->nrof < nr)	1574	if (orig_ob->nrof < nr)
1616	{	1575	{
1617	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1576	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1618	return NULL;	1577	return NULL;
1619	}	1578	}
1620		1579
1621	newob = object_create_clone (orig_ob);	1580	newob = object_create_clone (orig_ob);
1622		1581
1623	if ((orig_ob->nrof -= nr) < 1)	1582	if ((orig_ob->nrof -= nr) < 1)
1624	{	1583	orig_ob->destroy (1);
1625	if (!is_removed)
1626	remove_ob (orig_ob);
1627	free_object2 (orig_ob, 1);
1628	}
1629	else if (!is_removed)	1584	else if (!is_removed)
1630	{	1585	{
1631	if (orig_ob->env != NULL)	1586	if (orig_ob->env != NULL)
1632	sub_weight (orig_ob->env, orig_ob->weight * nr);	1587	sub_weight (orig_ob->env, orig_ob->weight * nr);
1633	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1588	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1697	esrv_send_item (tmp, op);	1652	esrv_send_item (tmp, op);
1698	}	1653	}
1699	}	1654	}
1700	else	1655	else
1701	{	1656	{
1702	remove_ob (op);	1657	op->remove ();
1703	op->nrof = 0;	1658	op->nrof = 0;
1704	if (tmp)	1659	if (tmp)
1705	{	1660	{
1706	esrv_del_item (tmp->contr, op->count);	1661	esrv_del_item (tmp->contr, op->count);
1707	}	1662	}
…		…
1713		1668
1714	if (i < op->nrof)	1669	if (i < op->nrof)
1715	op->nrof -= i;	1670	op->nrof -= i;
1716	else	1671	else
1717	{	1672	{
1718	remove_ob (op);	1673	op->remove ();
1719	op->nrof = 0;	1674	op->nrof = 0;
1720	}	1675	}
1721		1676
1722	/* Since we just removed op, op->above is null */	1677	/* Since we just removed op, op->above is null */
1723	for (tmp = above; tmp != NULL; tmp = tmp->above)	1678	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1732		1687
1733	if (op->nrof)	1688	if (op->nrof)
1734	return op;	1689	return op;
1735	else	1690	else
1736	{	1691	{
1737	free_object (op);	1692	op->destroy ();
1738	return NULL;	1693	return NULL;
1739	}	1694	}
1740	}	1695	}
1741		1696
1742	/*	1697	/*
…		…
1755	op->carrying += weight;	1710	op->carrying += weight;
1756	op = op->env;	1711	op = op->env;
1757	}	1712	}
1758	}	1713	}
1759		1714
		1715	object *
		1716	insert_ob_in_ob (object *op, object *where)
		1717	{
		1718	if (!where)
		1719	{
		1720	char *dump = dump_object (op);
		1721	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1722	free (dump);
		1723	return op;
		1724	}
		1725
		1726	if (where->head)
		1727	{
		1728	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1729	where = where->head;
		1730	}
		1731
		1732	return where->insert (op);
		1733	}
		1734
1760	/*	1735	/*
1761	* insert_ob_in_ob(op,environment):	1736	* env->insert (op)
1762	* This function inserts the object op in the linked list	1737	* This function inserts the object op in the linked list
1763	* inside the object environment.	1738	* inside the object environment.
1764	*	1739	*
1765	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1766	* the inventory at the last position or next to other objects of the same
1767	* type.
1768	* Frank: Now sorted by type, archetype and magic!
1769	*
1770	* The function returns now pointer to inserted item, and return value can	1740	* The function returns now pointer to inserted item, and return value can
1771	* be != op, if items are merged. -Tero	1741	* be != op, if items are merged. -Tero
1772	*/	1742	*/
1773		1743
1774	object *	1744	object *
1775	insert_ob_in_ob (object *op, object *where)	1745	object::insert (object *op)
1776	{	1746	{
1777	object *	1747	object *tmp, *otmp;
1778	tmp, *
1779	otmp;
1780		1748
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1749	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1750	op->remove ();
1783	dump_object (op);
1784	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1785	return op;
1786	}
1787
1788	if (where == NULL)
1789	{
1790	dump_object (op);
1791	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1792	return op;
1793	}
1794
1795	if (where->head)
1796	{
1797	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1798	where = where->head;
1799	}
1800		1751
1801	if (op->more)	1752	if (op->more)
1802	{	1753	{
1803	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1754	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1804	return op;	1755	return op;
…		…
1806		1757
1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1758	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808	CLEAR_FLAG (op, FLAG_REMOVED);	1759	CLEAR_FLAG (op, FLAG_REMOVED);
1809	if (op->nrof)	1760	if (op->nrof)
1810	{	1761	{
1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1762	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812	if (CAN_MERGE (tmp, op))	1763	if (object::can_merge (tmp, op))
1813	{	1764	{
1814	/* return the original object and remove inserted object	1765	/* return the original object and remove inserted object
1815	(client needs the original object) */	1766	(client needs the original object) */
1816	tmp->nrof += op->nrof;	1767	tmp->nrof += op->nrof;
1817	/* Weight handling gets pretty funky. Since we are adding to	1768	/* Weight handling gets pretty funky. Since we are adding to
1818	* tmp->nrof, we need to increase the weight.	1769	* tmp->nrof, we need to increase the weight.
1819	*/	1770	*/
1820	add_weight (where, op->weight * op->nrof);	1771	add_weight (this, op->weight * op->nrof);
1821	SET_FLAG (op, FLAG_REMOVED);	1772	SET_FLAG (op, FLAG_REMOVED);
1822	free_object (op); /* free the inserted object */	1773	op->destroy (); /* free the inserted object */
1823	op = tmp;	1774	op = tmp;
1824	remove_ob (op); /* and fix old object's links */	1775	op->remove (); /* and fix old object's links */
1825	CLEAR_FLAG (op, FLAG_REMOVED);	1776	CLEAR_FLAG (op, FLAG_REMOVED);
1826	break;	1777	break;
1827	}	1778	}
1828		1779
1829	/* I assume combined objects have no inventory	1780	/* I assume combined objects have no inventory
1830	* We add the weight - this object could have just been removed	1781	* We add the weight - this object could have just been removed
1831	* (if it was possible to merge). calling remove_ob will subtract	1782	* (if it was possible to merge). calling remove_ob will subtract
1832	* the weight, so we need to add it in again, since we actually do	1783	* the weight, so we need to add it in again, since we actually do
1833	* the linking below	1784	* the linking below
1834	*/	1785	*/
1835	add_weight (where, op->weight * op->nrof);	1786	add_weight (this, op->weight * op->nrof);
1836	}	1787	}
1837	else	1788	else
1838	add_weight (where, (op->weight + op->carrying));	1789	add_weight (this, (op->weight + op->carrying));
1839		1790
1840	otmp = is_player_inv (where);	1791	otmp = is_player_inv (this);
1841	if (otmp && otmp->contr != NULL)	1792	if (otmp && otmp->contr)
1842	{
1843	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1793	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844	fix_player (otmp);	1794	fix_player (otmp);
1845	}
1846		1795
1847	op->map = NULL;	1796	op->map = NULL;
1848	op->env = where;	1797	op->env = this;
1849	op->above = NULL;	1798	op->above = NULL;
1850	op->below = NULL;	1799	op->below = NULL;
1851	op->x = 0, op->y = 0;	1800	op->x = 0, op->y = 0;
1852		1801
1853	/* reset the light list and los of the players on the map */	1802	/* reset the light list and los of the players on the map */
1854	if ((op->glow_radius != 0) && where->map)	1803	if ((op->glow_radius != 0) && map)
1855	{	1804	{
1856	#ifdef DEBUG_LIGHTS	1805	#ifdef DEBUG_LIGHTS
1857	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1806	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1858	#endif /* DEBUG_LIGHTS */	1807	#endif /* DEBUG_LIGHTS */
1859	if (MAP_DARKNESS (where->map))	1808	if (MAP_DARKNESS (map))
1860	update_all_los (where->map, where->x, where->y);	1809	update_all_los (map, x, y);
1861	}	1810	}
1862		1811
1863	/* Client has no idea of ordering so lets not bother ordering it here.	1812	/* Client has no idea of ordering so lets not bother ordering it here.
1864	* It sure simplifies this function...	1813	* It sure simplifies this function...
1865	*/	1814	*/
1866	if (where->inv == NULL)	1815	if (!inv)
1867	where->inv = op;	1816	inv = op;
1868	else	1817	else
1869	{	1818	{
1870	op->below = where->inv;	1819	op->below = inv;
1871	op->below->above = op;	1820	op->below->above = op;
1872	where->inv = op;	1821	inv = op;
1873	}	1822	}
		1823
1874	return op;	1824	return op;
1875	}	1825	}
1876		1826
1877	/*	1827	/*
1878	* Checks if any objects has a move_type that matches objects	1828	* Checks if any objects has a move_type that matches objects
…		…
1896	*/	1846	*/
1897		1847
1898	int	1848	int
1899	check_move_on (object *op, object *originator)	1849	check_move_on (object *op, object *originator)
1900	{	1850	{
1901	object *	1851	object *tmp;
1902	tmp;	1852	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1853	int x = op->x, y = op->y;
1909		1854
1910	MoveType	1855	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1856
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1857	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1858	return 0;
1917
1918	tag = op->count;
1919		1859
1920	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1860	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1921	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1861	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1922	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1862	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923		1863
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1924	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1985	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1925	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1926	{
1987	move_apply (tmp, op, originator);	1927	move_apply (tmp, op, originator);
1988		1928
1989	if (was_destroyed (op, tag))	1929	if (op->destroyed ())
1990	return 1;	1930	return 1;
1991		1931
1992	/* what the person/creature stepped onto has moved the object	1932	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1933	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1934	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	1946	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1947	* The first matching object is returned, or NULL if none.
2008	*/	1948	*/
2009		1949
2010	object *	1950	object *
2011	present_arch (const archetype *at, mapstruct *m, int x, int y)	1951	present_arch (const archetype *at, maptile *m, int x, int y)
2012	{	1952	{
2013	object *	1953	object *
2014	tmp;	1954	tmp;
2015		1955
2016	if (m == NULL || out_of_map (m, x, y))	1956	if (m == NULL || out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	1969	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	1970	* The first matching object is returned, or NULL if none.
2031	*/	1971	*/
2032		1972
2033	object *	1973	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	1974	present (unsigned char type, maptile *m, int x, int y)
2035	{	1975	{
2036	object *	1976	object *
2037	tmp;	1977	tmp;
2038		1978
2039	if (out_of_map (m, x, y))	1979	if (out_of_map (m, x, y))
…		…
2179	* the archetype because that isn't correct if the monster has been	2119	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	2120	* customized, changed states, etc.
2181	*/	2121	*/
2182		2122
2183	int	2123	int
2184	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2124	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2185	{	2125	{
2186	int	2126	int
2187	i,	2127	i,
2188	index = 0, flag;	2128	index = 0, flag;
2189	static int	2129	static int
…		…
2210	return -1;	2150	return -1;
2211	return altern[RANDOM () % index];	2151	return altern[RANDOM () % index];
2212	}	2152	}
2213		2153
2214	/*	2154	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2155	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2156	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2157	* But it will return the first available spot, not a random choice.
2218	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2158	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2159	*/
2220		2160
2221	int	2161	int
2222	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2162	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2223	{	2163	{
2224	int	2164	int
2225	i;	2165	i;
2226		2166
2227	for (i = 0; i < SIZEOFFREE; i++)	2167	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* because we have to know what movement the thing looking to move	2231	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2232	* there is capable of.
2293	*/	2233	*/
2294		2234
2295	int	2235	int
2296	find_dir (mapstruct *m, int x, int y, object *exclude)	2236	find_dir (maptile *m, int x, int y, object *exclude)
2297	{	2237	{
2298	int	2238	int
2299	i,	2239	i,
2300	max = SIZEOFFREE, mflags;	2240	max = SIZEOFFREE, mflags;
2301		2241
2302	sint16 nx, ny;	2242	sint16 nx, ny;
2303	object *	2243	object *
2304	tmp;	2244	tmp;
2305	mapstruct *	2245	maptile *
2306	mp;	2246	mp;
2307		2247
2308	MoveType blocked, move_type;	2248	MoveType blocked, move_type;
2309		2249
2310	if (exclude && exclude->head)	2250	if (exclude && exclude->head)
…		…
2518	* Modified to be map tile aware -.MSW	2458	* Modified to be map tile aware -.MSW
2519	*/	2459	*/
2520		2460
2521		2461
2522	int	2462	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2463	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2464	{
2525	sint16 dx, dy;	2465	sint16 dx, dy;
2526	int	2466	int
2527	mflags;	2467	mflags;
2528		2468
…		…
2577	* create clone from object to another	2517	* create clone from object to another
2578	*/	2518	*/
2579	object *	2519	object *
2580	object_create_clone (object *asrc)	2520	object_create_clone (object *asrc)
2581	{	2521	{
2582	object *
2583	dst = NULL, *tmp, *src, *part, *prev, *item;	2522	object *dst = 0, *tmp, *src, *part, *prev, *item;
2584		2523
2585	if (!asrc)	2524	if (!asrc)
2586	return NULL;	2525	return 0;
		2526
2587	src = asrc;	2527	src = asrc;
2588	if (src->head)	2528	if (src->head)
2589	src = src->head;	2529	src = src->head;
2590		2530
2591	prev = NULL;	2531	prev = 0;
2592	for (part = src; part; part = part->more)	2532	for (part = src; part; part = part->more)
2593	{	2533	{
2594	tmp = get_object ();	2534	tmp = part->clone ();
2595	copy_object (part, tmp);
2596	tmp->x -= src->x;	2535	tmp->x -= src->x;
2597	tmp->y -= src->y;	2536	tmp->y -= src->y;
		2537
2598	if (!part->head)	2538	if (!part->head)
2599	{	2539	{
2600	dst = tmp;	2540	dst = tmp;
2601	tmp->head = NULL;	2541	tmp->head = 0;
2602	}	2542	}
2603	else	2543	else
2604	{	2544	{
2605	tmp->head = dst;	2545	tmp->head = dst;
2606	}	2546	}
		2547
2607	tmp->more = NULL;	2548	tmp->more = 0;
		2549
2608	if (prev)	2550	if (prev)
2609	prev->more = tmp;	2551	prev->more = tmp;
		2552
2610	prev = tmp;	2553	prev = tmp;
2611	}	2554	}
2612		2555
2613	/*** copy inventory ***/
2614	for (item = src->inv; item; item = item->below)	2556	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2557	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2558
2619	return dst;	2559	return dst;
2620	}	2560	}
2621		2561
2622	/* return true if the object was destroyed, 0 otherwise */
2623	int
2624	was_destroyed (const object *op, tag_t old_tag)
2625	{
2626	/* checking for FLAG_FREED isn't necessary, but makes this function more
2627	* robust */
2628	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2629	}
2630
2631	/* GROS - Creates an object using a string representing its content. */	2562	/* GROS - Creates an object using a string representing its content. */
2632
2633	/* Basically, we save the content of the string to a temp file, then call */	2563	/* Basically, we save the content of the string to a temp file, then call */
2634
2635	/* load_object on it. I admit it is a highly inefficient way to make things, */	2564	/* load_object on it. I admit it is a highly inefficient way to make things, */
2636
2637	/* but it was simple to make and allows reusing the load_object function. */	2565	/* but it was simple to make and allows reusing the load_object function. */
2638
2639	/* Remember not to use load_object_str in a time-critical situation. */	2566	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2567	/* Also remember that multiparts objects are not supported for now. */
2642		2568
2643	object *	2569	object *
2644	load_object_str (const char *obstr)	2570	load_object_str (const char *obstr)
2645	{	2571	{
2646	object *	2572	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2573	char filename[MAX_BUF];
2650		2574
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2575	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2576
2653	FILE *
2654	tempfile = fopen (filename, "w");	2577	FILE *tempfile = fopen (filename, "w");
2655		2578
2656	if (tempfile == NULL)	2579	if (tempfile == NULL)
2657	{	2580	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2581	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2582	return NULL;
2660	};	2583	}
		2584
2661	fprintf (tempfile, obstr);	2585	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2586	fclose (tempfile);
2663		2587
2664	op = get_object ();	2588	op = object::create ();
2665		2589
2666	object_thawer thawer (filename);	2590	object_thawer thawer (filename);
2667		2591
2668	if (thawer)	2592	if (thawer)
2669	load_object (thawer, op, 0);	2593	load_object (thawer, op, 0);
…		…
2679	* returns NULL if no match.	2603	* returns NULL if no match.
2680	*/	2604	*/
2681	object *	2605	object *
2682	find_obj_by_type_subtype (const object *who, int type, int subtype)	2606	find_obj_by_type_subtype (const object *who, int type, int subtype)
2683	{	2607	{
2684	object *	2608	object *tmp;
2685	tmp;
2686		2609
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2610	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2611	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2612	return tmp;
2690		2613
…		…
2698	* do the desired thing.	2621	* do the desired thing.
2699	*/	2622	*/
2700	key_value *	2623	key_value *
2701	get_ob_key_link (const object *ob, const char *key)	2624	get_ob_key_link (const object *ob, const char *key)
2702	{	2625	{
2703	key_value *	2626	key_value *link;
2704	link;
2705		2627
2706	for (link = ob->key_values; link != NULL; link = link->next)	2628	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2629	if (link->key == key)
2709	{
2710	return link;	2630	return link;
2711	}
2712	}
2713		2631
2714	return NULL;	2632	return NULL;
2715	}	2633	}
2716		2634
2717	/*	2635	/*

Diff Legend

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