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.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	*/
…		…
254	{	333	{
255	if (inv->inv)	334	if (inv->inv)
256	sum_weight (inv);	335	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	336	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	337	}
		338
259	if (op->type == CONTAINER && op->stats.Str)	339	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	340	sum = (sum * (100 - op->stats.Str)) / 100;
		341
261	if (op->carrying != sum)	342	if (op->carrying != sum)
262	op->carrying = sum;	343	op->carrying = sum;
		344
263	return sum;	345	return sum;
264	}	346	}
265		347
266	/**	348	/**
267	* Return the outermost environment object for a given object.	349	* Return the outermost environment object for a given object.
…		…
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	376	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	377	* Some error messages.
296	* 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.
297	*/	379	*/
298		380
299	void	381	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)	382	dump_object (object *op)
355	{	383	{
356	if (op == NULL)	384	if (!op)
357	{	385	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		386
365	void	387	object_freezer freezer;
366	dump_all_objects (void)	388	save_object (freezer, op, 3);
367	{	389	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	}	390	}
376		391
377	/*	392	/*
378	* 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
379	* multi-object 1 which is closest to the second object.	394	* multi-object 1 which is closest to the second object.
…		…
399	*/	414	*/
400		415
401	object *	416	object *
402	find_object (tag_t i)	417	find_object (tag_t i)
403	{	418	{
404	object *op;	419	for (object *op = object::first; op; op = op->next)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	420	if (op->count == i)
408	break;	421	return op;
		422
409	return op;	423	return 0;
410	}	424	}
411		425
412	/*	426	/*
413	* 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.
414	* Used only by the patch command, but not all that useful.	428	* Used only by the patch command, but not all that useful.
…		…
416	*/	430	*/
417		431
418	object *	432	object *
419	find_object_name (const char *str)	433	find_object_name (const char *str)
420	{	434	{
421	const char *name = shstr::find (str);	435	shstr_cmp str_ (str);
422	object *op;	436	object *op;
423		437
424	for (op = objects; op != NULL; op = op->next)	438	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	439	if (op->name == str_)
426	break;	440	break;
427		441
428	return op;	442	return op;
429	}	443	}
430		444
431	void	445	void
432	free_all_object_data ()	446	free_all_object_data ()
433	{	447	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	448	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	}	449	}
457		450
458	/*	451	/*
459	* 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
460	* skill and experience objects.	453	* skill and experience objects.
…		…
530		523
531	/* What is not cleared is next, prev, and count */	524	/* What is not cleared is next, prev, and count */
532		525
533	expmul = 1.0;	526	expmul = 1.0;
534	face = blank_face;	527	face = blank_face;
535	attacked_by_count = -1;
536		528
537	if (settings.casting_time)	529	if (settings.casting_time)
538	casting_time = -1;	530	casting_time = -1;
539	}	531	}
540		532
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	/*	533	/*
551	* copy object first frees everything allocated by the second object,	534	* copy_to first frees everything allocated by the dst object,
552	* and then copies the contends of the first object into the second	535	* and then copies the contents of itself into the second
553	* object, allocating what needs to be allocated. Basically, any	536	* object, allocating what needs to be allocated. Basically, any
554	* 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,
555	* 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
556	* will point at garbage.	539	* will point at garbage.
557	*/	540	*/
558	void	541	void
559	copy_object (object *op2, object *op)	542	object::copy_to (object *dst)
560	{	543	{
561	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	544	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
562	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	545	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
563		546
564	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));
565		552
566	if (is_freed)	553	if (is_freed)
567	SET_FLAG (op, FLAG_FREED);	554	SET_FLAG (dst, FLAG_FREED);
		555
568	if (is_removed)	556	if (is_removed)
569	SET_FLAG (op, FLAG_REMOVED);	557	SET_FLAG (dst, FLAG_REMOVED);
570		558
571	if (op2->speed < 0)	559	if (speed < 0)
572	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	560	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
573		561
574	/* Copy over key_values, if any. */	562	/* Copy over key_values, if any. */
575	if (op2->key_values)	563	if (key_values)
576	{	564	{
577	key_value *tail = 0;	565	key_value *tail = 0;
578	key_value *i;	566	key_value *i;
579		567
580	op->key_values = 0;	568	dst->key_values = 0;
581		569
582	for (i = op2->key_values; i; i = i->next)	570	for (i = key_values; i; i = i->next)
583	{	571	{
584	key_value *new_link = new key_value;	572	key_value *new_link = new key_value;
585		573
586	new_link->next = 0;	574	new_link->next = 0;
587	new_link->key = i->key;	575	new_link->key = i->key;
588	new_link->value = i->value;	576	new_link->value = i->value;
589		577
590	/* Try and be clever here, too. */	578	/* Try and be clever here, too. */
591	if (!op->key_values)	579	if (!dst->key_values)
592	{	580	{
593	op->key_values = new_link;	581	dst->key_values = new_link;
594	tail = new_link;	582	tail = new_link;
595	}	583	}
596	else	584	else
597	{	585	{
598	tail->next = new_link;	586	tail->next = new_link;
599	tail = new_link;	587	tail = new_link;
600	}	588	}
601	}	589	}
602	}	590	}
603		591
604	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;
605	}	601	}
606		602
607	/*	603	/*
608	* 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
609	* 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
…		…
814	update_now = 1;	810	update_now = 1;
815		811
816	if ((move_slow | op->move_slow) != move_slow)	812	if ((move_slow | op->move_slow) != move_slow)
817	update_now = 1;	813	update_now = 1;
818	}	814	}
		815
819	/* if the object is being removed, we can't make intelligent	816	/* if the object is being removed, we can't make intelligent
820	* decisions, because remove_ob can't really pass the object	817	* decisions, because remove_ob can't really pass the object
821	* that is being removed.	818	* that is being removed.
822	*/	819	*/
823	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	820	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
835		832
836	if (op->more != NULL)	833	if (op->more != NULL)
837	update_object (op->more, action);	834	update_object (op->more, action);
838	}	835	}
839		836
840	static unordered_vector<object *> mortals;	837	object::vector object::mortals;
841	static std::vector<object *> freed;	838	object::vector object::objects; // not yet used
		839	object *object::first;
842		840
843	void object::free_mortals ()	841	void object::free_mortals ()
844	{	842	{
845	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	843	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
846	if ((*i)->refcnt)	844	if ((*i)->refcnt)
847	++i; // further delay freeing	845	++i; // further delay freeing
848	else	846	else
849	{	847	{
850	freed.push_back (*i);//D
851	//delete *i;	848	delete *i;
852	mortals.erase (i);	849	mortals.erase (i);
853	}	850	}
854
855	if (mortals.size())//D
856	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
857	}	851	}
858		852
859	object::object ()	853	object::object ()
860	{	854	{
861	SET_FLAG (this, FLAG_REMOVED);	855	SET_FLAG (this, FLAG_REMOVED);
862		856
863	expmul = 1.0;	857	expmul = 1.0;
864	face = blank_face;	858	face = blank_face;
865	attacked_by_count = -1;
866	}	859	}
867		860
868	object::~object ()	861	object::~object ()
869	{	862	{
870	free_key_values (this);	863	free_key_values (this);
871	}	864	}
872		865
873	void object::link ()	866	void object::link ()
874	{	867	{
875	count = ++ob_count;	868	count = ++ob_count;
		869	uuid = gen_uuid ();
876		870
877	prev = 0;	871	prev = 0;
878	next = objects;	872	next = object::first;
879		873
880	if (objects)	874	if (object::first)
881	objects->prev = this;	875	object::first->prev = this;
882		876
883	objects = this;	877	object::first = this;
884	}	878	}
885		879
886	void object::unlink ()	880	void object::unlink ()
887	{	881	{
888	count = 0;	882	if (this == object::first)
		883	object::first = next;
889		884
890	/* Remove this object from the list of used objects */	885	/* Remove this object from the list of used objects */
891	if (prev)
892	{
893	prev->next = next;	886	if (prev) prev->next = next;
		887	if (next) next->prev = prev;
		888
894	prev = 0;	889	prev = 0;
895	}
896
897	if (next)
898	{
899	next->prev = prev;
900	next = 0;	890	next = 0;
901	}
902
903	if (this == objects)
904	objects = next;
905	}	891	}
906		892
907	object *object::create ()	893	object *object::create ()
908	{	894	{
909	object *op;
910
911	if (freed.empty ())
912	op = new object;	895	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 ();	896	op->link ();
923	return op;	897	return op;
924	}	898	}
925		899
926	/*	900	/*
…		…
928	* 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
929	* free objects. The IS_FREED() flag is set in the object.	903	* free objects. The IS_FREED() flag is set in the object.
930	* The object must have been removed by remove_ob() first for	904	* The object must have been removed by remove_ob() first for
931	* this function to succeed.	905	* this function to succeed.
932	*	906	*
933	* 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
934	* inventory to the ground.	908	* inventory to the ground.
935	*/	909	*/
936	void object::free (bool free_inventory)	910	void object::destroy (bool destroy_inventory)
937	{	911	{
938	if (QUERY_FLAG (this, FLAG_FREED))	912	if (QUERY_FLAG (this, FLAG_FREED))
939	return;	913	return;
940		914
941	if (QUERY_FLAG (this, FLAG_FRIENDLY))	915	if (QUERY_FLAG (this, FLAG_FRIENDLY))
942	remove_friendly_object (this);	916	remove_friendly_object (this);
943		917
944	if (!QUERY_FLAG (this, FLAG_REMOVED))	918	if (!QUERY_FLAG (this, FLAG_REMOVED))
945	remove_ob (this);	919	remove ();
946		920
947	SET_FLAG (this, FLAG_FREED);	921	SET_FLAG (this, FLAG_FREED);
948		922
949	if (more)	923	if (more)
950	{	924	{
951	more->free (free_inventory);	925	more->destroy (destroy_inventory);
952	more = 0;	926	more = 0;
953	}	927	}
954		928
955	if (inv)	929	if (inv)
956	{	930	{
957	/* Only if the space blocks everything do we not process -	931	/* Only if the space blocks everything do we not process -
958	* if some form of movement is allowed, let objects	932	* if some form of movement is allowed, let objects
959	* drop on that space.	933	* drop on that space.
960	*/	934	*/
961	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)
962	{	936	{
963	object *op = inv;	937	object *op = inv;
964		938
965	while (op)	939	while (op)
966	{	940	{
967	object *tmp = op->below;	941	object *tmp = op->below;
968	op->free (free_inventory);	942	op->destroy (destroy_inventory);
969	op = tmp;	943	op = tmp;
970	}	944	}
971	}	945	}
972	else	946	else
973	{ /* Put objects in inventory onto this space */	947	{ /* Put objects in inventory onto this space */
…		…
975		949
976	while (op)	950	while (op)
977	{	951	{
978	object *tmp = op->below;	952	object *tmp = op->below;
979		953
980	remove_ob (op);	954	op->remove ();
981		955
982	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	956	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))	957	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
984	free_object (op);	958	op->destroy ();
985	else	959	else
986	{	960	{
987	op->x = x;	961	op->x = x;
988	op->y = y;	962	op->y = y;
989	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 */
…		…
992	op = tmp;	966	op = tmp;
993	}	967	}
994	}	968	}
995	}	969	}
996		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
997	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;
998		998
999	/* Remove object from the active list */	999	/* Remove object from the active list */
1000	speed = 0;	1000	speed = 0;
1001	update_ob_speed (this);	1001	update_ob_speed (this);
1002		1002
…		…
1007		1007
1008	/*	1008	/*
1009	* sub_weight() recursively (outwards) subtracts a number from the	1009	* sub_weight() recursively (outwards) subtracts a number from the
1010	* 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)).
1011	*/	1011	*/
1012
1013	void	1012	void
1014	sub_weight (object *op, signed long weight)	1013	sub_weight (object *op, signed long weight)
1015	{	1014	{
1016	while (op != NULL)	1015	while (op != NULL)
1017	{	1016	{
1018	if (op->type == CONTAINER)	1017	if (op->type == CONTAINER)
1019	{
1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1018	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021	}	1019
1022	op->carrying -= weight;	1020	op->carrying -= weight;
1023	op = op->env;	1021	op = op->env;
1024	}	1022	}
1025	}	1023	}
1026		1024
1027	/* remove_ob(op):	1025	/* op->remove ():
1028	* 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
1029	* 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
1030	* object will have no environment. If the object previously had an	1028	* object will have no environment. If the object previously had an
1031	* environment, the x and y coordinates will be updated to	1029	* environment, the x and y coordinates will be updated to
1032	* the previous environment.	1030	* the previous environment.
1033	* Beware: This function is called from the editor as well!	1031	* Beware: This function is called from the editor as well!
1034	*/	1032	*/
1035
1036	void	1033	void
1037	remove_ob (object *op)	1034	object::remove ()
1038	{	1035	{
		1036	object *tmp, *last = 0;
1039	object *	1037	object *otmp;
1040	tmp, *
1041	last = NULL;
1042	object *
1043	otmp;
1044		1038
1045	tag_t
1046	tag;
1047	int
1048	check_walk_off;	1039	int check_walk_off;
1049	mapstruct *
1050	m;
1051		1040
1052	sint16
1053	x,
1054	y;
1055
1056	if (QUERY_FLAG (op, FLAG_REMOVED))	1041	if (QUERY_FLAG (this, FLAG_REMOVED))
1057	return;	1042	return;
1058		1043
1059	SET_FLAG (op, FLAG_REMOVED);	1044	SET_FLAG (this, FLAG_REMOVED);
1060		1045
1061	if (op->more != NULL)	1046	if (more)
1062	remove_ob (op->more);	1047	more->remove ();
1063		1048
1064	/*	1049	/*
1065	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
1066	* inventory.	1051	* inventory.
1067	*/	1052	*/
1068	if (op->env != NULL)	1053	if (env)
1069	{	1054	{
1070	if (op->nrof)	1055	if (nrof)
1071	sub_weight (op->env, op->weight * op->nrof);	1056	sub_weight (env, weight * nrof);
1072	else	1057	else
1073	sub_weight (op->env, op->weight + op->carrying);	1058	sub_weight (env, weight + carrying);
1074		1059
1075	/* 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
1076	* made to players inventory. If set, avoiding the call	1061	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.	1062	* to save cpu time.
1078	*/	1063	*/
1079	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))
1080	fix_player (otmp);	1065	fix_player (otmp);
1081		1066
1082	if (op->above != NULL)	1067	if (above != NULL)
1083	op->above->below = op->below;	1068	above->below = below;
1084	else	1069	else
1085	op->env->inv = op->below;	1070	env->inv = below;
1086		1071
1087	if (op->below != NULL)	1072	if (below != NULL)
1088	op->below->above = op->above;	1073	below->above = above;
1089		1074
1090	/* we set up values so that it could be inserted into	1075	/* we set up values so that it could be inserted into
1091	* 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
1092	* to the caller to decide what we want to do.	1077	* to the caller to decide what we want to do.
1093	*/	1078	*/
1094	op->x = op->env->x, op->y = op->env->y;	1079	x = env->x, y = env->y;
1095	op->map = op->env->map;	1080	map = env->map;
1096	op->above = NULL, op->below = NULL;	1081	above = 0, below = 0;
1097	op->env = NULL;	1082	env = 0;
1098	}	1083	}
1099	else if (op->map)	1084	else if (map)
1100	{	1085	{
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	1086	/* Re did the following section of code - it looks like it had
1121	* lots of logic for things we no longer care about	1087	* lots of logic for things we no longer care about
1122	*/	1088	*/
1123		1089
1124	/* link the object above us */	1090	/* link the object above us */
1125	if (op->above)	1091	if (above)
1126	op->above->below = op->below;	1092	above->below = below;
1127	else	1093	else
1128	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 */
1129		1095
1130	/* Relink the object below us, if there is one */	1096	/* Relink the object below us, if there is one */
1131	if (op->below)	1097	if (below)
1132	op->below->above = op->above;	1098	below->above = above;
1133	else	1099	else
1134	{	1100	{
1135	/* 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
1136	* use translated coordinates in case some oddness with map tiling is	1102	* use translated coordinates in case some oddness with map tiling is
1137	* evident	1103	* evident
1138	*/	1104	*/
1139	if (GET_MAP_OB (m, x, y) != op)	1105	if (GET_MAP_OB (map, x, y) != this)
1140	{	1106	{
1141	dump_object (op);	1107	char *dump = dump_object (this);
1142	LOG (llevError,	1108	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);	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);
1144	dump_object (GET_MAP_OB (m, x, y));	1111	dump = dump_object (GET_MAP_OB (map, x, y));
1145	LOG (llevError, "%s\n", errmsg);	1112	LOG (llevError, "%s\n", dump);
		1113	free (dump);
1146	}	1114	}
1147		1115
1148	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1116	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1149	}	1117	}
1150		1118
1151	op->above = 0;	1119	above = 0;
1152	op->below = 0;	1120	below = 0;
1153		1121
1154	if (op->map->in_memory == MAP_SAVING)	1122	if (map->in_memory == MAP_SAVING)
1155	return;	1123	return;
1156		1124
1157	tag = op->count;
1158	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1125	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1159		1126
1160	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)
1161	{	1128	{
1162	/* 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
1163	* being removed.	1130	* being removed.
1164	*/	1131	*/
1165		1132
1166	if (tmp->type == PLAYER && tmp != op)	1133	if (tmp->type == PLAYER && tmp != this)
1167	{	1134	{
1168	/* If a container that the player is currently using somehow gets	1135	/* If a container that the player is currently using somehow gets
1169	* removed (most likely destroyed), update the player view	1136	* removed (most likely destroyed), update the player view
1170	* appropriately.	1137	* appropriately.
1171	*/	1138	*/
1172	if (tmp->container == op)	1139	if (tmp->container == this)
1173	{	1140	{
1174	CLEAR_FLAG (op, FLAG_APPLIED);	1141	CLEAR_FLAG (this, FLAG_APPLIED);
1175	tmp->container = NULL;	1142	tmp->container = 0;
1176	}	1143	}
1177		1144
1178	tmp->contr->socket.update_look = 1;	1145	tmp->contr->socket.update_look = 1;
1179	}	1146	}
1180		1147
1181	/* See if player moving off should effect something */	1148	/* 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))	1149	if (check_walk_off
		1150	&& ((move_type & tmp->move_off)
		1151	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1183	{	1152	{
1184	move_apply (tmp, op, NULL);	1153	move_apply (tmp, this, 0);
1185		1154
1186	if (was_destroyed (op, tag))	1155	if (destroyed ())
1187	{
1188	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 ());
1189	}
1190	}	1157	}
1191		1158
1192	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1159	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1193		1160
1194	if (tmp->above == tmp)	1161	if (tmp->above == tmp)
1195	tmp->above = NULL;	1162	tmp->above = 0;
1196		1163
1197	last = tmp;	1164	last = tmp;
1198	}	1165	}
1199		1166
1200	/* last == NULL of there are no objects on this space */	1167	/* last == NULL of there are no objects on this space */
1201	if (last == NULL)	1168	if (!last)
1202	{	1169	{
1203	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1170	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1204	* 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
1205	* 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
1206	* be correct anyways.	1173	* be correct anyways.
1207	*/	1174	*/
1208	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1175	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1209	update_position (op->map, op->x, op->y);	1176	update_position (map, x, y);
1210	}	1177	}
1211	else	1178	else
1212	update_object (last, UP_OBJ_REMOVE);	1179	update_object (last, UP_OBJ_REMOVE);
1213		1180
1214	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1181	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1215	update_all_los (op->map, op->x, op->y);	1182	update_all_los (map, x, y);
1216	}	1183	}
1217	}	1184	}
1218		1185
1219	/*	1186	/*
1220	* merge_ob(op,top):	1187	* merge_ob(op,top):
…		…
1222	* This function goes through all objects below and including top, and	1189	* This function goes through all objects below and including top, and
1223	* merges op to the first matching object.	1190	* merges op to the first matching object.
1224	* If top is NULL, it is calculated.	1191	* If top is NULL, it is calculated.
1225	* Returns pointer to object if it succeded in the merge, otherwise NULL	1192	* Returns pointer to object if it succeded in the merge, otherwise NULL
1226	*/	1193	*/
1227
1228	object *	1194	object *
1229	merge_ob (object *op, object *top)	1195	merge_ob (object *op, object *top)
1230	{	1196	{
1231	if (!op->nrof)	1197	if (!op->nrof)
1232	return 0;	1198	return 0;
…		…
1236		1202
1237	for (; top != NULL; top = top->below)	1203	for (; top != NULL; top = top->below)
1238	{	1204	{
1239	if (top == op)	1205	if (top == op)
1240	continue;	1206	continue;
1241	if (CAN_MERGE (op, top))	1207
		1208	if (object::can_merge (op, top))
1242	{	1209	{
1243	top->nrof += op->nrof;	1210	top->nrof += op->nrof;
1244		1211
1245	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1212	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1246	op->weight = 0; /* Don't want any adjustements now */	1213	op->weight = 0; /* Don't want any adjustements now */
1247	remove_ob (op);	1214	op->destroy ();
1248	free_object (op);
1249	return top;	1215	return top;
1250	}	1216	}
1251	}	1217	}
1252		1218
1253	return NULL;	1219	return 0;
1254	}	1220	}
1255		1221
1256	/*	1222	/*
1257	* 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
1258	* job preparing multi-part monsters	1224	* job preparing multi-part monsters
1259	*/	1225	*/
1260	object *	1226	object *
1261	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)
1262	{	1228	{
1263	object *tmp;	1229	object *tmp;
1264		1230
1265	if (op->head)	1231	if (op->head)
1266	op = op->head;	1232	op = op->head;
…		…
1294	* NULL if 'op' was destroyed	1260	* NULL if 'op' was destroyed
1295	* just 'op' otherwise	1261	* just 'op' otherwise
1296	*/	1262	*/
1297		1263
1298	object *	1264	object *
1299	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)
1300	{	1266	{
1301	object *tmp, *top, *floor = NULL;	1267	object *tmp, *top, *floor = NULL;
1302	sint16 x, y;	1268	sint16 x, y;
1303		1269
1304	if (QUERY_FLAG (op, FLAG_FREED))	1270	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1307	return NULL;	1273	return NULL;
1308	}	1274	}
1309		1275
1310	if (m == NULL)	1276	if (m == NULL)
1311	{	1277	{
1312	dump_object (op);	1278	char *dump = dump_object (op);
1313	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);
1314	return op;	1281	return op;
1315	}	1282	}
1316		1283
1317	if (out_of_map (m, op->x, op->y))	1284	if (out_of_map (m, op->x, op->y))
1318	{	1285	{
1319	dump_object (op);	1286	char *dump = dump_object (op);
1320	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);
1321	#ifdef MANY_CORES	1288	#ifdef MANY_CORES
1322	/* 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
1323	* 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
1324	* improperly inserted.	1291	* improperly inserted.
1325	*/	1292	*/
1326	abort ();	1293	abort ();
1327	#endif	1294	#endif
		1295	free (dump);
1328	return op;	1296	return op;
1329	}	1297	}
1330		1298
1331	if (!QUERY_FLAG (op, FLAG_REMOVED))	1299	if (!QUERY_FLAG (op, FLAG_REMOVED))
1332	{	1300	{
1333	dump_object (op);	1301	char *dump = dump_object (op);
1334	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);
1335	return op;	1304	return op;
1336	}	1305	}
1337		1306
1338	if (op->more != NULL)	1307	if (op->more != NULL)
1339	{	1308	{
…		…
1377		1346
1378	/* this has to be done after we translate the coordinates.	1347	/* this has to be done after we translate the coordinates.
1379	*/	1348	*/
1380	if (op->nrof && !(flag & INS_NO_MERGE))	1349	if (op->nrof && !(flag & INS_NO_MERGE))
1381	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)
1382	if (CAN_MERGE (op, tmp))	1351	if (object::can_merge (op, tmp))
1383	{	1352	{
1384	op->nrof += tmp->nrof;	1353	op->nrof += tmp->nrof;
1385	remove_ob (tmp);	1354	tmp->destroy ();
1386	free_object (tmp);
1387	}	1355	}
1388		1356
1389	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 */
1390	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1358	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1391		1359
…		…
1577	tmp1;	1545	tmp1;
1578		1546
1579	/* first search for itself and remove any old instances */	1547	/* first search for itself and remove any old instances */
1580		1548
1581	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)
1582	{
1583	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1550	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1584	{	1551	tmp->destroy ();
1585	remove_ob (tmp);
1586	free_object (tmp);
1587	}
1588	}
1589		1552
1590	tmp1 = arch_to_object (find_archetype (arch_string));	1553	tmp1 = arch_to_object (archetype::find (arch_string));
1591		1554
1592	tmp1->x = op->x;	1555	tmp1->x = op->x;
1593	tmp1->y = op->y;	1556	tmp1->y = op->y;
1594	insert_ob_in_map (tmp1, op->map, op, 0);	1557	insert_ob_in_map (tmp1, op->map, op, 0);
1595	}	1558	}
…		…
1603	*/	1566	*/
1604		1567
1605	object *	1568	object *
1606	get_split_ob (object *orig_ob, uint32 nr)	1569	get_split_ob (object *orig_ob, uint32 nr)
1607	{	1570	{
1608	object *	1571	object *newob;
1609	newob;
1610	int
1611	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1572	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1612		1573
1613	if (orig_ob->nrof < nr)	1574	if (orig_ob->nrof < nr)
1614	{	1575	{
1615	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);
1616	return NULL;	1577	return NULL;
1617	}	1578	}
1618		1579
1619	newob = object_create_clone (orig_ob);	1580	newob = object_create_clone (orig_ob);
1620		1581
1621	if ((orig_ob->nrof -= nr) < 1)	1582	if ((orig_ob->nrof -= nr) < 1)
1622	{	1583	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)	1584	else if (!is_removed)
1628	{	1585	{
1629	if (orig_ob->env != NULL)	1586	if (orig_ob->env != NULL)
1630	sub_weight (orig_ob->env, orig_ob->weight * nr);	1587	sub_weight (orig_ob->env, orig_ob->weight * nr);
1631	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)
…		…
1695	esrv_send_item (tmp, op);	1652	esrv_send_item (tmp, op);
1696	}	1653	}
1697	}	1654	}
1698	else	1655	else
1699	{	1656	{
1700	remove_ob (op);	1657	op->remove ();
1701	op->nrof = 0;	1658	op->nrof = 0;
1702	if (tmp)	1659	if (tmp)
1703	{	1660	{
1704	esrv_del_item (tmp->contr, op->count);	1661	esrv_del_item (tmp->contr, op->count);
1705	}	1662	}
…		…
1711		1668
1712	if (i < op->nrof)	1669	if (i < op->nrof)
1713	op->nrof -= i;	1670	op->nrof -= i;
1714	else	1671	else
1715	{	1672	{
1716	remove_ob (op);	1673	op->remove ();
1717	op->nrof = 0;	1674	op->nrof = 0;
1718	}	1675	}
1719		1676
1720	/* Since we just removed op, op->above is null */	1677	/* Since we just removed op, op->above is null */
1721	for (tmp = above; tmp != NULL; tmp = tmp->above)	1678	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1730		1687
1731	if (op->nrof)	1688	if (op->nrof)
1732	return op;	1689	return op;
1733	else	1690	else
1734	{	1691	{
1735	free_object (op);	1692	op->destroy ();
1736	return NULL;	1693	return NULL;
1737	}	1694	}
1738	}	1695	}
1739		1696
1740	/*	1697	/*
…		…
1753	op->carrying += weight;	1710	op->carrying += weight;
1754	op = op->env;	1711	op = op->env;
1755	}	1712	}
1756	}	1713	}
1757		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
1758	/*	1735	/*
1759	* insert_ob_in_ob(op,environment):	1736	* env->insert (op)
1760	* This function inserts the object op in the linked list	1737	* This function inserts the object op in the linked list
1761	* inside the object environment.	1738	* inside the object environment.
1762	*	1739	*
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	1740	* The function returns now pointer to inserted item, and return value can
1769	* be != op, if items are merged. -Tero	1741	* be != op, if items are merged. -Tero
1770	*/	1742	*/
1771		1743
1772	object *	1744	object *
1773	insert_ob_in_ob (object *op, object *where)	1745	object::insert (object *op)
1774	{	1746	{
1775	object *	1747	object *tmp, *otmp;
1776	tmp, *
1777	otmp;
1778		1748
1779	if (!QUERY_FLAG (op, FLAG_REMOVED))	1749	if (!QUERY_FLAG (op, FLAG_REMOVED))
1780	{	1750	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		1751
1799	if (op->more)	1752	if (op->more)
1800	{	1753	{
1801	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);
1802	return op;	1755	return op;
…		…
1804		1757
1805	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1758	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1806	CLEAR_FLAG (op, FLAG_REMOVED);	1759	CLEAR_FLAG (op, FLAG_REMOVED);
1807	if (op->nrof)	1760	if (op->nrof)
1808	{	1761	{
1809	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1762	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1810	if (CAN_MERGE (tmp, op))	1763	if (object::can_merge (tmp, op))
1811	{	1764	{
1812	/* return the original object and remove inserted object	1765	/* return the original object and remove inserted object
1813	(client needs the original object) */	1766	(client needs the original object) */
1814	tmp->nrof += op->nrof;	1767	tmp->nrof += op->nrof;
1815	/* Weight handling gets pretty funky. Since we are adding to	1768	/* Weight handling gets pretty funky. Since we are adding to
1816	* tmp->nrof, we need to increase the weight.	1769	* tmp->nrof, we need to increase the weight.
1817	*/	1770	*/
1818	add_weight (where, op->weight * op->nrof);	1771	add_weight (this, op->weight * op->nrof);
1819	SET_FLAG (op, FLAG_REMOVED);	1772	SET_FLAG (op, FLAG_REMOVED);
1820	free_object (op); /* free the inserted object */	1773	op->destroy (); /* free the inserted object */
1821	op = tmp;	1774	op = tmp;
1822	remove_ob (op); /* and fix old object's links */	1775	op->remove (); /* and fix old object's links */
1823	CLEAR_FLAG (op, FLAG_REMOVED);	1776	CLEAR_FLAG (op, FLAG_REMOVED);
1824	break;	1777	break;
1825	}	1778	}
1826		1779
1827	/* I assume combined objects have no inventory	1780	/* I assume combined objects have no inventory
1828	* We add the weight - this object could have just been removed	1781	* We add the weight - this object could have just been removed
1829	* (if it was possible to merge). calling remove_ob will subtract	1782	* (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	1783	* the weight, so we need to add it in again, since we actually do
1831	* the linking below	1784	* the linking below
1832	*/	1785	*/
1833	add_weight (where, op->weight * op->nrof);	1786	add_weight (this, op->weight * op->nrof);
1834	}	1787	}
1835	else	1788	else
1836	add_weight (where, (op->weight + op->carrying));	1789	add_weight (this, (op->weight + op->carrying));
1837		1790
1838	otmp = is_player_inv (where);	1791	otmp = is_player_inv (this);
1839	if (otmp && otmp->contr != NULL)	1792	if (otmp && otmp->contr)
1840	{
1841	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1793	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1842	fix_player (otmp);	1794	fix_player (otmp);
1843	}
1844		1795
1845	op->map = NULL;	1796	op->map = NULL;
1846	op->env = where;	1797	op->env = this;
1847	op->above = NULL;	1798	op->above = NULL;
1848	op->below = NULL;	1799	op->below = NULL;
1849	op->x = 0, op->y = 0;	1800	op->x = 0, op->y = 0;
1850		1801
1851	/* 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 */
1852	if ((op->glow_radius != 0) && where->map)	1803	if ((op->glow_radius != 0) && map)
1853	{	1804	{
1854	#ifdef DEBUG_LIGHTS	1805	#ifdef DEBUG_LIGHTS
1855	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);
1856	#endif /* DEBUG_LIGHTS */	1807	#endif /* DEBUG_LIGHTS */
1857	if (MAP_DARKNESS (where->map))	1808	if (MAP_DARKNESS (map))
1858	update_all_los (where->map, where->x, where->y);	1809	update_all_los (map, x, y);
1859	}	1810	}
1860		1811
1861	/* 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.
1862	* It sure simplifies this function...	1813	* It sure simplifies this function...
1863	*/	1814	*/
1864	if (where->inv == NULL)	1815	if (!inv)
1865	where->inv = op;	1816	inv = op;
1866	else	1817	else
1867	{	1818	{
1868	op->below = where->inv;	1819	op->below = inv;
1869	op->below->above = op;	1820	op->below->above = op;
1870	where->inv = op;	1821	inv = op;
1871	}	1822	}
		1823
1872	return op;	1824	return op;
1873	}	1825	}
1874		1826
1875	/*	1827	/*
1876	* Checks if any objects has a move_type that matches objects	1828	* Checks if any objects has a move_type that matches objects
…		…
1894	*/	1846	*/
1895		1847
1896	int	1848	int
1897	check_move_on (object *op, object *originator)	1849	check_move_on (object *op, object *originator)
1898	{	1850	{
1899	object *	1851	object *tmp;
1900	tmp;	1852	maptile *m = op->map;
1901	tag_t
1902	tag;
1903	mapstruct *
1904	m = op->map;
1905	int
1906	x = op->x, y = op->y;	1853	int x = op->x, y = op->y;
1907		1854
1908	MoveType	1855	MoveType move_on, move_slow, move_block;
1909	move_on,
1910	move_slow,
1911	move_block;
1912		1856
1913	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1857	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1914	return 0;	1858	return 0;
1915
1916	tag = op->count;
1917		1859
1918	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);
1919	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);
1920	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);
1921		1863
…		…
1982	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1924	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))	1925	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1984	{	1926	{
1985	move_apply (tmp, op, originator);	1927	move_apply (tmp, op, originator);
1986		1928
1987	if (was_destroyed (op, tag))	1929	if (op->destroyed ())
1988	return 1;	1930	return 1;
1989		1931
1990	/* what the person/creature stepped onto has moved the object	1932	/* what the person/creature stepped onto has moved the object
1991	* someplace new. Don't process any further - if we did,	1933	* someplace new. Don't process any further - if we did,
1992	* have a feeling strange problems would result.	1934	* have a feeling strange problems would result.
…		…
2004	* a matching archetype at the given map and coordinates.	1946	* a matching archetype at the given map and coordinates.
2005	* The first matching object is returned, or NULL if none.	1947	* The first matching object is returned, or NULL if none.
2006	*/	1948	*/
2007		1949
2008	object *	1950	object *
2009	present_arch (const archetype *at, mapstruct *m, int x, int y)	1951	present_arch (const archetype *at, maptile *m, int x, int y)
2010	{	1952	{
2011	object *	1953	object *
2012	tmp;	1954	tmp;
2013		1955
2014	if (m == NULL || out_of_map (m, x, y))	1956	if (m == NULL || out_of_map (m, x, y))
…		…
2027	* a matching type variable at the given map and coordinates.	1969	* a matching type variable at the given map and coordinates.
2028	* The first matching object is returned, or NULL if none.	1970	* The first matching object is returned, or NULL if none.
2029	*/	1971	*/
2030		1972
2031	object *	1973	object *
2032	present (unsigned char type, mapstruct *m, int x, int y)	1974	present (unsigned char type, maptile *m, int x, int y)
2033	{	1975	{
2034	object *	1976	object *
2035	tmp;	1977	tmp;
2036		1978
2037	if (out_of_map (m, x, y))	1979	if (out_of_map (m, x, y))
…		…
2177	* 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
2178	* customized, changed states, etc.	2120	* customized, changed states, etc.
2179	*/	2121	*/
2180		2122
2181	int	2123	int
2182	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)
2183	{	2125	{
2184	int	2126	int
2185	i,	2127	i,
2186	index = 0, flag;	2128	index = 0, flag;
2187	static int	2129	static int
…		…
2208	return -1;	2150	return -1;
2209	return altern[RANDOM () % index];	2151	return altern[RANDOM () % index];
2210	}	2152	}
2211		2153
2212	/*	2154	/*
2213	* find_first_free_spot(archetype, mapstruct, x, y) works like	2155	* find_first_free_spot(archetype, maptile, x, y) works like
2214	* find_free_spot(), but it will search max number of squares.	2156	* find_free_spot(), but it will search max number of squares.
2215	* 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.
2216	* 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.
2217	*/	2159	*/
2218		2160
2219	int	2161	int
2220	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)
2221	{	2163	{
2222	int	2164	int
2223	i;	2165	i;
2224		2166
2225	for (i = 0; i < SIZEOFFREE; i++)	2167	for (i = 0; i < SIZEOFFREE; i++)
…		…
2289	* 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
2290	* there is capable of.	2232	* there is capable of.
2291	*/	2233	*/
2292		2234
2293	int	2235	int
2294	find_dir (mapstruct *m, int x, int y, object *exclude)	2236	find_dir (maptile *m, int x, int y, object *exclude)
2295	{	2237	{
2296	int	2238	int
2297	i,	2239	i,
2298	max = SIZEOFFREE, mflags;	2240	max = SIZEOFFREE, mflags;
2299		2241
2300	sint16 nx, ny;	2242	sint16 nx, ny;
2301	object *	2243	object *
2302	tmp;	2244	tmp;
2303	mapstruct *	2245	maptile *
2304	mp;	2246	mp;
2305		2247
2306	MoveType blocked, move_type;	2248	MoveType blocked, move_type;
2307		2249
2308	if (exclude && exclude->head)	2250	if (exclude && exclude->head)
…		…
2516	* Modified to be map tile aware -.MSW	2458	* Modified to be map tile aware -.MSW
2517	*/	2459	*/
2518		2460
2519		2461
2520	int	2462	int
2521	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2463	can_see_monsterP (maptile *m, int x, int y, int dir)
2522	{	2464	{
2523	sint16 dx, dy;	2465	sint16 dx, dy;
2524	int	2466	int
2525	mflags;	2467	mflags;
2526		2468
…		…
2575	* create clone from object to another	2517	* create clone from object to another
2576	*/	2518	*/
2577	object *	2519	object *
2578	object_create_clone (object *asrc)	2520	object_create_clone (object *asrc)
2579	{	2521	{
2580	object *
2581	dst = NULL, *tmp, *src, *part, *prev, *item;	2522	object *dst = 0, *tmp, *src, *part, *prev, *item;
2582		2523
2583	if (!asrc)	2524	if (!asrc)
2584	return NULL;	2525	return 0;
		2526
2585	src = asrc;	2527	src = asrc;
2586	if (src->head)	2528	if (src->head)
2587	src = src->head;	2529	src = src->head;
2588		2530
2589	prev = NULL;	2531	prev = 0;
2590	for (part = src; part; part = part->more)	2532	for (part = src; part; part = part->more)
2591	{	2533	{
2592	tmp = get_object ();	2534	tmp = part->clone ();
2593	copy_object (part, tmp);
2594	tmp->x -= src->x;	2535	tmp->x -= src->x;
2595	tmp->y -= src->y;	2536	tmp->y -= src->y;
		2537
2596	if (!part->head)	2538	if (!part->head)
2597	{	2539	{
2598	dst = tmp;	2540	dst = tmp;
2599	tmp->head = NULL;	2541	tmp->head = 0;
2600	}	2542	}
2601	else	2543	else
2602	{	2544	{
2603	tmp->head = dst;	2545	tmp->head = dst;
2604	}	2546	}
		2547
2605	tmp->more = NULL;	2548	tmp->more = 0;
		2549
2606	if (prev)	2550	if (prev)
2607	prev->more = tmp;	2551	prev->more = tmp;
		2552
2608	prev = tmp;	2553	prev = tmp;
2609	}	2554	}
2610		2555
2611	/*** copy inventory ***/
2612	for (item = src->inv; item; item = item->below)	2556	for (item = src->inv; item; item = item->below)
2613	{
2614	(void) insert_ob_in_ob (object_create_clone (item), dst);	2557	insert_ob_in_ob (object_create_clone (item), dst);
2615	}
2616		2558
2617	return dst;	2559	return dst;
2618	}	2560	}
2619		2561
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. */	2562	/* 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 */	2563	/* 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, */	2564	/* 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. */	2565	/* 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. */	2566	/* Remember not to use load_object_str in a time-critical situation. */
2638
2639	/* Also remember that multiparts objects are not supported for now. */	2567	/* Also remember that multiparts objects are not supported for now. */
2640		2568
2641	object *	2569	object *
2642	load_object_str (const char *obstr)	2570	load_object_str (const char *obstr)
2643	{	2571	{
2644	object *	2572	object *op;
2645	op;
2646	char
2647	filename[MAX_BUF];	2573	char filename[MAX_BUF];
2648		2574
2649	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2575	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2650		2576
2651	FILE *
2652	tempfile = fopen (filename, "w");	2577	FILE *tempfile = fopen (filename, "w");
2653		2578
2654	if (tempfile == NULL)	2579	if (tempfile == NULL)
2655	{	2580	{
2656	LOG (llevError, "Error - Unable to access load object temp file\n");	2581	LOG (llevError, "Error - Unable to access load object temp file\n");
2657	return NULL;	2582	return NULL;
2658	};	2583	}
		2584
2659	fprintf (tempfile, obstr);	2585	fprintf (tempfile, obstr);
2660	fclose (tempfile);	2586	fclose (tempfile);
2661		2587
2662	op = get_object ();	2588	op = object::create ();
2663		2589
2664	object_thawer thawer (filename);	2590	object_thawer thawer (filename);
2665		2591
2666	if (thawer)	2592	if (thawer)
2667	load_object (thawer, op, 0);	2593	load_object (thawer, op, 0);
…		…
2677	* returns NULL if no match.	2603	* returns NULL if no match.
2678	*/	2604	*/
2679	object *	2605	object *
2680	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)
2681	{	2607	{
2682	object *	2608	object *tmp;
2683	tmp;
2684		2609
2685	for (tmp = who->inv; tmp; tmp = tmp->below)	2610	for (tmp = who->inv; tmp; tmp = tmp->below)
2686	if (tmp->type == type && tmp->subtype == subtype)	2611	if (tmp->type == type && tmp->subtype == subtype)
2687	return tmp;	2612	return tmp;
2688		2613
…		…
2696	* do the desired thing.	2621	* do the desired thing.
2697	*/	2622	*/
2698	key_value *	2623	key_value *
2699	get_ob_key_link (const object *ob, const char *key)	2624	get_ob_key_link (const object *ob, const char *key)
2700	{	2625	{
2701	key_value *	2626	key_value *link;
2702	link;
2703		2627
2704	for (link = ob->key_values; link != NULL; link = link->next)	2628	for (link = ob->key_values; link != NULL; link = link->next)
2705	{
2706	if (link->key == key)	2629	if (link->key == key)
2707	{
2708	return link;	2630	return link;
2709	}
2710	}
2711		2631
2712	return NULL;	2632	return NULL;
2713	}	2633	}
2714		2634
2715	/*	2635	/*
…		…
2720	* The returned string is shared.	2640	* The returned string is shared.
2721	*/	2641	*/
2722	const char *	2642	const char *
2723	get_ob_key_value (const object *op, const char *const key)	2643	get_ob_key_value (const object *op, const char *const key)
2724	{	2644	{
2725	key_value *	2645	key_value *link;
2726	link;	2646	shstr_cmp canonical_key (key);
2727	const char *
2728	canonical_key;
2729		2647
2730	canonical_key = shstr::find (key);
2731
2732	if (canonical_key == NULL)	2648	if (!canonical_key)
2733	{	2649	{
2734	/* 1. There being a field named key on any object	2650	/* 1. There being a field named key on any object
2735	* implies there'd be a shared string to find.	2651	* implies there'd be a shared string to find.
2736	* 2. Since there isn't, no object has this field.	2652	* 2. Since there isn't, no object has this field.
2737	* 3. Therefore, *this* object doesn't have this field.	2653	* 3. Therefore, *this* object doesn't have this field.
2738	*/	2654	*/
2739	return NULL;	2655	return 0;
2740	}	2656	}
2741		2657
2742	/* This is copied from get_ob_key_link() above -	2658	/* This is copied from get_ob_key_link() above -
2743	* only 4 lines, and saves the function call overhead.	2659	* only 4 lines, and saves the function call overhead.
2744	*/	2660	*/
2745	for (link = op->key_values; link != NULL; link = link->next)	2661	for (link = op->key_values; link; link = link->next)
2746	{
2747	if (link->key == canonical_key)	2662	if (link->key == canonical_key)
2748	{
2749	return link->value;	2663	return link->value;
2750	}	2664
2751	}
2752	return NULL;	2665	return 0;
2753	}	2666	}
2754		2667
2755		2668
2756	/*	2669	/*
2757	* Updates the canonical_key in op to value.	2670	* Updates the canonical_key in op to value.
…		…
2864	}	2777	}
2865	else	2778	else
2866	item = item->env;	2779	item = item->env;
2867	}	2780	}
2868		2781
		2782	// return a suitable string describing an objetc in enough detail to find it
		2783	const char *
		2784	object::debug_desc (char *info) const
		2785	{
		2786	char info2[256 * 3];
		2787	char *p = info;
		2788
		2789	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2790	count,
		2791	&name,
		2792	title ? " " : "",
		2793	title ? (const char *)title : "");
		2794
		2795	if (env)
		2796	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2797
		2798	if (map)
		2799	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2800
		2801	return info;
		2802	}
		2803
		2804	const char *
		2805	object::debug_desc () const
		2806	{
		2807	static char info[256 * 3];
		2808	return debug_desc (info);
		2809	}
		2810

Diff Legend

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