ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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