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.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.68 by root, Mon Dec 18 02:35:00 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.26 2006/09/11 11:46:52 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
22		16
23	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
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	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>
28	*/	22	*/
29		23
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
32	variable. */	26	variable. */
33	#include <global.h>	27	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	28	#include <stdio.h>
36	# include <sys/types.h>	29	#include <sys/types.h>
37	# include <sys/uio.h>	30	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	31	#include <object.h>
40	#include <funcpoint.h>	32	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
		36
43	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
44		40
45	object *objects; /* Pointer to the list of used objects */
46	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 */
47		42
48	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,
49	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
50	};	45	};
…		…
57	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
58	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,
59	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
60	};	55	};
61		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
62	/* 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. */
63	static int	135	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	137	{
66	key_value *wants_field;	138	key_value *wants_field;
…		…
113	*	185	*
114	* 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
115	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
116	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
117	*	189	*
118	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
119	*	191	*
120	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
121	* check weight	193	* check weight
122	*/	194	*/
123		195
124	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
125	{	197	{
126	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
127	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)
128	return 0;	204	return 0;
129		205
130	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
131	return 0;
132
133	/* 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
134	* 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
135	* used to store nrof).	209	* used to store nrof).
136	*/	210	*/
137	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
148		222
149	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
150	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
151		225
152		226
153	/* 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 ()
154	* being locked in inventory should prevent merging.	228	|| ob1->arch != ob2->arch
155	* 0x4 in flags3 is CLIENT_SENT
156	*/
157	if ((ob1->arch != ob2->arch) ||
158	(ob1->flags[0] != ob2->flags[0]) ||
159	(ob1->flags[1] != ob2->flags[1]) ||
160	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
161	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
162	(ob1->name != ob2->name) ||	229	|| ob1->name != ob2->name
163	(ob1->title != ob2->title) ||	230	|| ob1->title != ob2->title
164	(ob1->msg != ob2->msg) ||	231	|| ob1->msg != ob2->msg
165	(ob1->weight != ob2->weight) ||	232	|| ob1->weight != ob2->weight
166	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
167	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
168	(ob1->attacktype != ob2->attacktype) ||	235	|| ob1->attacktype != ob2->attacktype
169	(ob1->magic != ob2->magic) ||	236	|| ob1->magic != ob2->magic
170	(ob1->slaying != ob2->slaying) ||	237	|| ob1->slaying != ob2->slaying
171	(ob1->skill != ob2->skill) ||	238	|| ob1->skill != ob2->skill
172	(ob1->value != ob2->value) ||	239	|| ob1->value != ob2->value
173	(ob1->animation_id != ob2->animation_id) ||	240	|| ob1->animation_id != ob2->animation_id
174	(ob1->client_type != ob2->client_type) ||	241	|| ob1->client_type != ob2->client_type
175	(ob1->materialname != ob2->materialname) ||	242	|| ob1->materialname != ob2->materialname
176	(ob1->lore != ob2->lore) ||	243	|| ob1->lore != ob2->lore
177	(ob1->subtype != ob2->subtype) ||	244	|| ob1->subtype != ob2->subtype
178	(ob1->move_type != ob2->move_type) ||	245	|| ob1->move_type != ob2->move_type
179	(ob1->move_block != ob2->move_block) ||	246	|| ob1->move_block != ob2->move_block
180	(ob1->move_allow != ob2->move_allow) ||	247	|| ob1->move_allow != ob2->move_allow
181	(ob1->move_on != ob2->move_on) ||	248	|| ob1->move_on != ob2->move_on
182	(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)
183	return 0;	252	return 0;
184		253
185	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
186	* check all objects in the inventory.	255	* check all objects in the inventory.
187	*/	256	*/
…		…
190	/* 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 */
191	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
192	return 0;	261	return 0;
193		262
194	/* Now check to see if the two inventory objects could merge */	263	/* Now check to see if the two inventory objects could merge */
195	if (!CAN_MERGE (ob1->inv, ob2->inv))	264	if (!object::can_merge (ob1->inv, ob2->inv))
196	return 0;	265	return 0;
197		266
198	/* 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
199	* if it is valid.	268	* if it is valid.
200	*/	269	*/
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	284	return 0;
216		285
217	switch (ob1->type)	286	switch (ob1->type)
218	{	287	{
219	case SCROLL:	288	case SCROLL:
220	if (ob1->level != ob2->level)	289	if (ob1->level != ob2->level)
221	return 0;	290	return 0;
222	break;	291	break;
223	}	292	}
224		293
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	294	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	295	{
227	/* At least one of these has key_values. */	296	/* At least one of these has key_values. */
…		…
249	/*	318	/*
250	* sum_weight() is a recursive function which calculates the weight	319	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	320	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	321	* containers are carrying, and sums it up.
253	*/	322	*/
254	signed long	323	long
255	sum_weight (object *op)	324	sum_weight (object *op)
256	{	325	{
257	signed long sum;	326	long sum;
258	object *inv;	327	object *inv;
259		328
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	330	{
262	if (inv->inv)	331	if (inv->inv)
263	sum_weight (inv);	332	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	334	}
		335
266	if (op->type == CONTAINER && op->stats.Str)	336	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	337	sum = (sum * (100 - op->stats.Str)) / 100;
		338
268	if (op->carrying != sum)	339	if (op->carrying != sum)
269	op->carrying = sum;	340	op->carrying = sum;
		341
270	return sum;	342	return sum;
271	}	343	}
272		344
273	/**	345	/**
274	* Return the outermost environment object for a given object.	346	* Return the outermost environment object for a given object.
…		…
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	373	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	374	* Some error messages.
303	* 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.
304	*/	376	*/
305		377
306	void	378	char *
307	dump_object2 (object *op)
308	{
309	errmsg[0] = 0;
310	return;
311	//TODO//D#d#
312	#if 0
313	char *cp;
314
315	/* object *tmp;*/
316
317	if (op->arch != NULL)
318	{
319	strcat (errmsg, "arch ");
320	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
321	strcat (errmsg, "\n");
322	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
323	strcat (errmsg, cp);
324	# if 0
325	/* Don't dump player diffs - they are too long, mostly meaningless, and
326	* will overflow the buffer.
327	* Changed so that we don't dump inventory either. This may
328	* also overflow the buffer.
329	*/
330	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
331	strcat (errmsg, cp);
332	for (tmp = op->inv; tmp; tmp = tmp->below)
333	dump_object2 (tmp);
334	# endif
335	strcat (errmsg, "end\n");
336	}
337	else
338	{
339	strcat (errmsg, "Object ");
340	if (op->name == NULL)
341	strcat (errmsg, "(null)");
342	else
343	strcat (errmsg, op->name);
344	strcat (errmsg, "\n");
345	# if 0
346	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
347	strcat (errmsg, cp);
348	for (tmp = op->inv; tmp; tmp = tmp->below)
349	dump_object2 (tmp);
350	# endif
351	strcat (errmsg, "end\n");
352	}
353	#endif
354	}
355
356	/*
357	* Dumps an object. Returns output in the static global errmsg array.
358	*/
359
360	void
361	dump_object (object *op)	379	dump_object (object *op)
362	{	380	{
363	if (op == NULL)	381	if (!op)
364	{	382	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		383
372	void	384	object_freezer freezer;
373	dump_all_objects (void)	385	save_object (freezer, op, 3);
374	{	386	return freezer.as_string ();
375	object *op;
376
377	for (op = objects; op != NULL; op = op->next)
378	{
379	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}
382	}	387	}
383		388
384	/*	389	/*
385	* 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
386	* multi-object 1 which is closest to the second object.	391	* multi-object 1 which is closest to the second object.
…		…
406	*/	411	*/
407		412
408	object *	413	object *
409	find_object (tag_t i)	414	find_object (tag_t i)
410	{	415	{
411	object *op;	416	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	417	if (op->count == i)
415	break;	418	return op;
		419
416	return op;	420	return 0;
417	}	421	}
418		422
419	/*	423	/*
420	* 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.
421	* Used only by the patch command, but not all that useful.	425	* Used only by the patch command, but not all that useful.
…		…
423	*/	427	*/
424		428
425	object *	429	object *
426	find_object_name (const char *str)	430	find_object_name (const char *str)
427	{	431	{
428	const char *name = shstr::find (str);	432	shstr_cmp str_ (str);
429	object *op;	433	object *op;
430		434
431	for (op = objects; op != NULL; op = op->next)	435	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	436	if (op->name == str_)
433	break;	437	break;
434		438
435	return op;	439	return op;
436	}	440	}
437		441
…		…
440	{	444	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	445	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	446	}
443		447
444	/*	448	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* 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
484	* skill and experience objects.	450	* skill and experience objects.
485	*/	451	*/
486	void	452	void
487	set_owner (object *op, object *owner)	453	object::set_owner (object *owner)
488	{	454	{
489	if (owner == NULL || op == NULL)	455	if (!owner)
490	return;	456	return;
491		457
492	/* next line added to allow objects which own objects */	458	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	459	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	460	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	461	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	462	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	463	* didn't match, this check is valid and I believe that cause is valid.
498	*/	464	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	465	while (owner->owner)
500	owner = owner->owner;	466	owner = owner->owner;
501		467
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	468	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object *op, object *clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	469	}
542		470
543	/* Zero the key_values on op, decrementing the shared-string	471	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	472	* refcounts and freeing the links.
545	*/	473	*/
…		…
561	{	489	{
562	attachable_base::clear ();	490	attachable_base::clear ();
563		491
564	free_key_values (this);	492	free_key_values (this);
565		493
566	clear_owner (this);	494	owner = 0;
567
568	name = 0;	495	name = 0;
569	name_pl = 0;	496	name_pl = 0;
570	title = 0;	497	title = 0;
571	race = 0;	498	race = 0;
572	slaying = 0;	499	slaying = 0;
573	skill = 0;	500	skill = 0;
574	msg = 0;	501	msg = 0;
575	lore = 0;	502	lore = 0;
576	custom_name = 0;	503	custom_name = 0;
577	materialname = 0;	504	materialname = 0;
		505	contr = 0;
		506	below = 0;
		507	above = 0;
		508	inv = 0;
		509	container = 0;
		510	env = 0;
		511	more = 0;
		512	head = 0;
		513	map = 0;
		514	active_next = 0;
		515	active_prev = 0;
578		516
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	517	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		518
581	SET_FLAG (this, FLAG_REMOVED);	519	SET_FLAG (this, FLAG_REMOVED);
582	}
583		520
584	void object::clone (object *destination)
585	{
586	*(object_copy *) destination = *this;
587	*(object_pod *) destination = *this;
588
589	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */	521	/* What is not cleared is next, prev, and count */
616		522
617	op->expmul = 1.0;	523	expmul = 1.0;
618	op->face = blank_face;	524	face = blank_face;
619	op->attacked_by_count = -1;
620		525
621	if (settings.casting_time)	526	if (settings.casting_time)
622	op->casting_time = -1;	527	casting_time = -1;
623	}	528	}
624		529
625	/*	530	/*
626	* copy object first frees everything allocated by the second object,	531	* copy_to first frees everything allocated by the dst object,
627	* and then copies the contends of the first object into the second	532	* and then copies the contents of itself into the second
628	* object, allocating what needs to be allocated. Basically, any	533	* object, allocating what needs to be allocated. Basically, any
629	* 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,
630	* 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
631	* will point at garbage.	536	* will point at garbage.
632	*/	537	*/
633
634	void	538	void
635	copy_object (object *op2, object *op)	539	object::copy_to (object *dst)
636	{	540	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	541	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	542	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
639		543
640	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));
641		549
642	if (is_freed)	550	if (is_freed)
643	SET_FLAG (op, FLAG_FREED);	551	SET_FLAG (dst, FLAG_FREED);
		552
644	if (is_removed)	553	if (is_removed)
645	SET_FLAG (op, FLAG_REMOVED);	554	SET_FLAG (dst, FLAG_REMOVED);
646		555
647	if (op2->speed < 0)	556	if (speed < 0)
648	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	557	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
649		558
650	/* Copy over key_values, if any. */	559	/* Copy over key_values, if any. */
651	if (op2->key_values)	560	if (key_values)
652	{	561	{
653	key_value *tail = 0;	562	key_value *tail = 0;
654	key_value *i;	563	key_value *i;
655		564
656	op->key_values = 0;	565	dst->key_values = 0;
657		566
658	for (i = op2->key_values; i; i = i->next)	567	for (i = key_values; i; i = i->next)
659	{	568	{
660	key_value *new_link = new key_value;	569	key_value *new_link = new key_value;
661		570
662	new_link->next = 0;	571	new_link->next = 0;
663	new_link->key = i->key;	572	new_link->key = i->key;
664	new_link->value = i->value;	573	new_link->value = i->value;
665		574
666	/* Try and be clever here, too. */	575	/* Try and be clever here, too. */
667	if (!op->key_values)	576	if (!dst->key_values)
668	{	577	{
669	op->key_values = new_link;	578	dst->key_values = new_link;
670	tail = new_link;	579	tail = new_link;
671	}	580	}
672	else	581	else
673	{	582	{
674	tail->next = new_link;	583	tail->next = new_link;
675	tail = new_link;	584	tail = new_link;
676	}	585	}
677	}	586	}
678	}	587	}
679		588
680	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;
681	}	598	}
682		599
683	/*	600	/*
684	* 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
685	* 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
…		…
698	/*	615	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	616	* Updates the speed of an object. If the speed changes from 0 to another
700	* value, or vice versa, then add/remove the object from the active list.	617	* value, or vice versa, then add/remove the object from the active list.
701	* This function needs to be called whenever the speed of an object changes.	618	* This function needs to be called whenever the speed of an object changes.
702	*/	619	*/
703
704	void	620	void
705	update_ob_speed (object *op)	621	update_ob_speed (object *op)
706	{	622	{
707	extern int arch_init;	623	extern int arch_init;
708		624
…		…
717	abort ();	633	abort ();
718	#else	634	#else
719	op->speed = 0;	635	op->speed = 0;
720	#endif	636	#endif
721	}	637	}
		638
722	if (arch_init)	639	if (arch_init)
723	{
724	return;	640	return;
725	}	641
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	642	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	643	{
728	/* If already on active list, don't do anything */	644	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	645	if (op->active_next || op->active_prev || op == active_objects)
730	return;	646	return;
731		647
732	/* process_events() expects us to insert the object at the beginning	648	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	649	* of the list. */
734	op->active_next = active_objects;	650	op->active_next = active_objects;
		651
735	if (op->active_next != NULL)	652	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	653	op->active_next->active_prev = op;
		654
737	active_objects = op;	655	active_objects = op;
738	}	656	}
739	else	657	else
740	{	658	{
741	/* If not on the active list, nothing needs to be done */	659	/* If not on the active list, nothing needs to be done */
…		…
743	return;	661	return;
744		662
745	if (op->active_prev == NULL)	663	if (op->active_prev == NULL)
746	{	664	{
747	active_objects = op->active_next;	665	active_objects = op->active_next;
		666
748	if (op->active_next != NULL)	667	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	668	op->active_next->active_prev = NULL;
750	}	669	}
751	else	670	else
752	{	671	{
753	op->active_prev->active_next = op->active_next;	672	op->active_prev->active_next = op->active_next;
		673
754	if (op->active_next)	674	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	675	op->active_next->active_prev = op->active_prev;
756	}	676	}
		677
757	op->active_next = NULL;	678	op->active_next = NULL;
758	op->active_prev = NULL;	679	op->active_prev = NULL;
759	}	680	}
760	}	681	}
761		682
…		…
886	update_now = 1;	807	update_now = 1;
887		808
888	if ((move_slow | op->move_slow) != move_slow)	809	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;	810	update_now = 1;
890	}	811	}
		812
891	/* if the object is being removed, we can't make intelligent	813	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	814	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	815	* that is being removed.
894	*/	816	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	817	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	818	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	819	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	820	/* Nothing to do for that case */ ;
902	}
903	else	821	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	822	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		823
908	if (update_now)	824	if (update_now)
909	{	825	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	826	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	827	update_position (op->map, op->x, op->y);
…		…
913		829
914	if (op->more != NULL)	830	if (op->more != NULL)
915	update_object (op->more, action);	831	update_object (op->more, action);
916	}	832	}
917		833
918	static unordered_vector<object *> mortals;	834	object::vector object::mortals;
919	static std::vector<object *> freed;	835	object::vector object::objects; // not yet used
		836	object *object::first;
920		837
921	void object::free_mortals ()	838	void object::free_mortals ()
922	{	839	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	840	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	841	if ((*i)->refcnt)
		842	++i; // further delay freeing
		843	else
925	{	844	{
926	freed.push_back (*i);	845	delete *i;
927	mortals.erase (i);	846	mortals.erase (i);
928	}	847	}
929	else
930	++i;
931	}	848	}
932		849
933	object::object ()	850	object::object ()
934	{	851	{
935	SET_FLAG (this, FLAG_REMOVED);	852	SET_FLAG (this, FLAG_REMOVED);
936		853
937	expmul = 1.0;	854	expmul = 1.0;
938	face = blank_face;	855	face = blank_face;
939	attacked_by_count = -1;
940	}	856	}
941		857
942	object::~object ()	858	object::~object ()
943	{	859	{
944	free_key_values (this);	860	free_key_values (this);
945	}	861	}
946		862
947	void object::link ()	863	void object::link ()
948	{	864	{
949	count = ++ob_count;	865	count = ++ob_count;
		866	uuid = gen_uuid ();
950		867
951	prev = 0;	868	prev = 0;
952	next = objects;	869	next = object::first;
953		870
954	if (objects)	871	if (object::first)
955	objects->prev = this;	872	object::first->prev = this;
956		873
957	objects = this;	874	object::first = this;
958	}	875	}
959		876
960	void object::unlink ()	877	void object::unlink ()
961	{	878	{
962	count = 0;	879	if (this == object::first)
		880	object::first = next;
963		881
964	/* Remove this object from the list of used objects */	882	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	883	if (prev) prev->next = next;
		884	if (next) next->prev = prev;
		885
968	prev = 0;	886	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	887	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	888	}
980		889
981	object *object::create ()	890	object *object::create ()
982	{	891	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	892	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	893	op->link ();
996	return op;	894	return op;
997	}	895	}
998		896
999	/*	897	/*
…		…
1001	* 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
1002	* free objects. The IS_FREED() flag is set in the object.	900	* free objects. The IS_FREED() flag is set in the object.
1003	* The object must have been removed by remove_ob() first for	901	* The object must have been removed by remove_ob() first for
1004	* this function to succeed.	902	* this function to succeed.
1005	*	903	*
1006	* 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
1007	* inventory to the ground.	905	* inventory to the ground.
1008	*/	906	*/
1009	void object::free (bool free_inventory)	907	void object::destroy (bool destroy_inventory)
1010	{	908	{
		909	if (QUERY_FLAG (this, FLAG_FREED))
		910	return;
		911
		912	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		913	remove_friendly_object (this);
		914
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	915	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	916	remove ();
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		917
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	918	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		919
1033	if (more)	920	if (more)
1034	{	921	{
1035	more->free (free_inventory);	922	more->destroy (destroy_inventory);
1036	more = 0;	923	more = 0;
1037	}	924	}
1038		925
1039	if (inv)	926	if (inv)
1040	{	927	{
1041	/* Only if the space blocks everything do we not process -	928	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	929	* if some form of movement is allowed, let objects
1043	* drop on that space.	930	* drop on that space.
1044	*/	931	*/
1045	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)
1046	{	933	{
1047	object *	934	object *op = inv;
1048	op = inv;
1049		935
1050	while (op)	936	while (op)
1051	{	937	{
1052	object *
1053	tmp = op->below;	938	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	939	op->destroy (destroy_inventory);
1057	op = tmp;	940	op = tmp;
1058	}	941	}
1059	}	942	}
1060	else	943	else
1061	{ /* Put objects in inventory onto this space */	944	{ /* Put objects in inventory onto this space */
1062	object *	945	object *op = inv;
1063	op = inv;
1064		946
1065	while (op)	947	while (op)
1066	{	948	{
1067	object *
1068	tmp = op->below;	949	object *tmp = op->below;
1069		950
1070	remove_ob (op);	951	op->remove ();
1071		952
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	953	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| 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))
1074	free_object (op);	955	op->destroy ();
1075	else	956	else
1076	{	957	{
1077	op->x = x;	958	op->x = x;
1078	op->y = y;	959	op->y = y;
1079	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 */
…		…
1082	op = tmp;	963	op = tmp;
1083	}	964	}
1084	}	965	}
1085	}	966	}
1086		967
1087	clear_owner (this);	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
		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;
1088		995
1089	/* Remove object from the active list */	996	/* Remove object from the active list */
1090	speed = 0;	997	speed = 0;
1091	update_ob_speed (this);	998	update_ob_speed (this);
1092		999
1093	unlink ();	1000	unlink ();
1094		1001
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	1002	mortals.push_back (this);
1098	}	1003	}
1099		1004
1100	/*	1005	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	1006	* sub_weight() recursively (outwards) subtracts a number from the
1102	* 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)).
1103	*/	1008	*/
1104
1105	void	1009	void
1106	sub_weight (object *op, signed long weight)	1010	sub_weight (object *op, signed long weight)
1107	{	1011	{
1108	while (op != NULL)	1012	while (op != NULL)
1109	{	1013	{
1110	if (op->type == CONTAINER)	1014	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1015	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1016
1114	op->carrying -= weight;	1017	op->carrying -= weight;
1115	op = op->env;	1018	op = op->env;
1116	}	1019	}
1117	}	1020	}
1118		1021
1119	/* remove_ob(op):	1022	/* op->remove ():
1120	* 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
1121	* 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
1122	* object will have no environment. If the object previously had an	1025	* object will have no environment. If the object previously had an
1123	* environment, the x and y coordinates will be updated to	1026	* environment, the x and y coordinates will be updated to
1124	* the previous environment.	1027	* the previous environment.
1125	* Beware: This function is called from the editor as well!	1028	* Beware: This function is called from the editor as well!
1126	*/	1029	*/
1127
1128	void	1030	void
1129	remove_ob (object *op)	1031	object::remove ()
1130	{	1032	{
1131	object *tmp, *last = NULL;	1033	object *tmp, *last = 0;
1132	object *otmp;	1034	object *otmp;
1133		1035
1134	tag_t tag;
1135	int check_walk_off;	1036	int check_walk_off;
1136	mapstruct *m;
1137		1037
1138	sint16 x, y;
1139
1140	if (QUERY_FLAG (op, FLAG_REMOVED))	1038	if (QUERY_FLAG (this, FLAG_REMOVED))
1141	{	1039	return;
1142	dump_object (op);
1143	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1144		1040
1145	/* Changed it to always dump core in this case. As has been learned
1146	* in the past, trying to recover from errors almost always
1147	* make things worse, and this is a real error here - something
1148	* that should not happen.
1149	* Yes, if this was a mission critical app, trying to do something
1150	* to recover may make sense, but that is because failure of the app
1151	* may have other disastrous problems. Cf runs out of a script
1152	* so is easily enough restarted without any real problems.
1153	* MSW 2001-07-01
1154	*/
1155	abort ();
1156	}
1157
1158	if (op->more != NULL)
1159	remove_ob (op->more);
1160
1161	SET_FLAG (op, FLAG_REMOVED);	1041	SET_FLAG (this, FLAG_REMOVED);
		1042
		1043	if (more)
		1044	more->remove ();
1162		1045
1163	/*	1046	/*
1164	* In this case, the object to be removed is in someones	1047	* In this case, the object to be removed is in someones
1165	* inventory.	1048	* inventory.
1166	*/	1049	*/
1167	if (op->env != NULL)	1050	if (env)
1168	{	1051	{
1169	if (op->nrof)	1052	if (nrof)
1170	sub_weight (op->env, op->weight * op->nrof);	1053	sub_weight (env, weight * nrof);
1171	else	1054	else
1172	sub_weight (op->env, op->weight + op->carrying);	1055	sub_weight (env, weight + carrying);
1173		1056
1174	/* 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
1175	* made to players inventory. If set, avoiding the call	1058	* made to players inventory. If set, avoiding the call
1176	* to save cpu time.	1059	* to save cpu time.
1177	*/	1060	*/
1178	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))
1179	fix_player (otmp);	1062	fix_player (otmp);
1180		1063
1181	if (op->above != NULL)	1064	if (above != NULL)
1182	op->above->below = op->below;	1065	above->below = below;
1183	else	1066	else
1184	op->env->inv = op->below;	1067	env->inv = below;
1185		1068
1186	if (op->below != NULL)	1069	if (below != NULL)
1187	op->below->above = op->above;	1070	below->above = above;
1188		1071
1189	/* we set up values so that it could be inserted into	1072	/* we set up values so that it could be inserted into
1190	* 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
1191	* to the caller to decide what we want to do.	1074	* to the caller to decide what we want to do.
1192	*/	1075	*/
1193	op->x = op->env->x, op->y = op->env->y;	1076	x = env->x, y = env->y;
1194	op->map = op->env->map;	1077	map = env->map;
1195	op->above = NULL, op->below = NULL;	1078	above = 0, below = 0;
1196	op->env = NULL;	1079	env = 0;
1197	return;
1198	}
1199
1200	/* If we get here, we are removing it from a map */
1201	if (op->map == NULL)
1202	return;
1203
1204	x = op->x;
1205	y = op->y;
1206	m = get_map_from_coord (op->map, &x, &y);
1207
1208	if (!m)
1209	{	1080	}
1210	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1081	else if (map)
1211	op->map->path, op->x, op->y);	1082	{
1212	/* in old days, we used to set x and y to 0 and continue.	1083	/* Re did the following section of code - it looks like it had
1213	* it seems if we get into this case, something is probablye	1084	* lots of logic for things we no longer care about
1214	* screwed up and should be fixed.
1215	*/	1085	*/
1216	abort ();
1217	}
1218	if (op->map != m)
1219	{
1220	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1221	op->map->path, m->path, op->x, op->y, x, y);
1222	}
1223		1086
1224	/* Re did the following section of code - it looks like it had
1225	* lots of logic for things we no longer care about
1226	*/
1227
1228	/* link the object above us */	1087	/* link the object above us */
1229	if (op->above)	1088	if (above)
1230	op->above->below = op->below;	1089	above->below = below;
1231	else	1090	else
1232	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 */
1233		1092
1234	/* Relink the object below us, if there is one */	1093	/* Relink the object below us, if there is one */
1235	if (op->below)	1094	if (below)
1236	op->below->above = op->above;	1095	below->above = above;
1237	else	1096	else
1238	{	1097	{
1239	/* 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
1240	* use translated coordinates in case some oddness with map tiling is	1099	* use translated coordinates in case some oddness with map tiling is
1241	* evident	1100	* evident
1242	*/
1243	if (GET_MAP_OB (m, x, y) != op)
1244	{
1245	dump_object (op);
1246	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1247	errmsg);
1248	dump_object (GET_MAP_OB (m, x, y));
1249	LOG (llevError, "%s\n", errmsg);
1250	}
1251
1252	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1253	}
1254
1255	op->above = NULL;
1256	op->below = NULL;
1257
1258	if (op->map->in_memory == MAP_SAVING)
1259	return;
1260
1261	tag = op->count;
1262	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1263
1264	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1265	{
1266	/* No point updating the players look faces if he is the object
1267	* being removed.
1268	*/
1269
1270	if (tmp->type == PLAYER && tmp != op)
1271	{
1272	/* If a container that the player is currently using somehow gets
1273	* removed (most likely destroyed), update the player view
1274	* appropriately.
1275	*/	1101	*/
1276	if (tmp->container == op)	1102	if (GET_MAP_OB (map, x, y) != this)
1277	{	1103	{
1278	CLEAR_FLAG (op, FLAG_APPLIED);	1104	char *dump = dump_object (this);
1279	tmp->container = NULL;	1105	LOG (llevError,
		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);
		1108	dump = dump_object (GET_MAP_OB (map, x, y));
		1109	LOG (llevError, "%s\n", dump);
		1110	free (dump);
1280	}	1111	}
1281		1112
1282	tmp->contr->socket.update_look = 1;	1113	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1283	}
1284	/* See if player moving off should effect something */
1285	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1286	{	1114	}
1287	move_apply (tmp, op, NULL);
1288		1115
1289	if (was_destroyed (op, tag))	1116	above = 0;
		1117	below = 0;
		1118
		1119	if (map->in_memory == MAP_SAVING)
		1120	return;
		1121
		1122	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1123
		1124	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1125	{
		1126	/* No point updating the players look faces if he is the object
		1127	* being removed.
		1128	*/
		1129
		1130	if (tmp->type == PLAYER && tmp != this)
1290	{	1131	{
1291	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1132	/* If a container that the player is currently using somehow gets
		1133	* removed (most likely destroyed), update the player view
		1134	* appropriately.
		1135	*/
		1136	if (tmp->container == this)
		1137	{
		1138	CLEAR_FLAG (this, FLAG_APPLIED);
		1139	tmp->container = 0;
		1140	}
		1141
		1142	tmp->contr->socket->update_look = 1;
1292	}	1143	}
		1144
		1145	/* See if player moving off should effect something */
		1146	if (check_walk_off
		1147	&& ((move_type & tmp->move_off)
		1148	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1149	{
		1150	move_apply (tmp, this, 0);
		1151
		1152	if (destroyed ())
		1153	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1293	}	1154	}
1294		1155
1295	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1156	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1296		1157
1297	if (tmp->above == tmp)	1158	if (tmp->above == tmp)
1298	tmp->above = NULL;	1159	tmp->above = 0;
1299		1160
1300	last = tmp;	1161	last = tmp;
1301	}	1162	}
1302		1163
1303	/* last == NULL of there are no objects on this space */	1164	/* last == NULL of there are no objects on this space */
1304	if (last == NULL)	1165	if (!last)
1305	{	1166	{
1306	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1167	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1307	* 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
1308	* 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
1309	* be correct anyways.	1170	* be correct anyways.
1310	*/	1171	*/
1311	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1172	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1312	update_position (op->map, op->x, op->y);	1173	update_position (map, x, y);
1313	}	1174	}
1314	else	1175	else
1315	update_object (last, UP_OBJ_REMOVE);	1176	update_object (last, UP_OBJ_REMOVE);
1316		1177
1317	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1178	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1318	update_all_los (op->map, op->x, op->y);	1179	update_all_los (map, x, y);
		1180	}
1319	}	1181	}
1320		1182
1321	/*	1183	/*
1322	* merge_ob(op,top):	1184	* merge_ob(op,top):
1323	*	1185	*
1324	* This function goes through all objects below and including top, and	1186	* This function goes through all objects below and including top, and
1325	* merges op to the first matching object.	1187	* merges op to the first matching object.
1326	* If top is NULL, it is calculated.	1188	* If top is NULL, it is calculated.
1327	* 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
1328	*/	1190	*/
1329
1330	object *	1191	object *
1331	merge_ob (object *op, object *top)	1192	merge_ob (object *op, object *top)
1332	{	1193	{
1333	if (!op->nrof)	1194	if (!op->nrof)
1334	return 0;	1195	return 0;
		1196
1335	if (top == NULL)	1197	if (top == NULL)
1336	for (top = op; top != NULL && top->above != NULL; top = top->above);	1198	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1199
1337	for (; top != NULL; top = top->below)	1200	for (; top != NULL; top = top->below)
1338	{	1201	{
1339	if (top == op)	1202	if (top == op)
1340	continue;	1203	continue;
1341	if (CAN_MERGE (op, top))	1204
		1205	if (object::can_merge (op, top))
1342	{	1206	{
1343	top->nrof += op->nrof;	1207	top->nrof += op->nrof;
1344		1208
1345	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1209	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1346	op->weight = 0; /* Don't want any adjustements now */	1210	op->weight = 0; /* Don't want any adjustements now */
1347	remove_ob (op);	1211	op->destroy ();
1348	free_object (op);
1349	return top;	1212	return top;
1350	}	1213	}
1351	}	1214	}
		1215
1352	return NULL;	1216	return 0;
1353	}	1217	}
1354		1218
1355	/*	1219	/*
1356	* 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
1357	* job preparing multi-part monsters	1221	* job preparing multi-part monsters
1358	*/	1222	*/
1359	object *	1223	object *
1360	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)
1361	{	1225	{
1362	object *	1226	object *tmp;
1363	tmp;
1364		1227
1365	if (op->head)	1228	if (op->head)
1366	op = op->head;	1229	op = op->head;
		1230
1367	for (tmp = op; tmp; tmp = tmp->more)	1231	for (tmp = op; tmp; tmp = tmp->more)
1368	{	1232	{
1369	tmp->x = x + tmp->arch->clone.x;	1233	tmp->x = x + tmp->arch->clone.x;
1370	tmp->y = y + tmp->arch->clone.y;	1234	tmp->y = y + tmp->arch->clone.y;
1371	}	1235	}
		1236
1372	return insert_ob_in_map (op, m, originator, flag);	1237	return insert_ob_in_map (op, m, originator, flag);
1373	}	1238	}
1374		1239
1375	/*	1240	/*
1376	* insert_ob_in_map (op, map, originator, flag):	1241	* insert_ob_in_map (op, map, originator, flag):
…		…
1392	* NULL if 'op' was destroyed	1257	* NULL if 'op' was destroyed
1393	* just 'op' otherwise	1258	* just 'op' otherwise
1394	*/	1259	*/
1395		1260
1396	object *	1261	object *
1397	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)
1398	{	1263	{
1399	object *tmp, *top, *floor = NULL;	1264	object *tmp, *top, *floor = NULL;
1400	sint16 x, y;	1265	sint16 x, y;
1401		1266
1402	if (QUERY_FLAG (op, FLAG_FREED))	1267	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1405	return NULL;	1270	return NULL;
1406	}	1271	}
1407		1272
1408	if (m == NULL)	1273	if (m == NULL)
1409	{	1274	{
1410	dump_object (op);	1275	char *dump = dump_object (op);
1411	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);
1412	return op;	1278	return op;
1413	}	1279	}
1414		1280
1415	if (out_of_map (m, op->x, op->y))	1281	if (out_of_map (m, op->x, op->y))
1416	{	1282	{
1417	dump_object (op);	1283	char *dump = dump_object (op);
1418	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);
1419	#ifdef MANY_CORES	1285	#ifdef MANY_CORES
1420	/* 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
1421	* 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
1422	* improperly inserted.	1288	* improperly inserted.
1423	*/	1289	*/
1424	abort ();	1290	abort ();
1425	#endif	1291	#endif
		1292	free (dump);
1426	return op;	1293	return op;
1427	}	1294	}
1428		1295
1429	if (!QUERY_FLAG (op, FLAG_REMOVED))	1296	if (!QUERY_FLAG (op, FLAG_REMOVED))
1430	{	1297	{
1431	dump_object (op);	1298	char *dump = dump_object (op);
1432	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);
1433	return op;	1301	return op;
1434	}	1302	}
1435		1303
1436	if (op->more != NULL)	1304	if (op->more != NULL)
1437	{	1305	{
…		…
1475		1343
1476	/* this has to be done after we translate the coordinates.	1344	/* this has to be done after we translate the coordinates.
1477	*/	1345	*/
1478	if (op->nrof && !(flag & INS_NO_MERGE))	1346	if (op->nrof && !(flag & INS_NO_MERGE))
1479	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)
1480	if (CAN_MERGE (op, tmp))	1348	if (object::can_merge (op, tmp))
1481	{	1349	{
1482	op->nrof += tmp->nrof;	1350	op->nrof += tmp->nrof;
1483	remove_ob (tmp);	1351	tmp->destroy ();
1484	free_object (tmp);
1485	}	1352	}
1486		1353
1487	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 */
1488	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1355	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1489		1356
…		…
1617	* it, so save a few ticks and start from there.	1484	* it, so save a few ticks and start from there.
1618	*/	1485	*/
1619	if (!(flag & INS_MAP_LOAD))	1486	if (!(flag & INS_MAP_LOAD))
1620	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)
1621	if (tmp->type == PLAYER)	1488	if (tmp->type == PLAYER)
1622	tmp->contr->socket.update_look = 1;	1489	tmp->contr->socket->update_look = 1;
1623		1490
1624	/* If this object glows, it may affect lighting conditions that are	1491	/* If this object glows, it may affect lighting conditions that are
1625	* 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
1626	* 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
1627	* on the map will get recalculated. The players could very well	1494	* on the map will get recalculated. The players could very well
…		…
1667	* op is the object to insert it under: supplies x and the map.	1534	* op is the object to insert it under: supplies x and the map.
1668	*/	1535	*/
1669	void	1536	void
1670	replace_insert_ob_in_map (const char *arch_string, object *op)	1537	replace_insert_ob_in_map (const char *arch_string, object *op)
1671	{	1538	{
1672	object *tmp;	1539	object *
		1540	tmp;
1673	object *tmp1;	1541	object *
		1542	tmp1;
1674		1543
1675	/* first search for itself and remove any old instances */	1544	/* first search for itself and remove any old instances */
1676		1545
1677	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)
1678	{
1679	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1680	{	1548	tmp->destroy ();
1681	remove_ob (tmp);
1682	free_object (tmp);
1683	}
1684	}
1685		1549
1686	tmp1 = arch_to_object (find_archetype (arch_string));	1550	tmp1 = arch_to_object (archetype::find (arch_string));
1687		1551
1688	tmp1->x = op->x;	1552	tmp1->x = op->x;
1689	tmp1->y = op->y;	1553	tmp1->y = op->y;
1690	insert_ob_in_map (tmp1, op->map, op, 0);	1554	insert_ob_in_map (tmp1, op->map, op, 0);
1691	}	1555	}
…		…
1699	*/	1563	*/
1700		1564
1701	object *	1565	object *
1702	get_split_ob (object *orig_ob, uint32 nr)	1566	get_split_ob (object *orig_ob, uint32 nr)
1703	{	1567	{
1704	object *	1568	object *newob;
1705	newob;
1706	int
1707	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1569	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1708		1570
1709	if (orig_ob->nrof < nr)	1571	if (orig_ob->nrof < nr)
1710	{	1572	{
1711	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);
1712	return NULL;	1574	return NULL;
1713	}	1575	}
		1576
1714	newob = object_create_clone (orig_ob);	1577	newob = object_create_clone (orig_ob);
		1578
1715	if ((orig_ob->nrof -= nr) < 1)	1579	if ((orig_ob->nrof -= nr) < 1)
1716	{	1580	orig_ob->destroy (1);
1717	if (!is_removed)
1718	remove_ob (orig_ob);
1719	free_object2 (orig_ob, 1);
1720	}
1721	else if (!is_removed)	1581	else if (!is_removed)
1722	{	1582	{
1723	if (orig_ob->env != NULL)	1583	if (orig_ob->env != NULL)
1724	sub_weight (orig_ob->env, orig_ob->weight * nr);	1584	sub_weight (orig_ob->env, orig_ob->weight * nr);
1725	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)
…		…
1727	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1587	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1728	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1588	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1729	return NULL;	1589	return NULL;
1730	}	1590	}
1731	}	1591	}
		1592
1732	newob->nrof = nr;	1593	newob->nrof = nr;
1733		1594
1734	return newob;	1595	return newob;
1735	}	1596	}
1736		1597
…		…
1743	*/	1604	*/
1744		1605
1745	object *	1606	object *
1746	decrease_ob_nr (object *op, uint32 i)	1607	decrease_ob_nr (object *op, uint32 i)
1747	{	1608	{
1748	object *	1609	object *tmp;
1749	tmp;
1750	player *	1610	player *pl;
1751	pl;
1752		1611
1753	if (i == 0) /* objects with op->nrof require this check */	1612	if (i == 0) /* objects with op->nrof require this check */
1754	return op;	1613	return op;
1755		1614
1756	if (i > op->nrof)	1615	if (i > op->nrof)
1757	i = op->nrof;	1616	i = op->nrof;
1758		1617
1759	if (QUERY_FLAG (op, FLAG_REMOVED))	1618	if (QUERY_FLAG (op, FLAG_REMOVED))
1760	{
1761	op->nrof -= i;	1619	op->nrof -= i;
1762	}
1763	else if (op->env != NULL)	1620	else if (op->env != NULL)
1764	{	1621	{
1765	/* is this object in the players inventory, or sub container	1622	/* is this object in the players inventory, or sub container
1766	* therein?	1623	* therein?
1767	*/	1624	*/
…		…
1792	esrv_send_item (tmp, op);	1649	esrv_send_item (tmp, op);
1793	}	1650	}
1794	}	1651	}
1795	else	1652	else
1796	{	1653	{
1797	remove_ob (op);	1654	op->remove ();
1798	op->nrof = 0;	1655	op->nrof = 0;
1799	if (tmp)	1656	if (tmp)
1800	{	1657	{
1801	esrv_del_item (tmp->contr, op->count);	1658	esrv_del_item (tmp->contr, op->count);
1802	}	1659	}
1803	}	1660	}
1804	}	1661	}
1805	else	1662	else
1806	{	1663	{
1807	object *
1808	above = op->above;	1664	object *above = op->above;
1809		1665
1810	if (i < op->nrof)	1666	if (i < op->nrof)
1811	{
1812	op->nrof -= i;	1667	op->nrof -= i;
1813	}
1814	else	1668	else
1815	{	1669	{
1816	remove_ob (op);	1670	op->remove ();
1817	op->nrof = 0;	1671	op->nrof = 0;
1818	}	1672	}
		1673
1819	/* Since we just removed op, op->above is null */	1674	/* Since we just removed op, op->above is null */
1820	for (tmp = above; tmp != NULL; tmp = tmp->above)	1675	for (tmp = above; tmp != NULL; tmp = tmp->above)
1821	if (tmp->type == PLAYER)	1676	if (tmp->type == PLAYER)
1822	{	1677	{
1823	if (op->nrof)	1678	if (op->nrof)
…		…
1826	esrv_del_item (tmp->contr, op->count);	1681	esrv_del_item (tmp->contr, op->count);
1827	}	1682	}
1828	}	1683	}
1829		1684
1830	if (op->nrof)	1685	if (op->nrof)
1831	{
1832	return op;	1686	return op;
1833	}
1834	else	1687	else
1835	{	1688	{
1836	free_object (op);	1689	op->destroy ();
1837	return NULL;	1690	return NULL;
1838	}	1691	}
1839	}	1692	}
1840		1693
1841	/*	1694	/*
…		…
1847	add_weight (object *op, signed long weight)	1700	add_weight (object *op, signed long weight)
1848	{	1701	{
1849	while (op != NULL)	1702	while (op != NULL)
1850	{	1703	{
1851	if (op->type == CONTAINER)	1704	if (op->type == CONTAINER)
1852	{
1853	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1705	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1854	}	1706
1855	op->carrying += weight;	1707	op->carrying += weight;
1856	op = op->env;	1708	op = op->env;
1857	}	1709	}
1858	}	1710	}
1859		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
1860	/*	1732	/*
1861	* insert_ob_in_ob(op,environment):	1733	* env->insert (op)
1862	* This function inserts the object op in the linked list	1734	* This function inserts the object op in the linked list
1863	* inside the object environment.	1735	* inside the object environment.
1864	*	1736	*
1865	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1866	* the inventory at the last position or next to other objects of the same
1867	* type.
1868	* Frank: Now sorted by type, archetype and magic!
1869	*
1870	* 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
1871	* be != op, if items are merged. -Tero	1738	* be != op, if items are merged. -Tero
1872	*/	1739	*/
1873		1740
1874	object *	1741	object *
1875	insert_ob_in_ob (object *op, object *where)	1742	object::insert (object *op)
1876	{	1743	{
1877	object *	1744	object *tmp, *otmp;
1878	tmp, *
1879	otmp;
1880		1745
1881	if (!QUERY_FLAG (op, FLAG_REMOVED))	1746	if (!QUERY_FLAG (op, FLAG_REMOVED))
1882	{	1747	op->remove ();
1883	dump_object (op);	1748
1884	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1885	return op;
1886	}
1887	if (where == NULL)
1888	{
1889	dump_object (op);
1890	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1891	return op;
1892	}
1893	if (where->head)
1894	{
1895	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1896	where = where->head;
1897	}
1898	if (op->more)	1749	if (op->more)
1899	{	1750	{
1900	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);
1901	return op;	1752	return op;
1902	}	1753	}
		1754
1903	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1755	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1904	CLEAR_FLAG (op, FLAG_REMOVED);	1756	CLEAR_FLAG (op, FLAG_REMOVED);
1905	if (op->nrof)	1757	if (op->nrof)
1906	{	1758	{
1907	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1759	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1908	if (CAN_MERGE (tmp, op))	1760	if (object::can_merge (tmp, op))
1909	{	1761	{
1910	/* return the original object and remove inserted object	1762	/* return the original object and remove inserted object
1911	(client needs the original object) */	1763	(client needs the original object) */
1912	tmp->nrof += op->nrof;	1764	tmp->nrof += op->nrof;
1913	/* Weight handling gets pretty funky. Since we are adding to	1765	/* Weight handling gets pretty funky. Since we are adding to
1914	* tmp->nrof, we need to increase the weight.	1766	* tmp->nrof, we need to increase the weight.
1915	*/	1767	*/
1916	add_weight (where, op->weight * op->nrof);	1768	add_weight (this, op->weight * op->nrof);
1917	SET_FLAG (op, FLAG_REMOVED);	1769	SET_FLAG (op, FLAG_REMOVED);
1918	free_object (op); /* free the inserted object */	1770	op->destroy (); /* free the inserted object */
1919	op = tmp;	1771	op = tmp;
1920	remove_ob (op); /* and fix old object's links */	1772	op->remove (); /* and fix old object's links */
1921	CLEAR_FLAG (op, FLAG_REMOVED);	1773	CLEAR_FLAG (op, FLAG_REMOVED);
1922	break;	1774	break;
1923	}	1775	}
1924		1776
1925	/* I assume combined objects have no inventory	1777	/* I assume combined objects have no inventory
1926	* We add the weight - this object could have just been removed	1778	* We add the weight - this object could have just been removed
1927	* (if it was possible to merge). calling remove_ob will subtract	1779	* (if it was possible to merge). calling remove_ob will subtract
1928	* 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
1929	* the linking below	1781	* the linking below
1930	*/	1782	*/
1931	add_weight (where, op->weight * op->nrof);	1783	add_weight (this, op->weight * op->nrof);
1932	}	1784	}
1933	else	1785	else
1934	add_weight (where, (op->weight + op->carrying));	1786	add_weight (this, (op->weight + op->carrying));
1935		1787
1936	otmp = is_player_inv (where);	1788	otmp = is_player_inv (this);
1937	if (otmp && otmp->contr != NULL)	1789	if (otmp && otmp->contr)
1938	{
1939	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1790	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1940	fix_player (otmp);	1791	fix_player (otmp);
1941	}
1942		1792
1943	op->map = NULL;	1793	op->map = NULL;
1944	op->env = where;	1794	op->env = this;
1945	op->above = NULL;	1795	op->above = NULL;
1946	op->below = NULL;	1796	op->below = NULL;
1947	op->x = 0, op->y = 0;	1797	op->x = 0, op->y = 0;
1948		1798
1949	/* 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 */
1950	if ((op->glow_radius != 0) && where->map)	1800	if ((op->glow_radius != 0) && map)
1951	{	1801	{
1952	#ifdef DEBUG_LIGHTS	1802	#ifdef DEBUG_LIGHTS
1953	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);
1954	#endif /* DEBUG_LIGHTS */	1804	#endif /* DEBUG_LIGHTS */
1955	if (MAP_DARKNESS (where->map))	1805	if (MAP_DARKNESS (map))
1956	update_all_los (where->map, where->x, where->y);	1806	update_all_los (map, x, y);
1957	}	1807	}
1958		1808
1959	/* 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.
1960	* It sure simplifies this function...	1810	* It sure simplifies this function...
1961	*/	1811	*/
1962	if (where->inv == NULL)	1812	if (!inv)
1963	where->inv = op;	1813	inv = op;
1964	else	1814	else
1965	{	1815	{
1966	op->below = where->inv;	1816	op->below = inv;
1967	op->below->above = op;	1817	op->below->above = op;
1968	where->inv = op;	1818	inv = op;
1969	}	1819	}
		1820
1970	return op;	1821	return op;
1971	}	1822	}
1972		1823
1973	/*	1824	/*
1974	* Checks if any objects has a move_type that matches objects	1825	* Checks if any objects has a move_type that matches objects
…		…
1993		1844
1994	int	1845	int
1995	check_move_on (object *op, object *originator)	1846	check_move_on (object *op, object *originator)
1996	{	1847	{
1997	object *tmp;	1848	object *tmp;
1998	tag_t tag;
1999	mapstruct *m = op->map;	1849	maptile *m = op->map;
2000	int x = op->x, y = op->y;	1850	int x = op->x, y = op->y;
2001		1851
2002	MoveType move_on, move_slow, move_block;	1852	MoveType move_on, move_slow, move_block;
2003		1853
2004	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1854	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2005	return 0;	1855	return 0;
2006
2007	tag = op->count;
2008		1856
2009	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);
2010	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);
2011	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);
2012		1860
…		…
2055	{	1903	{
2056	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1904	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2057	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1905	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2058	{	1906	{
2059		1907
		1908	float
2060	float diff = tmp->move_slow_penalty * FABS (op->speed);	1909	diff = tmp->move_slow_penalty * FABS (op->speed);
2061		1910
2062	if (op->type == PLAYER)	1911	if (op->type == PLAYER)
2063	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1912	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2064	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1913	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2065	diff /= 4.0;	1914	diff /= 4.0;
…		…
2072	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1921	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2073	((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))
2074	{	1923	{
2075	move_apply (tmp, op, originator);	1924	move_apply (tmp, op, originator);
2076		1925
2077	if (was_destroyed (op, tag))	1926	if (op->destroyed ())
2078	return 1;	1927	return 1;
2079		1928
2080	/* what the person/creature stepped onto has moved the object	1929	/* what the person/creature stepped onto has moved the object
2081	* someplace new. Don't process any further - if we did,	1930	* someplace new. Don't process any further - if we did,
2082	* have a feeling strange problems would result.	1931	* have a feeling strange problems would result.
…		…
2094	* a matching archetype at the given map and coordinates.	1943	* a matching archetype at the given map and coordinates.
2095	* The first matching object is returned, or NULL if none.	1944	* The first matching object is returned, or NULL if none.
2096	*/	1945	*/
2097		1946
2098	object *	1947	object *
2099	present_arch (const archetype *at, mapstruct *m, int x, int y)	1948	present_arch (const archetype *at, maptile *m, int x, int y)
2100	{	1949	{
2101	object *	1950	object *
2102	tmp;	1951	tmp;
2103		1952
2104	if (m == NULL || out_of_map (m, x, y))	1953	if (m == NULL || out_of_map (m, x, y))
…		…
2117	* a matching type variable at the given map and coordinates.	1966	* a matching type variable at the given map and coordinates.
2118	* The first matching object is returned, or NULL if none.	1967	* The first matching object is returned, or NULL if none.
2119	*/	1968	*/
2120		1969
2121	object *	1970	object *
2122	present (unsigned char type, mapstruct *m, int x, int y)	1971	present (unsigned char type, maptile *m, int x, int y)
2123	{	1972	{
2124	object *	1973	object *
2125	tmp;	1974	tmp;
2126		1975
2127	if (out_of_map (m, x, y))	1976	if (out_of_map (m, x, y))
…		…
2267	* 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
2268	* customized, changed states, etc.	2117	* customized, changed states, etc.
2269	*/	2118	*/
2270		2119
2271	int	2120	int
2272	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)
2273	{	2122	{
2274	int	2123	int
2275	i,	2124	i,
2276	index = 0, flag;	2125	index = 0, flag;
2277	static int	2126	static int
…		…
2298	return -1;	2147	return -1;
2299	return altern[RANDOM () % index];	2148	return altern[RANDOM () % index];
2300	}	2149	}
2301		2150
2302	/*	2151	/*
2303	* find_first_free_spot(archetype, mapstruct, x, y) works like	2152	* find_first_free_spot(archetype, maptile, x, y) works like
2304	* find_free_spot(), but it will search max number of squares.	2153	* find_free_spot(), but it will search max number of squares.
2305	* 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.
2306	* 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.
2307	*/	2156	*/
2308		2157
2309	int	2158	int
2310	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)
2311	{	2160	{
2312	int	2161	int
2313	i;	2162	i;
2314		2163
2315	for (i = 0; i < SIZEOFFREE; i++)	2164	for (i = 0; i < SIZEOFFREE; i++)
…		…
2379	* 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
2380	* there is capable of.	2229	* there is capable of.
2381	*/	2230	*/
2382		2231
2383	int	2232	int
2384	find_dir (mapstruct *m, int x, int y, object *exclude)	2233	find_dir (maptile *m, int x, int y, object *exclude)
2385	{	2234	{
2386	int	2235	int
2387	i,	2236	i,
2388	max = SIZEOFFREE, mflags;	2237	max = SIZEOFFREE, mflags;
2389	sint16	2238
2390	nx,	2239	sint16 nx, ny;
2391	ny;
2392	object *	2240	object *
2393	tmp;	2241	tmp;
2394	mapstruct *	2242	maptile *
2395	mp;	2243	mp;
2396	MoveType	2244
2397	blocked,	2245	MoveType blocked, move_type;
2398	move_type;
2399		2246
2400	if (exclude && exclude->head)	2247	if (exclude && exclude->head)
2401	{	2248	{
2402	exclude = exclude->head;	2249	exclude = exclude->head;
2403	move_type = exclude->move_type;	2250	move_type = exclude->move_type;
…		…
2608	* Modified to be map tile aware -.MSW	2455	* Modified to be map tile aware -.MSW
2609	*/	2456	*/
2610		2457
2611		2458
2612	int	2459	int
2613	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2460	can_see_monsterP (maptile *m, int x, int y, int dir)
2614	{	2461	{
2615	sint16	2462	sint16 dx, dy;
2616	dx,
2617	dy;
2618	int	2463	int
2619	mflags;	2464	mflags;
2620		2465
2621	if (dir < 0)	2466	if (dir < 0)
2622	return 0; /* exit condition: invalid direction */	2467	return 0; /* exit condition: invalid direction */
…		…
2669	* create clone from object to another	2514	* create clone from object to another
2670	*/	2515	*/
2671	object *	2516	object *
2672	object_create_clone (object *asrc)	2517	object_create_clone (object *asrc)
2673	{	2518	{
2674	object *
2675	dst = NULL, *tmp, *src, *part, *prev, *item;	2519	object *dst = 0, *tmp, *src, *part, *prev, *item;
2676		2520
2677	if (!asrc)	2521	if (!asrc)
2678	return NULL;	2522	return 0;
		2523
2679	src = asrc;	2524	src = asrc;
2680	if (src->head)	2525	if (src->head)
2681	src = src->head;	2526	src = src->head;
2682		2527
2683	prev = NULL;	2528	prev = 0;
2684	for (part = src; part; part = part->more)	2529	for (part = src; part; part = part->more)
2685	{	2530	{
2686	tmp = get_object ();	2531	tmp = part->clone ();
2687	copy_object (part, tmp);
2688	tmp->x -= src->x;	2532	tmp->x -= src->x;
2689	tmp->y -= src->y;	2533	tmp->y -= src->y;
		2534
2690	if (!part->head)	2535	if (!part->head)
2691	{	2536	{
2692	dst = tmp;	2537	dst = tmp;
2693	tmp->head = NULL;	2538	tmp->head = 0;
2694	}	2539	}
2695	else	2540	else
2696	{	2541	{
2697	tmp->head = dst;	2542	tmp->head = dst;
2698	}	2543	}
		2544
2699	tmp->more = NULL;	2545	tmp->more = 0;
		2546
2700	if (prev)	2547	if (prev)
2701	prev->more = tmp;	2548	prev->more = tmp;
		2549
2702	prev = tmp;	2550	prev = tmp;
2703	}	2551	}
2704		2552
2705	/*** copy inventory ***/
2706	for (item = src->inv; item; item = item->below)	2553	for (item = src->inv; item; item = item->below)
2707	{
2708	(void) insert_ob_in_ob (object_create_clone (item), dst);	2554	insert_ob_in_ob (object_create_clone (item), dst);
2709	}
2710		2555
2711	return dst;	2556	return dst;
2712	}	2557	}
2713		2558
2714	/* return true if the object was destroyed, 0 otherwise */
2715	int
2716	was_destroyed (const object *op, tag_t old_tag)
2717	{
2718	/* checking for FLAG_FREED isn't necessary, but makes this function more
2719	* robust */
2720	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2721	}
2722
2723	/* GROS - Creates an object using a string representing its content. */	2559	/* GROS - Creates an object using a string representing its content. */
2724
2725	/* 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 */
2726
2727	/* 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, */
2728
2729	/* 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. */
2730
2731	/* 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. */
2732
2733	/* Also remember that multiparts objects are not supported for now. */	2564	/* Also remember that multiparts objects are not supported for now. */
2734		2565
2735	object *	2566	object *
2736	load_object_str (const char *obstr)	2567	load_object_str (const char *obstr)
2737	{	2568	{
2738	object *	2569	object *op;
2739	op;
2740	char
2741	filename[MAX_BUF];	2570	char filename[MAX_BUF];
2742		2571
2743	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2572	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2744		2573
2745	FILE *
2746	tempfile = fopen (filename, "w");	2574	FILE *tempfile = fopen (filename, "w");
2747		2575
2748	if (tempfile == NULL)	2576	if (tempfile == NULL)
2749	{	2577	{
2750	LOG (llevError, "Error - Unable to access load object temp file\n");	2578	LOG (llevError, "Error - Unable to access load object temp file\n");
2751	return NULL;	2579	return NULL;
2752	};	2580	}
		2581
2753	fprintf (tempfile, obstr);	2582	fprintf (tempfile, obstr);
2754	fclose (tempfile);	2583	fclose (tempfile);
2755		2584
2756	op = get_object ();	2585	op = object::create ();
2757		2586
2758	object_thawer	2587	object_thawer thawer (filename);
2759	thawer (filename);
2760		2588
2761	if (thawer)	2589	if (thawer)
2762	load_object (thawer, op, 0);	2590	load_object (thawer, op, 0);
2763		2591
2764	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2592	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2772	* returns NULL if no match.	2600	* returns NULL if no match.
2773	*/	2601	*/
2774	object *	2602	object *
2775	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)
2776	{	2604	{
2777	object *	2605	object *tmp;
2778	tmp;
2779		2606
2780	for (tmp = who->inv; tmp; tmp = tmp->below)	2607	for (tmp = who->inv; tmp; tmp = tmp->below)
2781	if (tmp->type == type && tmp->subtype == subtype)	2608	if (tmp->type == type && tmp->subtype == subtype)
2782	return tmp;	2609	return tmp;
2783		2610
…		…
2791	* do the desired thing.	2618	* do the desired thing.
2792	*/	2619	*/
2793	key_value *	2620	key_value *
2794	get_ob_key_link (const object *ob, const char *key)	2621	get_ob_key_link (const object *ob, const char *key)
2795	{	2622	{
2796	key_value *	2623	key_value *link;
2797	link;
2798		2624
2799	for (link = ob->key_values; link != NULL; link = link->next)	2625	for (link = ob->key_values; link != NULL; link = link->next)
2800	{
2801	if (link->key == key)	2626	if (link->key == key)
2802	{
2803	return link;	2627	return link;
2804	}
2805	}
2806		2628
2807	return NULL;	2629	return NULL;
2808	}	2630	}
2809		2631
2810	/*	2632	/*
…		…
2815	* The returned string is shared.	2637	* The returned string is shared.
2816	*/	2638	*/
2817	const char *	2639	const char *
2818	get_ob_key_value (const object *op, const char *const key)	2640	get_ob_key_value (const object *op, const char *const key)
2819	{	2641	{
2820	key_value *	2642	key_value *link;
2821	link;	2643	shstr_cmp canonical_key (key);
2822	const char *
2823	canonical_key;
2824		2644
2825	canonical_key = shstr::find (key);
2826
2827	if (canonical_key == NULL)	2645	if (!canonical_key)
2828	{	2646	{
2829	/* 1. There being a field named key on any object	2647	/* 1. There being a field named key on any object
2830	* implies there'd be a shared string to find.	2648	* implies there'd be a shared string to find.
2831	* 2. Since there isn't, no object has this field.	2649	* 2. Since there isn't, no object has this field.
2832	* 3. Therefore, *this* object doesn't have this field.	2650	* 3. Therefore, *this* object doesn't have this field.
2833	*/	2651	*/
2834	return NULL;	2652	return 0;
2835	}	2653	}
2836		2654
2837	/* This is copied from get_ob_key_link() above -	2655	/* This is copied from get_ob_key_link() above -
2838	* only 4 lines, and saves the function call overhead.	2656	* only 4 lines, and saves the function call overhead.
2839	*/	2657	*/
2840	for (link = op->key_values; link != NULL; link = link->next)	2658	for (link = op->key_values; link; link = link->next)
2841	{
2842	if (link->key == canonical_key)	2659	if (link->key == canonical_key)
2843	{
2844	return link->value;	2660	return link->value;
2845	}	2661
2846	}
2847	return NULL;	2662	return 0;
2848	}	2663	}
2849		2664
2850		2665
2851	/*	2666	/*
2852	* Updates the canonical_key in op to value.	2667	* Updates the canonical_key in op to value.
…		…
2888	if (last)	2703	if (last)
2889	last->next = field->next;	2704	last->next = field->next;
2890	else	2705	else
2891	op->key_values = field->next;	2706	op->key_values = field->next;
2892		2707
2893	delete
2894	field;	2708	delete field;
2895	}	2709	}
2896	}	2710	}
2897	return TRUE;	2711	return TRUE;
2898	}	2712	}
2899	/* IF we get here, key doesn't exist */	2713	/* IF we get here, key doesn't exist */
…		…
2934	* Returns TRUE on success.	2748	* Returns TRUE on success.
2935	*/	2749	*/
2936	int	2750	int
2937	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2751	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2938	{	2752	{
2939	shstr
2940	key_ (key);	2753	shstr key_ (key);
2941		2754
2942	return set_ob_key_value_s (op, key_, value, add_key);	2755	return set_ob_key_value_s (op, key_, value, add_key);
2943	}	2756	}
		2757
		2758	object::depth_iterator::depth_iterator (object *container)
		2759	: iterator_base (container)
		2760	{
		2761	while (item->inv)
		2762	item = item->inv;
		2763	}
		2764
		2765	void
		2766	object::depth_iterator::next ()
		2767	{
		2768	if (item->below)
		2769	{
		2770	item = item->below;
		2771
		2772	while (item->inv)
		2773	item = item->inv;
		2774	}
		2775	else
		2776	item = item->env;
		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