ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.68 by root, Mon Dec 18 02:35:00 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
		35	#include <bitset>
		36
37	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
38		40
39	object *objects; /* Pointer to the list of used objects */
40	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
41		42
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,	43	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	44	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	};	45	};
…		…
51	int freedir[SIZEOFFREE] = {	52	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,	53	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	54	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	};	55	};
55		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
		133
56	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57	static int	135	static int
58	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
59	{	137	{
60	key_value *wants_field;	138	key_value *wants_field;
…		…
107	*	185	*
108	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
109	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
110	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
111	*	189	*
112	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
113	*	191	*
114	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
115	* check weight	193	* check weight
116	*/	194	*/
117		195
118	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
119	{	197	{
120	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
121	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
122	return 0;	204	return 0;
123		205
124	if (ob1->speed != ob2->speed)	206	//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	207	/* 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	208	* value could not be stored in a sint32 (which unfortunately sometimes is
129	* used to store nrof).	209	* used to store nrof).
130	*/	210	*/
131	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
142		222
143	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
144	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
145		225
146		226
147	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
148	* being locked in inventory should prevent merging.	228	|| ob1->arch != ob2->arch
149	* 0x4 in flags3 is CLIENT_SENT
150	*/
151	if ((ob1->arch != ob2->arch) ||
152	(ob1->flags[0] != ob2->flags[0]) ||
153	(ob1->flags[1] != ob2->flags[1]) ||
154	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
155	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
156	(ob1->name != ob2->name) ||	229	|| ob1->name != ob2->name
157	(ob1->title != ob2->title) ||	230	|| ob1->title != ob2->title
158	(ob1->msg != ob2->msg) ||	231	|| ob1->msg != ob2->msg
159	(ob1->weight != ob2->weight) ||	232	|| ob1->weight != ob2->weight
160	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
161	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
162	(ob1->attacktype != ob2->attacktype) ||	235	|| ob1->attacktype != ob2->attacktype
163	(ob1->magic != ob2->magic) ||	236	|| ob1->magic != ob2->magic
164	(ob1->slaying != ob2->slaying) ||	237	|| ob1->slaying != ob2->slaying
165	(ob1->skill != ob2->skill) ||	238	|| ob1->skill != ob2->skill
166	(ob1->value != ob2->value) ||	239	|| ob1->value != ob2->value
167	(ob1->animation_id != ob2->animation_id) ||	240	|| ob1->animation_id != ob2->animation_id
168	(ob1->client_type != ob2->client_type) ||	241	|| ob1->client_type != ob2->client_type
169	(ob1->materialname != ob2->materialname) ||	242	|| ob1->materialname != ob2->materialname
170	(ob1->lore != ob2->lore) ||	243	|| ob1->lore != ob2->lore
171	(ob1->subtype != ob2->subtype) ||	244	|| ob1->subtype != ob2->subtype
172	(ob1->move_type != ob2->move_type) ||	245	|| ob1->move_type != ob2->move_type
173	(ob1->move_block != ob2->move_block) ||	246	|| ob1->move_block != ob2->move_block
174	(ob1->move_allow != ob2->move_allow) ||	247	|| ob1->move_allow != ob2->move_allow
175	(ob1->move_on != ob2->move_on) ||	248	|| ob1->move_on != ob2->move_on
176	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	249	|| ob1->move_off != ob2->move_off
		250	|| ob1->move_slow != ob2->move_slow
		251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
177	return 0;	252	return 0;
178		253
179	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
180	* check all objects in the inventory.	255	* check all objects in the inventory.
181	*/	256	*/
…		…
184	/* if one object has inventory but the other doesn't, not equiv */	259	/* if one object has inventory but the other doesn't, not equiv */
185	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
186	return 0;	261	return 0;
187		262
188	/* Now check to see if the two inventory objects could merge */	263	/* Now check to see if the two inventory objects could merge */
189	if (!CAN_MERGE (ob1->inv, ob2->inv))	264	if (!object::can_merge (ob1->inv, ob2->inv))
190	return 0;	265	return 0;
191		266
192	/* inventory ok - still need to check rest of this object to see	267	/* inventory ok - still need to check rest of this object to see
193	* if it is valid.	268	* if it is valid.
194	*/	269	*/
…		…
255	{	330	{
256	if (inv->inv)	331	if (inv->inv)
257	sum_weight (inv);	332	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	334	}
		335
260	if (op->type == CONTAINER && op->stats.Str)	336	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	337	sum = (sum * (100 - op->stats.Str)) / 100;
		338
262	if (op->carrying != sum)	339	if (op->carrying != sum)
263	op->carrying = sum;	340	op->carrying = sum;
		341
264	return sum;	342	return sum;
265	}	343	}
266		344
267	/**	345	/**
268	* Return the outermost environment object for a given object.	346	* Return the outermost environment object for a given object.
…		…
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	373	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	374	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	375	* The result of the dump is stored in the static global errmsg array.
298	*/	376	*/
299		377
300	void	378	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)	379	dump_object (object *op)
356	{	380	{
357	if (op == NULL)	381	if (!op)
358	{	382	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		383
366	void	384	object_freezer freezer;
367	dump_all_objects (void)	385	save_object (freezer, op, 3);
368	{	386	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	}	387	}
377		388
378	/*	389	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	390	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	391	* multi-object 1 which is closest to the second object.
…		…
400	*/	411	*/
401		412
402	object *	413	object *
403	find_object (tag_t i)	414	find_object (tag_t i)
404	{	415	{
405	object *op;	416	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	417	if (op->count == i)
409	break;	418	return op;
		419
410	return op;	420	return 0;
411	}	421	}
412		422
413	/*	423	/*
414	* Returns the first object which has a name equal to the argument.	424	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	425	* Used only by the patch command, but not all that useful.
…		…
417	*/	427	*/
418		428
419	object *	429	object *
420	find_object_name (const char *str)	430	find_object_name (const char *str)
421	{	431	{
422	const char *name = shstr::find (str);	432	shstr_cmp str_ (str);
423	object *op;	433	object *op;
424		434
425	for (op = objects; op != NULL; op = op->next)	435	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	436	if (op->name == str_)
427	break;	437	break;
428		438
429	return op;	439	return op;
430	}	440	}
431		441
432	void	442	void
433	free_all_object_data ()	443	free_all_object_data ()
434	{	444	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	445	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	}	446	}
458		447
459	/*	448	/*
460	* Sets the owner and sets the skill and exp pointers to owner's current	449	* Sets the owner and sets the skill and exp pointers to owner's current
461	* skill and experience objects.	450	* skill and experience objects.
…		…
531		520
532	/* What is not cleared is next, prev, and count */	521	/* What is not cleared is next, prev, and count */
533		522
534	expmul = 1.0;	523	expmul = 1.0;
535	face = blank_face;	524	face = blank_face;
536	attacked_by_count = -1;
537		525
538	if (settings.casting_time)	526	if (settings.casting_time)
539	casting_time = -1;	527	casting_time = -1;
540	}	528	}
541		529
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	/*	530	/*
552	* copy object first frees everything allocated by the second object,	531	* copy_to first frees everything allocated by the dst object,
553	* and then copies the contends of the first object into the second	532	* and then copies the contents of itself into the second
554	* object, allocating what needs to be allocated. Basically, any	533	* object, allocating what needs to be allocated. Basically, any
555	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	534	* 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	535	* if the first object is freed, the pointers in the new object
557	* will point at garbage.	536	* will point at garbage.
558	*/	537	*/
559	void	538	void
560	copy_object (object *op2, object *op)	539	object::copy_to (object *dst)
561	{	540	{
562	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	541	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
563	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	542	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
564		543
565	op2->clone (op);	544	*(object_copy *)dst = *this;
		545	*(object_pod *)dst = *this;
		546
		547	if (self || cb)
		548	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
566		549
567	if (is_freed)	550	if (is_freed)
568	SET_FLAG (op, FLAG_FREED);	551	SET_FLAG (dst, FLAG_FREED);
		552
569	if (is_removed)	553	if (is_removed)
570	SET_FLAG (op, FLAG_REMOVED);	554	SET_FLAG (dst, FLAG_REMOVED);
571		555
572	if (op2->speed < 0)	556	if (speed < 0)
573	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	557	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
574		558
575	/* Copy over key_values, if any. */	559	/* Copy over key_values, if any. */
576	if (op2->key_values)	560	if (key_values)
577	{	561	{
578	key_value *tail = 0;	562	key_value *tail = 0;
579	key_value *i;	563	key_value *i;
580		564
581	op->key_values = 0;	565	dst->key_values = 0;
582		566
583	for (i = op2->key_values; i; i = i->next)	567	for (i = key_values; i; i = i->next)
584	{	568	{
585	key_value *new_link = new key_value;	569	key_value *new_link = new key_value;
586		570
587	new_link->next = 0;	571	new_link->next = 0;
588	new_link->key = i->key;	572	new_link->key = i->key;
589	new_link->value = i->value;	573	new_link->value = i->value;
590		574
591	/* Try and be clever here, too. */	575	/* Try and be clever here, too. */
592	if (!op->key_values)	576	if (!dst->key_values)
593	{	577	{
594	op->key_values = new_link;	578	dst->key_values = new_link;
595	tail = new_link;	579	tail = new_link;
596	}	580	}
597	else	581	else
598	{	582	{
599	tail->next = new_link;	583	tail->next = new_link;
600	tail = new_link;	584	tail = new_link;
601	}	585	}
602	}	586	}
603	}	587	}
604		588
605	update_ob_speed (op);	589	update_ob_speed (dst);
		590	}
		591
		592	object *
		593	object::clone ()
		594	{
		595	object *neu = create ();
		596	copy_to (neu);
		597	return neu;
606	}	598	}
607		599
608	/*	600	/*
609	* If an object with the IS_TURNABLE() flag needs to be turned due	601	* 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	602	* to the closest player being on the other side, this function can
…		…
815	update_now = 1;	807	update_now = 1;
816		808
817	if ((move_slow | op->move_slow) != move_slow)	809	if ((move_slow | op->move_slow) != move_slow)
818	update_now = 1;	810	update_now = 1;
819	}	811	}
		812
820	/* if the object is being removed, we can't make intelligent	813	/* if the object is being removed, we can't make intelligent
821	* decisions, because remove_ob can't really pass the object	814	* decisions, because remove_ob can't really pass the object
822	* that is being removed.	815	* that is being removed.
823	*/	816	*/
824	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	817	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
836		829
837	if (op->more != NULL)	830	if (op->more != NULL)
838	update_object (op->more, action);	831	update_object (op->more, action);
839	}	832	}
840		833
841	static unordered_vector<object *> mortals;	834	object::vector object::mortals;
842	static std::vector<object *> freed;	835	object::vector object::objects; // not yet used
		836	object *object::first;
843		837
844	void object::free_mortals ()	838	void object::free_mortals ()
845	{	839	{
846	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	840	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
847	if ((*i)->refcnt)	841	if ((*i)->refcnt)
848	++i; // further delay freeing	842	++i; // further delay freeing
849	else	843	else
850	{	844	{
851	freed.push_back (*i);//D
852	//delete *i;	845	delete *i;
853	mortals.erase (i);	846	mortals.erase (i);
854	}	847	}
855
856	if (mortals.size())//D
857	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
858	}	848	}
859		849
860	object::object ()	850	object::object ()
861	{	851	{
862	SET_FLAG (this, FLAG_REMOVED);	852	SET_FLAG (this, FLAG_REMOVED);
863		853
864	expmul = 1.0;	854	expmul = 1.0;
865	face = blank_face;	855	face = blank_face;
866	attacked_by_count = -1;
867	}	856	}
868		857
869	object::~object ()	858	object::~object ()
870	{	859	{
871	free_key_values (this);	860	free_key_values (this);
872	}	861	}
873		862
874	void object::link ()	863	void object::link ()
875	{	864	{
876	count = ++ob_count;	865	count = ++ob_count;
		866	uuid = gen_uuid ();
877		867
878	prev = 0;	868	prev = 0;
879	next = objects;	869	next = object::first;
880		870
881	if (objects)	871	if (object::first)
882	objects->prev = this;	872	object::first->prev = this;
883		873
884	objects = this;	874	object::first = this;
885	}	875	}
886		876
887	void object::unlink ()	877	void object::unlink ()
888	{	878	{
889	count = 0;	879	if (this == object::first)
		880	object::first = next;
890		881
891	/* Remove this object from the list of used objects */	882	/* Remove this object from the list of used objects */
892	if (prev)
893	{
894	prev->next = next;	883	if (prev) prev->next = next;
		884	if (next) next->prev = prev;
		885
895	prev = 0;	886	prev = 0;
896	}
897
898	if (next)
899	{
900	next->prev = prev;
901	next = 0;	887	next = 0;
902	}
903
904	if (this == objects)
905	objects = next;
906	}	888	}
907		889
908	object *object::create ()	890	object *object::create ()
909	{	891	{
910	object *op;
911
912	if (freed.empty ())
913	op = new object;	892	object *op = new object;
914	else
915	{
916	// highly annoying, but the only way to get it stable right now
917	op = freed.back ();
918	freed.pop_back ();
919	op->~object ();
920	new ((void *) op) object;
921	}
922
923	op->link ();	893	op->link ();
924	return op;	894	return op;
925	}	895	}
926		896
927	/*	897	/*
…		…
929	* it from the list of used objects, and puts it on the list of	899	* it from the list of used objects, and puts it on the list of
930	* free objects. The IS_FREED() flag is set in the object.	900	* free objects. The IS_FREED() flag is set in the object.
931	* The object must have been removed by remove_ob() first for	901	* The object must have been removed by remove_ob() first for
932	* this function to succeed.	902	* this function to succeed.
933	*	903	*
934	* If free_inventory is set, free inventory as well. Else drop items in	904	* If destroy_inventory is set, free inventory as well. Else drop items in
935	* inventory to the ground.	905	* inventory to the ground.
936	*/	906	*/
937	void object::free (bool free_inventory)	907	void object::destroy (bool destroy_inventory)
938	{	908	{
939	if (QUERY_FLAG (this, FLAG_FREED))	909	if (QUERY_FLAG (this, FLAG_FREED))
940	return;	910	return;
941		911
942	if (QUERY_FLAG (this, FLAG_FRIENDLY))	912	if (QUERY_FLAG (this, FLAG_FRIENDLY))
943	remove_friendly_object (this);	913	remove_friendly_object (this);
944		914
945	if (!QUERY_FLAG (this, FLAG_REMOVED))	915	if (!QUERY_FLAG (this, FLAG_REMOVED))
946	remove_ob (this);	916	remove ();
947		917
948	SET_FLAG (this, FLAG_FREED);	918	SET_FLAG (this, FLAG_FREED);
949		919
950	if (more)	920	if (more)
951	{	921	{
952	more->free (free_inventory);	922	more->destroy (destroy_inventory);
953	more = 0;	923	more = 0;
954	}	924	}
955		925
956	if (inv)	926	if (inv)
957	{	927	{
958	/* Only if the space blocks everything do we not process -	928	/* Only if the space blocks everything do we not process -
959	* if some form of movement is allowed, let objects	929	* if some form of movement is allowed, let objects
960	* drop on that space.	930	* drop on that space.
961	*/	931	*/
962	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	932	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
963	{	933	{
964	object *op = inv;	934	object *op = inv;
965		935
966	while (op)	936	while (op)
967	{	937	{
968	object *tmp = op->below;	938	object *tmp = op->below;
969	op->free (free_inventory);	939	op->destroy (destroy_inventory);
970	op = tmp;	940	op = tmp;
971	}	941	}
972	}	942	}
973	else	943	else
974	{ /* Put objects in inventory onto this space */	944	{ /* Put objects in inventory onto this space */
…		…
976		946
977	while (op)	947	while (op)
978	{	948	{
979	object *tmp = op->below;	949	object *tmp = op->below;
980		950
981	remove_ob (op);	951	op->remove ();
982		952
983	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	953	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
984	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	954	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
985	free_object (op);	955	op->destroy ();
986	else	956	else
987	{	957	{
988	op->x = x;	958	op->x = x;
989	op->y = y;	959	op->y = y;
990	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	960	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
993	op = tmp;	963	op = tmp;
994	}	964	}
995	}	965	}
996	}	966	}
997		967
		968	// hack to ensure that freed objects still have a valid map
		969	{
		970	static maptile *freed_map; // freed objects are moved here to avoid crashes
		971
		972	if (!freed_map)
		973	{
		974	freed_map = new maptile;
		975
		976	freed_map->name = "/internal/freed_objects_map";
		977	freed_map->width = 3;
		978	freed_map->height = 3;
		979
		980	freed_map->allocate ();
		981	}
		982
		983	map = freed_map;
		984	x = 1;
		985	y = 1;
		986	}
		987
		988	// clear those pointers that likely might have circular references to us
998	owner = 0;	989	owner = 0;
		990	enemy = 0;
		991	attacked_by = 0;
		992
		993	// only relevant for players(?), but make sure of it anyways
		994	contr = 0;
999		995
1000	/* Remove object from the active list */	996	/* Remove object from the active list */
1001	speed = 0;	997	speed = 0;
1002	update_ob_speed (this);	998	update_ob_speed (this);
1003		999
…		…
1008		1004
1009	/*	1005	/*
1010	* sub_weight() recursively (outwards) subtracts a number from the	1006	* sub_weight() recursively (outwards) subtracts a number from the
1011	* weight of an object (and what is carried by it's environment(s)).	1007	* weight of an object (and what is carried by it's environment(s)).
1012	*/	1008	*/
1013
1014	void	1009	void
1015	sub_weight (object *op, signed long weight)	1010	sub_weight (object *op, signed long weight)
1016	{	1011	{
1017	while (op != NULL)	1012	while (op != NULL)
1018	{	1013	{
1019	if (op->type == CONTAINER)	1014	if (op->type == CONTAINER)
1020	{
1021	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1015	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1022	}	1016
1023	op->carrying -= weight;	1017	op->carrying -= weight;
1024	op = op->env;	1018	op = op->env;
1025	}	1019	}
1026	}	1020	}
1027		1021
1028	/* remove_ob(op):	1022	/* op->remove ():
1029	* This function removes the object op from the linked list of objects	1023	* This function removes the object op from the linked list of objects
1030	* which it is currently tied to. When this function is done, the	1024	* which it is currently tied to. When this function is done, the
1031	* object will have no environment. If the object previously had an	1025	* object will have no environment. If the object previously had an
1032	* environment, the x and y coordinates will be updated to	1026	* environment, the x and y coordinates will be updated to
1033	* the previous environment.	1027	* the previous environment.
1034	* Beware: This function is called from the editor as well!	1028	* Beware: This function is called from the editor as well!
1035	*/	1029	*/
1036
1037	void	1030	void
1038	remove_ob (object *op)	1031	object::remove ()
1039	{	1032	{
		1033	object *tmp, *last = 0;
1040	object *	1034	object *otmp;
1041	tmp, *
1042	last = NULL;
1043	object *
1044	otmp;
1045		1035
1046	tag_t
1047	tag;
1048	int
1049	check_walk_off;	1036	int check_walk_off;
1050	mapstruct *
1051	m;
1052		1037
1053	sint16
1054	x,
1055	y;
1056
1057	if (QUERY_FLAG (op, FLAG_REMOVED))	1038	if (QUERY_FLAG (this, FLAG_REMOVED))
1058	return;	1039	return;
1059		1040
1060	SET_FLAG (op, FLAG_REMOVED);	1041	SET_FLAG (this, FLAG_REMOVED);
1061		1042
1062	if (op->more != NULL)	1043	if (more)
1063	remove_ob (op->more);	1044	more->remove ();
1064		1045
1065	/*	1046	/*
1066	* In this case, the object to be removed is in someones	1047	* In this case, the object to be removed is in someones
1067	* inventory.	1048	* inventory.
1068	*/	1049	*/
1069	if (op->env != NULL)	1050	if (env)
1070	{	1051	{
1071	if (op->nrof)	1052	if (nrof)
1072	sub_weight (op->env, op->weight * op->nrof);	1053	sub_weight (env, weight * nrof);
1073	else	1054	else
1074	sub_weight (op->env, op->weight + op->carrying);	1055	sub_weight (env, weight + carrying);
1075		1056
1076	/* NO_FIX_PLAYER is set when a great many changes are being	1057	/* NO_FIX_PLAYER is set when a great many changes are being
1077	* made to players inventory. If set, avoiding the call	1058	* made to players inventory. If set, avoiding the call
1078	* to save cpu time.	1059	* to save cpu time.
1079	*/	1060	*/
1080	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1061	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1081	fix_player (otmp);	1062	fix_player (otmp);
1082		1063
1083	if (op->above != NULL)	1064	if (above != NULL)
1084	op->above->below = op->below;	1065	above->below = below;
1085	else	1066	else
1086	op->env->inv = op->below;	1067	env->inv = below;
1087		1068
1088	if (op->below != NULL)	1069	if (below != NULL)
1089	op->below->above = op->above;	1070	below->above = above;
1090		1071
1091	/* we set up values so that it could be inserted into	1072	/* we set up values so that it could be inserted into
1092	* the map, but we don't actually do that - it is up	1073	* the map, but we don't actually do that - it is up
1093	* to the caller to decide what we want to do.	1074	* to the caller to decide what we want to do.
1094	*/	1075	*/
1095	op->x = op->env->x, op->y = op->env->y;	1076	x = env->x, y = env->y;
1096	op->map = op->env->map;	1077	map = env->map;
1097	op->above = NULL, op->below = NULL;	1078	above = 0, below = 0;
1098	op->env = NULL;	1079	env = 0;
1099	}	1080	}
1100	else if (op->map)	1081	else if (map)
1101	{	1082	{
1102	x = op->x;
1103	y = op->y;
1104	m = get_map_from_coord (op->map, &x, &y);
1105
1106	if (!m)
1107	{
1108	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1109	op->map->path, op->x, op->y);
1110	/* in old days, we used to set x and y to 0 and continue.
1111	* it seems if we get into this case, something is probablye
1112	* screwed up and should be fixed.
1113	*/
1114	abort ();
1115	}
1116
1117	if (op->map != m)
1118	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1119	op->map->path, m->path, op->x, op->y, x, y);
1120
1121	/* Re did the following section of code - it looks like it had	1083	/* Re did the following section of code - it looks like it had
1122	* lots of logic for things we no longer care about	1084	* lots of logic for things we no longer care about
1123	*/	1085	*/
1124		1086
1125	/* link the object above us */	1087	/* link the object above us */
1126	if (op->above)	1088	if (above)
1127	op->above->below = op->below;	1089	above->below = below;
1128	else	1090	else
1129	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1091	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1130		1092
1131	/* Relink the object below us, if there is one */	1093	/* Relink the object below us, if there is one */
1132	if (op->below)	1094	if (below)
1133	op->below->above = op->above;	1095	below->above = above;
1134	else	1096	else
1135	{	1097	{
1136	/* Nothing below, which means we need to relink map object for this space	1098	/* Nothing below, which means we need to relink map object for this space
1137	* use translated coordinates in case some oddness with map tiling is	1099	* use translated coordinates in case some oddness with map tiling is
1138	* evident	1100	* evident
1139	*/	1101	*/
1140	if (GET_MAP_OB (m, x, y) != op)	1102	if (GET_MAP_OB (map, x, y) != this)
1141	{	1103	{
1142	dump_object (op);	1104	char *dump = dump_object (this);
1143	LOG (llevError,	1105	LOG (llevError,
1144	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1106	"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);
		1107	free (dump);
1145	dump_object (GET_MAP_OB (m, x, y));	1108	dump = dump_object (GET_MAP_OB (map, x, y));
1146	LOG (llevError, "%s\n", errmsg);	1109	LOG (llevError, "%s\n", dump);
		1110	free (dump);
1147	}	1111	}
1148		1112
1149	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1113	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1150	}	1114	}
1151		1115
1152	op->above = 0;	1116	above = 0;
1153	op->below = 0;	1117	below = 0;
1154		1118
1155	if (op->map->in_memory == MAP_SAVING)	1119	if (map->in_memory == MAP_SAVING)
1156	return;	1120	return;
1157		1121
1158	tag = op->count;
1159	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1122	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1160		1123
1161	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1124	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1162	{	1125	{
1163	/* No point updating the players look faces if he is the object	1126	/* No point updating the players look faces if he is the object
1164	* being removed.	1127	* being removed.
1165	*/	1128	*/
1166		1129
1167	if (tmp->type == PLAYER && tmp != op)	1130	if (tmp->type == PLAYER && tmp != this)
1168	{	1131	{
1169	/* If a container that the player is currently using somehow gets	1132	/* If a container that the player is currently using somehow gets
1170	* removed (most likely destroyed), update the player view	1133	* removed (most likely destroyed), update the player view
1171	* appropriately.	1134	* appropriately.
1172	*/	1135	*/
1173	if (tmp->container == op)	1136	if (tmp->container == this)
1174	{	1137	{
1175	CLEAR_FLAG (op, FLAG_APPLIED);	1138	CLEAR_FLAG (this, FLAG_APPLIED);
1176	tmp->container = NULL;	1139	tmp->container = 0;
1177	}	1140	}
1178		1141
1179	tmp->contr->socket.update_look = 1;	1142	tmp->contr->socket->update_look = 1;
1180	}	1143	}
1181		1144
1182	/* See if player moving off should effect something */	1145	/* See if player moving off should effect something */
1183	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1146	if (check_walk_off
		1147	&& ((move_type & tmp->move_off)
		1148	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1184	{	1149	{
1185	move_apply (tmp, op, NULL);	1150	move_apply (tmp, this, 0);
1186		1151
1187	if (was_destroyed (op, tag))	1152	if (destroyed ())
1188	{
1189	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1153	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1190	}
1191	}	1154	}
1192		1155
1193	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1156	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1194		1157
1195	if (tmp->above == tmp)	1158	if (tmp->above == tmp)
1196	tmp->above = NULL;	1159	tmp->above = 0;
1197		1160
1198	last = tmp;	1161	last = tmp;
1199	}	1162	}
1200		1163
1201	/* last == NULL of there are no objects on this space */	1164	/* last == NULL of there are no objects on this space */
1202	if (last == NULL)	1165	if (!last)
1203	{	1166	{
1204	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1167	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1205	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1168	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1206	* those out anyways, and if there are any flags set right now, they won't	1169	* those out anyways, and if there are any flags set right now, they won't
1207	* be correct anyways.	1170	* be correct anyways.
1208	*/	1171	*/
1209	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1172	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1210	update_position (op->map, op->x, op->y);	1173	update_position (map, x, y);
1211	}	1174	}
1212	else	1175	else
1213	update_object (last, UP_OBJ_REMOVE);	1176	update_object (last, UP_OBJ_REMOVE);
1214		1177
1215	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1178	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1216	update_all_los (op->map, op->x, op->y);	1179	update_all_los (map, x, y);
1217	}	1180	}
1218	}	1181	}
1219		1182
1220	/*	1183	/*
1221	* merge_ob(op,top):	1184	* merge_ob(op,top):
…		…
1223	* This function goes through all objects below and including top, and	1186	* This function goes through all objects below and including top, and
1224	* merges op to the first matching object.	1187	* merges op to the first matching object.
1225	* If top is NULL, it is calculated.	1188	* If top is NULL, it is calculated.
1226	* Returns pointer to object if it succeded in the merge, otherwise NULL	1189	* Returns pointer to object if it succeded in the merge, otherwise NULL
1227	*/	1190	*/
1228
1229	object *	1191	object *
1230	merge_ob (object *op, object *top)	1192	merge_ob (object *op, object *top)
1231	{	1193	{
1232	if (!op->nrof)	1194	if (!op->nrof)
1233	return 0;	1195	return 0;
…		…
1237		1199
1238	for (; top != NULL; top = top->below)	1200	for (; top != NULL; top = top->below)
1239	{	1201	{
1240	if (top == op)	1202	if (top == op)
1241	continue;	1203	continue;
1242	if (CAN_MERGE (op, top))	1204
		1205	if (object::can_merge (op, top))
1243	{	1206	{
1244	top->nrof += op->nrof;	1207	top->nrof += op->nrof;
1245		1208
1246	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1209	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1247	op->weight = 0; /* Don't want any adjustements now */	1210	op->weight = 0; /* Don't want any adjustements now */
1248	remove_ob (op);	1211	op->destroy ();
1249	free_object (op);
1250	return top;	1212	return top;
1251	}	1213	}
1252	}	1214	}
1253		1215
1254	return NULL;	1216	return 0;
1255	}	1217	}
1256		1218
1257	/*	1219	/*
1258	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1220	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1259	* job preparing multi-part monsters	1221	* job preparing multi-part monsters
1260	*/	1222	*/
1261	object *	1223	object *
1262	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1263	{	1225	{
1264	object *tmp;	1226	object *tmp;
1265		1227
1266	if (op->head)	1228	if (op->head)
1267	op = op->head;	1229	op = op->head;
…		…
1295	* NULL if 'op' was destroyed	1257	* NULL if 'op' was destroyed
1296	* just 'op' otherwise	1258	* just 'op' otherwise
1297	*/	1259	*/
1298		1260
1299	object *	1261	object *
1300	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1262	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1301	{	1263	{
1302	object *tmp, *top, *floor = NULL;	1264	object *tmp, *top, *floor = NULL;
1303	sint16 x, y;	1265	sint16 x, y;
1304		1266
1305	if (QUERY_FLAG (op, FLAG_FREED))	1267	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1308	return NULL;	1270	return NULL;
1309	}	1271	}
1310		1272
1311	if (m == NULL)	1273	if (m == NULL)
1312	{	1274	{
1313	dump_object (op);	1275	char *dump = dump_object (op);
1314	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1276	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1277	free (dump);
1315	return op;	1278	return op;
1316	}	1279	}
1317		1280
1318	if (out_of_map (m, op->x, op->y))	1281	if (out_of_map (m, op->x, op->y))
1319	{	1282	{
1320	dump_object (op);	1283	char *dump = dump_object (op);
1321	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1284	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1322	#ifdef MANY_CORES	1285	#ifdef MANY_CORES
1323	/* Better to catch this here, as otherwise the next use of this object	1286	/* Better to catch this here, as otherwise the next use of this object
1324	* is likely to cause a crash. Better to find out where it is getting	1287	* is likely to cause a crash. Better to find out where it is getting
1325	* improperly inserted.	1288	* improperly inserted.
1326	*/	1289	*/
1327	abort ();	1290	abort ();
1328	#endif	1291	#endif
		1292	free (dump);
1329	return op;	1293	return op;
1330	}	1294	}
1331		1295
1332	if (!QUERY_FLAG (op, FLAG_REMOVED))	1296	if (!QUERY_FLAG (op, FLAG_REMOVED))
1333	{	1297	{
1334	dump_object (op);	1298	char *dump = dump_object (op);
1335	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1299	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1300	free (dump);
1336	return op;	1301	return op;
1337	}	1302	}
1338		1303
1339	if (op->more != NULL)	1304	if (op->more != NULL)
1340	{	1305	{
…		…
1378		1343
1379	/* this has to be done after we translate the coordinates.	1344	/* this has to be done after we translate the coordinates.
1380	*/	1345	*/
1381	if (op->nrof && !(flag & INS_NO_MERGE))	1346	if (op->nrof && !(flag & INS_NO_MERGE))
1382	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1347	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1383	if (CAN_MERGE (op, tmp))	1348	if (object::can_merge (op, tmp))
1384	{	1349	{
1385	op->nrof += tmp->nrof;	1350	op->nrof += tmp->nrof;
1386	remove_ob (tmp);	1351	tmp->destroy ();
1387	free_object (tmp);
1388	}	1352	}
1389		1353
1390	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1354	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1391	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1355	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1392		1356
…		…
1520	* it, so save a few ticks and start from there.	1484	* it, so save a few ticks and start from there.
1521	*/	1485	*/
1522	if (!(flag & INS_MAP_LOAD))	1486	if (!(flag & INS_MAP_LOAD))
1523	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1487	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1524	if (tmp->type == PLAYER)	1488	if (tmp->type == PLAYER)
1525	tmp->contr->socket.update_look = 1;	1489	tmp->contr->socket->update_look = 1;
1526		1490
1527	/* If this object glows, it may affect lighting conditions that are	1491	/* If this object glows, it may affect lighting conditions that are
1528	* visible to others on this map. But update_all_los is really	1492	* visible to others on this map. But update_all_los is really
1529	* an inefficient way to do this, as it means los for all players	1493	* an inefficient way to do this, as it means los for all players
1530	* on the map will get recalculated. The players could very well	1494	* on the map will get recalculated. The players could very well
…		…
1578	tmp1;	1542	tmp1;
1579		1543
1580	/* first search for itself and remove any old instances */	1544	/* first search for itself and remove any old instances */
1581		1545
1582	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1546	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1583	{
1584	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1585	{	1548	tmp->destroy ();
1586	remove_ob (tmp);
1587	free_object (tmp);
1588	}
1589	}
1590		1549
1591	tmp1 = arch_to_object (find_archetype (arch_string));	1550	tmp1 = arch_to_object (archetype::find (arch_string));
1592		1551
1593	tmp1->x = op->x;	1552	tmp1->x = op->x;
1594	tmp1->y = op->y;	1553	tmp1->y = op->y;
1595	insert_ob_in_map (tmp1, op->map, op, 0);	1554	insert_ob_in_map (tmp1, op->map, op, 0);
1596	}	1555	}
…		…
1604	*/	1563	*/
1605		1564
1606	object *	1565	object *
1607	get_split_ob (object *orig_ob, uint32 nr)	1566	get_split_ob (object *orig_ob, uint32 nr)
1608	{	1567	{
1609	object *	1568	object *newob;
1610	newob;
1611	int
1612	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1569	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1613		1570
1614	if (orig_ob->nrof < nr)	1571	if (orig_ob->nrof < nr)
1615	{	1572	{
1616	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1573	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1617	return NULL;	1574	return NULL;
1618	}	1575	}
1619		1576
1620	newob = object_create_clone (orig_ob);	1577	newob = object_create_clone (orig_ob);
1621		1578
1622	if ((orig_ob->nrof -= nr) < 1)	1579	if ((orig_ob->nrof -= nr) < 1)
1623	{	1580	orig_ob->destroy (1);
1624	if (!is_removed)
1625	remove_ob (orig_ob);
1626	free_object2 (orig_ob, 1);
1627	}
1628	else if (!is_removed)	1581	else if (!is_removed)
1629	{	1582	{
1630	if (orig_ob->env != NULL)	1583	if (orig_ob->env != NULL)
1631	sub_weight (orig_ob->env, orig_ob->weight * nr);	1584	sub_weight (orig_ob->env, orig_ob->weight * nr);
1632	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1585	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1696	esrv_send_item (tmp, op);	1649	esrv_send_item (tmp, op);
1697	}	1650	}
1698	}	1651	}
1699	else	1652	else
1700	{	1653	{
1701	remove_ob (op);	1654	op->remove ();
1702	op->nrof = 0;	1655	op->nrof = 0;
1703	if (tmp)	1656	if (tmp)
1704	{	1657	{
1705	esrv_del_item (tmp->contr, op->count);	1658	esrv_del_item (tmp->contr, op->count);
1706	}	1659	}
…		…
1712		1665
1713	if (i < op->nrof)	1666	if (i < op->nrof)
1714	op->nrof -= i;	1667	op->nrof -= i;
1715	else	1668	else
1716	{	1669	{
1717	remove_ob (op);	1670	op->remove ();
1718	op->nrof = 0;	1671	op->nrof = 0;
1719	}	1672	}
1720		1673
1721	/* Since we just removed op, op->above is null */	1674	/* Since we just removed op, op->above is null */
1722	for (tmp = above; tmp != NULL; tmp = tmp->above)	1675	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1731		1684
1732	if (op->nrof)	1685	if (op->nrof)
1733	return op;	1686	return op;
1734	else	1687	else
1735	{	1688	{
1736	free_object (op);	1689	op->destroy ();
1737	return NULL;	1690	return NULL;
1738	}	1691	}
1739	}	1692	}
1740		1693
1741	/*	1694	/*
…		…
1754	op->carrying += weight;	1707	op->carrying += weight;
1755	op = op->env;	1708	op = op->env;
1756	}	1709	}
1757	}	1710	}
1758		1711
		1712	object *
		1713	insert_ob_in_ob (object *op, object *where)
		1714	{
		1715	if (!where)
		1716	{
		1717	char *dump = dump_object (op);
		1718	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1719	free (dump);
		1720	return op;
		1721	}
		1722
		1723	if (where->head)
		1724	{
		1725	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1726	where = where->head;
		1727	}
		1728
		1729	return where->insert (op);
		1730	}
		1731
1759	/*	1732	/*
1760	* insert_ob_in_ob(op,environment):	1733	* env->insert (op)
1761	* This function inserts the object op in the linked list	1734	* This function inserts the object op in the linked list
1762	* inside the object environment.	1735	* inside the object environment.
1763	*	1736	*
1764	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1765	* the inventory at the last position or next to other objects of the same
1766	* type.
1767	* Frank: Now sorted by type, archetype and magic!
1768	*
1769	* The function returns now pointer to inserted item, and return value can	1737	* The function returns now pointer to inserted item, and return value can
1770	* be != op, if items are merged. -Tero	1738	* be != op, if items are merged. -Tero
1771	*/	1739	*/
1772		1740
1773	object *	1741	object *
1774	insert_ob_in_ob (object *op, object *where)	1742	object::insert (object *op)
1775	{	1743	{
1776	object *	1744	object *tmp, *otmp;
1777	tmp, *
1778	otmp;
1779		1745
1780	if (!QUERY_FLAG (op, FLAG_REMOVED))	1746	if (!QUERY_FLAG (op, FLAG_REMOVED))
1781	{	1747	op->remove ();
1782	dump_object (op);
1783	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1784	return op;
1785	}
1786
1787	if (where == NULL)
1788	{
1789	dump_object (op);
1790	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1791	return op;
1792	}
1793
1794	if (where->head)
1795	{
1796	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1797	where = where->head;
1798	}
1799		1748
1800	if (op->more)	1749	if (op->more)
1801	{	1750	{
1802	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1751	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1803	return op;	1752	return op;
…		…
1805		1754
1806	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1755	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1807	CLEAR_FLAG (op, FLAG_REMOVED);	1756	CLEAR_FLAG (op, FLAG_REMOVED);
1808	if (op->nrof)	1757	if (op->nrof)
1809	{	1758	{
1810	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1759	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1811	if (CAN_MERGE (tmp, op))	1760	if (object::can_merge (tmp, op))
1812	{	1761	{
1813	/* return the original object and remove inserted object	1762	/* return the original object and remove inserted object
1814	(client needs the original object) */	1763	(client needs the original object) */
1815	tmp->nrof += op->nrof;	1764	tmp->nrof += op->nrof;
1816	/* Weight handling gets pretty funky. Since we are adding to	1765	/* Weight handling gets pretty funky. Since we are adding to
1817	* tmp->nrof, we need to increase the weight.	1766	* tmp->nrof, we need to increase the weight.
1818	*/	1767	*/
1819	add_weight (where, op->weight * op->nrof);	1768	add_weight (this, op->weight * op->nrof);
1820	SET_FLAG (op, FLAG_REMOVED);	1769	SET_FLAG (op, FLAG_REMOVED);
1821	free_object (op); /* free the inserted object */	1770	op->destroy (); /* free the inserted object */
1822	op = tmp;	1771	op = tmp;
1823	remove_ob (op); /* and fix old object's links */	1772	op->remove (); /* and fix old object's links */
1824	CLEAR_FLAG (op, FLAG_REMOVED);	1773	CLEAR_FLAG (op, FLAG_REMOVED);
1825	break;	1774	break;
1826	}	1775	}
1827		1776
1828	/* I assume combined objects have no inventory	1777	/* I assume combined objects have no inventory
1829	* We add the weight - this object could have just been removed	1778	* We add the weight - this object could have just been removed
1830	* (if it was possible to merge). calling remove_ob will subtract	1779	* (if it was possible to merge). calling remove_ob will subtract
1831	* the weight, so we need to add it in again, since we actually do	1780	* the weight, so we need to add it in again, since we actually do
1832	* the linking below	1781	* the linking below
1833	*/	1782	*/
1834	add_weight (where, op->weight * op->nrof);	1783	add_weight (this, op->weight * op->nrof);
1835	}	1784	}
1836	else	1785	else
1837	add_weight (where, (op->weight + op->carrying));	1786	add_weight (this, (op->weight + op->carrying));
1838		1787
1839	otmp = is_player_inv (where);	1788	otmp = is_player_inv (this);
1840	if (otmp && otmp->contr != NULL)	1789	if (otmp && otmp->contr)
1841	{
1842	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1790	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1843	fix_player (otmp);	1791	fix_player (otmp);
1844	}
1845		1792
1846	op->map = NULL;	1793	op->map = NULL;
1847	op->env = where;	1794	op->env = this;
1848	op->above = NULL;	1795	op->above = NULL;
1849	op->below = NULL;	1796	op->below = NULL;
1850	op->x = 0, op->y = 0;	1797	op->x = 0, op->y = 0;
1851		1798
1852	/* reset the light list and los of the players on the map */	1799	/* reset the light list and los of the players on the map */
1853	if ((op->glow_radius != 0) && where->map)	1800	if ((op->glow_radius != 0) && map)
1854	{	1801	{
1855	#ifdef DEBUG_LIGHTS	1802	#ifdef DEBUG_LIGHTS
1856	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1803	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1857	#endif /* DEBUG_LIGHTS */	1804	#endif /* DEBUG_LIGHTS */
1858	if (MAP_DARKNESS (where->map))	1805	if (MAP_DARKNESS (map))
1859	update_all_los (where->map, where->x, where->y);	1806	update_all_los (map, x, y);
1860	}	1807	}
1861		1808
1862	/* Client has no idea of ordering so lets not bother ordering it here.	1809	/* Client has no idea of ordering so lets not bother ordering it here.
1863	* It sure simplifies this function...	1810	* It sure simplifies this function...
1864	*/	1811	*/
1865	if (where->inv == NULL)	1812	if (!inv)
1866	where->inv = op;	1813	inv = op;
1867	else	1814	else
1868	{	1815	{
1869	op->below = where->inv;	1816	op->below = inv;
1870	op->below->above = op;	1817	op->below->above = op;
1871	where->inv = op;	1818	inv = op;
1872	}	1819	}
		1820
1873	return op;	1821	return op;
1874	}	1822	}
1875		1823
1876	/*	1824	/*
1877	* Checks if any objects has a move_type that matches objects	1825	* Checks if any objects has a move_type that matches objects
…		…
1895	*/	1843	*/
1896		1844
1897	int	1845	int
1898	check_move_on (object *op, object *originator)	1846	check_move_on (object *op, object *originator)
1899	{	1847	{
1900	object *	1848	object *tmp;
1901	tmp;	1849	maptile *m = op->map;
1902	tag_t
1903	tag;
1904	mapstruct *
1905	m = op->map;
1906	int
1907	x = op->x, y = op->y;	1850	int x = op->x, y = op->y;
1908		1851
1909	MoveType	1852	MoveType move_on, move_slow, move_block;
1910	move_on,
1911	move_slow,
1912	move_block;
1913		1853
1914	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1854	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1915	return 0;	1855	return 0;
1916
1917	tag = op->count;
1918		1856
1919	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1857	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1920	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1858	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1921	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1859	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1922		1860
…		…
1983	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1921	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1984	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1922	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1985	{	1923	{
1986	move_apply (tmp, op, originator);	1924	move_apply (tmp, op, originator);
1987		1925
1988	if (was_destroyed (op, tag))	1926	if (op->destroyed ())
1989	return 1;	1927	return 1;
1990		1928
1991	/* what the person/creature stepped onto has moved the object	1929	/* what the person/creature stepped onto has moved the object
1992	* someplace new. Don't process any further - if we did,	1930	* someplace new. Don't process any further - if we did,
1993	* have a feeling strange problems would result.	1931	* have a feeling strange problems would result.
…		…
2005	* a matching archetype at the given map and coordinates.	1943	* a matching archetype at the given map and coordinates.
2006	* The first matching object is returned, or NULL if none.	1944	* The first matching object is returned, or NULL if none.
2007	*/	1945	*/
2008		1946
2009	object *	1947	object *
2010	present_arch (const archetype *at, mapstruct *m, int x, int y)	1948	present_arch (const archetype *at, maptile *m, int x, int y)
2011	{	1949	{
2012	object *	1950	object *
2013	tmp;	1951	tmp;
2014		1952
2015	if (m == NULL || out_of_map (m, x, y))	1953	if (m == NULL || out_of_map (m, x, y))
…		…
2028	* a matching type variable at the given map and coordinates.	1966	* a matching type variable at the given map and coordinates.
2029	* The first matching object is returned, or NULL if none.	1967	* The first matching object is returned, or NULL if none.
2030	*/	1968	*/
2031		1969
2032	object *	1970	object *
2033	present (unsigned char type, mapstruct *m, int x, int y)	1971	present (unsigned char type, maptile *m, int x, int y)
2034	{	1972	{
2035	object *	1973	object *
2036	tmp;	1974	tmp;
2037		1975
2038	if (out_of_map (m, x, y))	1976	if (out_of_map (m, x, y))
…		…
2178	* the archetype because that isn't correct if the monster has been	2116	* the archetype because that isn't correct if the monster has been
2179	* customized, changed states, etc.	2117	* customized, changed states, etc.
2180	*/	2118	*/
2181		2119
2182	int	2120	int
2183	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2121	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2184	{	2122	{
2185	int	2123	int
2186	i,	2124	i,
2187	index = 0, flag;	2125	index = 0, flag;
2188	static int	2126	static int
…		…
2209	return -1;	2147	return -1;
2210	return altern[RANDOM () % index];	2148	return altern[RANDOM () % index];
2211	}	2149	}
2212		2150
2213	/*	2151	/*
2214	* find_first_free_spot(archetype, mapstruct, x, y) works like	2152	* find_first_free_spot(archetype, maptile, x, y) works like
2215	* find_free_spot(), but it will search max number of squares.	2153	* find_free_spot(), but it will search max number of squares.
2216	* But it will return the first available spot, not a random choice.	2154	* But it will return the first available spot, not a random choice.
2217	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2155	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2218	*/	2156	*/
2219		2157
2220	int	2158	int
2221	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2159	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2222	{	2160	{
2223	int	2161	int
2224	i;	2162	i;
2225		2163
2226	for (i = 0; i < SIZEOFFREE; i++)	2164	for (i = 0; i < SIZEOFFREE; i++)
…		…
2290	* because we have to know what movement the thing looking to move	2228	* because we have to know what movement the thing looking to move
2291	* there is capable of.	2229	* there is capable of.
2292	*/	2230	*/
2293		2231
2294	int	2232	int
2295	find_dir (mapstruct *m, int x, int y, object *exclude)	2233	find_dir (maptile *m, int x, int y, object *exclude)
2296	{	2234	{
2297	int	2235	int
2298	i,	2236	i,
2299	max = SIZEOFFREE, mflags;	2237	max = SIZEOFFREE, mflags;
2300		2238
2301	sint16 nx, ny;	2239	sint16 nx, ny;
2302	object *	2240	object *
2303	tmp;	2241	tmp;
2304	mapstruct *	2242	maptile *
2305	mp;	2243	mp;
2306		2244
2307	MoveType blocked, move_type;	2245	MoveType blocked, move_type;
2308		2246
2309	if (exclude && exclude->head)	2247	if (exclude && exclude->head)
…		…
2517	* Modified to be map tile aware -.MSW	2455	* Modified to be map tile aware -.MSW
2518	*/	2456	*/
2519		2457
2520		2458
2521	int	2459	int
2522	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2460	can_see_monsterP (maptile *m, int x, int y, int dir)
2523	{	2461	{
2524	sint16 dx, dy;	2462	sint16 dx, dy;
2525	int	2463	int
2526	mflags;	2464	mflags;
2527		2465
…		…
2576	* create clone from object to another	2514	* create clone from object to another
2577	*/	2515	*/
2578	object *	2516	object *
2579	object_create_clone (object *asrc)	2517	object_create_clone (object *asrc)
2580	{	2518	{
2581	object *
2582	dst = NULL, *tmp, *src, *part, *prev, *item;	2519	object *dst = 0, *tmp, *src, *part, *prev, *item;
2583		2520
2584	if (!asrc)	2521	if (!asrc)
2585	return NULL;	2522	return 0;
		2523
2586	src = asrc;	2524	src = asrc;
2587	if (src->head)	2525	if (src->head)
2588	src = src->head;	2526	src = src->head;
2589		2527
2590	prev = NULL;	2528	prev = 0;
2591	for (part = src; part; part = part->more)	2529	for (part = src; part; part = part->more)
2592	{	2530	{
2593	tmp = get_object ();	2531	tmp = part->clone ();
2594	copy_object (part, tmp);
2595	tmp->x -= src->x;	2532	tmp->x -= src->x;
2596	tmp->y -= src->y;	2533	tmp->y -= src->y;
		2534
2597	if (!part->head)	2535	if (!part->head)
2598	{	2536	{
2599	dst = tmp;	2537	dst = tmp;
2600	tmp->head = NULL;	2538	tmp->head = 0;
2601	}	2539	}
2602	else	2540	else
2603	{	2541	{
2604	tmp->head = dst;	2542	tmp->head = dst;
2605	}	2543	}
		2544
2606	tmp->more = NULL;	2545	tmp->more = 0;
		2546
2607	if (prev)	2547	if (prev)
2608	prev->more = tmp;	2548	prev->more = tmp;
		2549
2609	prev = tmp;	2550	prev = tmp;
2610	}	2551	}
2611		2552
2612	/*** copy inventory ***/
2613	for (item = src->inv; item; item = item->below)	2553	for (item = src->inv; item; item = item->below)
2614	{
2615	(void) insert_ob_in_ob (object_create_clone (item), dst);	2554	insert_ob_in_ob (object_create_clone (item), dst);
2616	}
2617		2555
2618	return dst;	2556	return dst;
2619	}	2557	}
2620		2558
2621	/* return true if the object was destroyed, 0 otherwise */
2622	int
2623	was_destroyed (const object *op, tag_t old_tag)
2624	{
2625	/* checking for FLAG_FREED isn't necessary, but makes this function more
2626	* robust */
2627	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2628	}
2629
2630	/* GROS - Creates an object using a string representing its content. */	2559	/* GROS - Creates an object using a string representing its content. */
2631
2632	/* Basically, we save the content of the string to a temp file, then call */	2560	/* Basically, we save the content of the string to a temp file, then call */
2633
2634	/* load_object on it. I admit it is a highly inefficient way to make things, */	2561	/* load_object on it. I admit it is a highly inefficient way to make things, */
2635
2636	/* but it was simple to make and allows reusing the load_object function. */	2562	/* but it was simple to make and allows reusing the load_object function. */
2637
2638	/* Remember not to use load_object_str in a time-critical situation. */	2563	/* Remember not to use load_object_str in a time-critical situation. */
2639
2640	/* Also remember that multiparts objects are not supported for now. */	2564	/* Also remember that multiparts objects are not supported for now. */
2641		2565
2642	object *	2566	object *
2643	load_object_str (const char *obstr)	2567	load_object_str (const char *obstr)
2644	{	2568	{
2645	object *	2569	object *op;
2646	op;
2647	char
2648	filename[MAX_BUF];	2570	char filename[MAX_BUF];
2649		2571
2650	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2572	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2651		2573
2652	FILE *
2653	tempfile = fopen (filename, "w");	2574	FILE *tempfile = fopen (filename, "w");
2654		2575
2655	if (tempfile == NULL)	2576	if (tempfile == NULL)
2656	{	2577	{
2657	LOG (llevError, "Error - Unable to access load object temp file\n");	2578	LOG (llevError, "Error - Unable to access load object temp file\n");
2658	return NULL;	2579	return NULL;
2659	};	2580	}
		2581
2660	fprintf (tempfile, obstr);	2582	fprintf (tempfile, obstr);
2661	fclose (tempfile);	2583	fclose (tempfile);
2662		2584
2663	op = get_object ();	2585	op = object::create ();
2664		2586
2665	object_thawer thawer (filename);	2587	object_thawer thawer (filename);
2666		2588
2667	if (thawer)	2589	if (thawer)
2668	load_object (thawer, op, 0);	2590	load_object (thawer, op, 0);
…		…
2678	* returns NULL if no match.	2600	* returns NULL if no match.
2679	*/	2601	*/
2680	object *	2602	object *
2681	find_obj_by_type_subtype (const object *who, int type, int subtype)	2603	find_obj_by_type_subtype (const object *who, int type, int subtype)
2682	{	2604	{
2683	object *	2605	object *tmp;
2684	tmp;
2685		2606
2686	for (tmp = who->inv; tmp; tmp = tmp->below)	2607	for (tmp = who->inv; tmp; tmp = tmp->below)
2687	if (tmp->type == type && tmp->subtype == subtype)	2608	if (tmp->type == type && tmp->subtype == subtype)
2688	return tmp;	2609	return tmp;
2689		2610
…		…
2697	* do the desired thing.	2618	* do the desired thing.
2698	*/	2619	*/
2699	key_value *	2620	key_value *
2700	get_ob_key_link (const object *ob, const char *key)	2621	get_ob_key_link (const object *ob, const char *key)
2701	{	2622	{
2702	key_value *	2623	key_value *link;
2703	link;
2704		2624
2705	for (link = ob->key_values; link != NULL; link = link->next)	2625	for (link = ob->key_values; link != NULL; link = link->next)
2706	{
2707	if (link->key == key)	2626	if (link->key == key)
2708	{
2709	return link;	2627	return link;
2710	}
2711	}
2712		2628
2713	return NULL;	2629	return NULL;
2714	}	2630	}
2715		2631
2716	/*	2632	/*
…		…
2721	* The returned string is shared.	2637	* The returned string is shared.
2722	*/	2638	*/
2723	const char *	2639	const char *
2724	get_ob_key_value (const object *op, const char *const key)	2640	get_ob_key_value (const object *op, const char *const key)
2725	{	2641	{
2726	key_value *	2642	key_value *link;
2727	link;	2643	shstr_cmp canonical_key (key);
2728	const char *
2729	canonical_key;
2730		2644
2731	canonical_key = shstr::find (key);
2732
2733	if (canonical_key == NULL)	2645	if (!canonical_key)
2734	{	2646	{
2735	/* 1. There being a field named key on any object	2647	/* 1. There being a field named key on any object
2736	* implies there'd be a shared string to find.	2648	* implies there'd be a shared string to find.
2737	* 2. Since there isn't, no object has this field.	2649	* 2. Since there isn't, no object has this field.
2738	* 3. Therefore, *this* object doesn't have this field.	2650	* 3. Therefore, *this* object doesn't have this field.
2739	*/	2651	*/
2740	return NULL;	2652	return 0;
2741	}	2653	}
2742		2654
2743	/* This is copied from get_ob_key_link() above -	2655	/* This is copied from get_ob_key_link() above -
2744	* only 4 lines, and saves the function call overhead.	2656	* only 4 lines, and saves the function call overhead.
2745	*/	2657	*/
2746	for (link = op->key_values; link != NULL; link = link->next)	2658	for (link = op->key_values; link; link = link->next)
2747	{
2748	if (link->key == canonical_key)	2659	if (link->key == canonical_key)
2749	{
2750	return link->value;	2660	return link->value;
2751	}	2661
2752	}
2753	return NULL;	2662	return 0;
2754	}	2663	}
2755		2664
2756		2665
2757	/*	2666	/*
2758	* Updates the canonical_key in op to value.	2667	* Updates the canonical_key in op to value.
…		…
2844	shstr key_ (key);	2753	shstr key_ (key);
2845		2754
2846	return set_ob_key_value_s (op, key_, value, add_key);	2755	return set_ob_key_value_s (op, key_, value, add_key);
2847	}	2756	}
2848		2757
		2758	object::depth_iterator::depth_iterator (object *container)
		2759	: iterator_base (container)
		2760	{
		2761	while (item->inv)
		2762	item = item->inv;
		2763	}
		2764
2849	void	2765	void
2850	object::deep_iterator::next ()	2766	object::depth_iterator::next ()
2851	{	2767	{
2852	if (item->inv)
2853	item = item->inv;
2854	else if (item->below)	2768	if (item->below)
		2769	{
2855	item = item->below;	2770	item = item->below;
		2771
		2772	while (item->inv)
		2773	item = item->inv;
		2774	}
2856	else	2775	else
2857	item = item->env->below;	2776	item = item->env;
2858	}	2777	}
		2778
		2779	// return a suitable string describing an objetc in enough detail to find it
		2780	const char *
		2781	object::debug_desc (char *info) const
		2782	{
		2783	char info2[256 * 3];
		2784	char *p = info;
		2785
		2786	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2787	count,
		2788	&name,
		2789	title ? " " : "",
		2790	title ? (const char *)title : "");
		2791
		2792	if (env)
		2793	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2794
		2795	if (map)
		2796	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2797
		2798	return info;
		2799	}
		2800
		2801	const char *
		2802	object::debug_desc () const
		2803	{
		2804	static char info[256 * 3];
		2805	return debug_desc (info);
		2806	}
		2807

Diff Legend

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