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.35 by root, Tue Sep 12 18:15:34 2006 UTC vs.
Revision 1.80 by root, Sat Dec 23 06:41:39 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. */
…		…
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 <loader.h>	33	#include <loader.h>
35		34
		35	#include <bitset>
		36
36	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
37		40
38	object *objects; /* Pointer to the list of used objects */
39	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 */
40		42
41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	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
43	};	45	};
…		…
50	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	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,
52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53	};	55	};
54		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
55	/* 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. */
56	static int	135	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	137	{
59	key_value *wants_field;	138	key_value *wants_field;
…		…
106	*	185	*
107	* 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
108	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
109	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
110	*	189	*
111	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
112	*	191	*
113	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
114	* check weight	193	* check weight
115	*/	194	*/
116		195
117	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
118	{	197	{
119	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
120	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)
121	return 0;	204	return 0;
122		205
123	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
124	return 0;
125
126	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
127	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
128	* used to store nrof).	209	* used to store nrof).
129	*/	210	*/
130	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
140	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
141		222
142	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
143	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
144		225
145		226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
146	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
147	* being locked in inventory should prevent merging.
148	* 0x4 in flags3 is CLIENT_SENT
149	*/
150	if ((ob1->arch != ob2->arch) ||
151	(ob1->flags[0] != ob2->flags[0]) ||
152	(ob1->flags[1] != ob2->flags[1]) ||
153	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
154	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
155	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
156	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
157	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
158	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
159	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
160	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
161	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
162	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
163	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
164	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
165	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
166	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
167	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
168	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
169	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
170	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
171	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
172	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
173	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
174	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
175	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
176	return 0;	251	return 0;
177		252
178	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
179	* check all objects in the inventory.	254	* check all objects in the inventory.
180	*/	255	*/
…		…
183	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
184	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
185	return 0;	260	return 0;
186		261
187	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
188	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
189	return 0;	264	return 0;
190		265
191	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
192	* if it is valid.	267	* if it is valid.
193	*/	268	*/
…		…
254	{	329	{
255	if (inv->inv)	330	if (inv->inv)
256	sum_weight (inv);	331	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	333	}
		334
259	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
261	if (op->carrying != sum)	338	if (op->carrying != sum)
262	op->carrying = sum;	339	op->carrying = sum;
		340
263	return sum;	341	return sum;
264	}	342	}
265		343
266	/**	344	/**
267	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
274	op = op->env;	352	op = op->env;
275	return op;	353	return op;
276	}	354	}
277		355
278	/*	356	/*
279	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
280	* a better check. We basically keeping traversing up until we can't
281	* or find a player.
282	*/
283
284	object *
285	is_player_inv (object *op)
286	{
287	for (; op != NULL && op->type != PLAYER; op = op->env)
288	if (op->env == op)
289	op->env = NULL;
290	return op;
291	}
292
293	/*
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	358	* Some error messages.
296	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
297	*/	360	*/
298		361
299	void	362	char *
300	dump_object2 (object *op)
301	{
302	errmsg[0] = 0;
303	return;
304	//TODO//D#d#
305	#if 0
306	char *cp;
307
308	/* object *tmp;*/
309
310	if (op->arch != NULL)
311	{
312	strcat (errmsg, "arch ");
313	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314	strcat (errmsg, "\n");
315	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316	strcat (errmsg, cp);
317	# if 0
318	/* Don't dump player diffs - they are too long, mostly meaningless, and
319	* will overflow the buffer.
320	* Changed so that we don't dump inventory either. This may
321	* also overflow the buffer.
322	*/
323	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324	strcat (errmsg, cp);
325	for (tmp = op->inv; tmp; tmp = tmp->below)
326	dump_object2 (tmp);
327	# endif
328	strcat (errmsg, "end\n");
329	}
330	else
331	{
332	strcat (errmsg, "Object ");
333	if (op->name == NULL)
334	strcat (errmsg, "(null)");
335	else
336	strcat (errmsg, op->name);
337	strcat (errmsg, "\n");
338	# if 0
339	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340	strcat (errmsg, cp);
341	for (tmp = op->inv; tmp; tmp = tmp->below)
342	dump_object2 (tmp);
343	# endif
344	strcat (errmsg, "end\n");
345	}
346	#endif
347	}
348
349	/*
350	* Dumps an object. Returns output in the static global errmsg array.
351	*/
352
353	void
354	dump_object (object *op)	363	dump_object (object *op)
355	{	364	{
356	if (op == NULL)	365	if (!op)
357	{	366	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		367
365	void	368	object_freezer freezer;
366	dump_all_objects (void)	369	save_object (freezer, op, 3);
367	{	370	return freezer.as_string ();
368	object *op;
369
370	for (op = objects; op != NULL; op = op->next)
371	{
372	dump_object (op);
373	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374	}
375	}	371	}
376		372
377	/*	373	/*
378	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
379	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
399	*/	395	*/
400		396
401	object *	397	object *
402	find_object (tag_t i)	398	find_object (tag_t i)
403	{	399	{
404	object *op;	400	for (object *op = object::first; op; op = op->next)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	401	if (op->count == i)
408	break;	402	return op;
		403
409	return op;	404	return 0;
410	}	405	}
411		406
412	/*	407	/*
413	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
414	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
419	find_object_name (const char *str)	414	find_object_name (const char *str)
420	{	415	{
421	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
422	object *op;	417	object *op;
423		418
424	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
425	if (op->name == str_)	420	if (op->name == str_)
426	break;	421	break;
427		422
428	return op;	423	return op;
429	}	424	}
430		425
431	void	426	void
432	free_all_object_data ()	427	free_all_object_data ()
433	{	428	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}
436
437	/*
438	* Returns the object which this object marks as being the owner.
439	* A id-scheme is used to avoid pointing to objects which have been
440	* freed and are now reused. If this is detected, the owner is
441	* set to NULL, and NULL is returned.
442	* Changed 2004-02-12 - if the player is setting at the play again
443	* prompt, he is removed, and we don't want to treat him as an owner of
444	* anything, so check removed flag. I don't expect that this should break
445	* anything - once an object is removed, it is basically dead anyways.
446	*/
447	object *
448	object::get_owner ()
449	{
450	if (!owner
451	|| QUERY_FLAG (owner, FLAG_FREED)
452	|| QUERY_FLAG (owner, FLAG_REMOVED))
453	owner = 0;
454
455	return owner;
456	}	430	}
457		431
458	/*	432	/*
459	* Sets the owner and sets the skill and exp pointers to owner's current	433	* Sets the owner and sets the skill and exp pointers to owner's current
460	* skill and experience objects.	434	* skill and experience objects.
…		…
493	}	467	}
494		468
495	op->key_values = 0;	469	op->key_values = 0;
496	}	470	}
497		471
498	void object::clear ()
499	{
500	attachable_base::clear ();
501
502	free_key_values (this);
503
504	owner = 0;
505	name = 0;
506	name_pl = 0;
507	title = 0;
508	race = 0;
509	slaying = 0;
510	skill = 0;
511	msg = 0;
512	lore = 0;
513	custom_name = 0;
514	materialname = 0;
515	contr = 0;
516	below = 0;
517	above = 0;
518	inv = 0;
519	container = 0;
520	env = 0;
521	more = 0;
522	head = 0;
523	map = 0;
524	active_next = 0;
525	active_prev = 0;
526
527	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
528
529	SET_FLAG (this, FLAG_REMOVED);
530
531	/* What is not cleared is next, prev, and count */
532
533	expmul = 1.0;
534	face = blank_face;
535	attacked_by_count = -1;
536
537	if (settings.casting_time)
538	casting_time = -1;
539	}
540
541	void object::clone (object *destination)
542	{
543	*(object_copy *)destination = *this;
544	*(object_pod *)destination = *this;
545
546	if (self || cb)
547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
548	}
549
550	/*	472	/*
551	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
552	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
553	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
554	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
555	* if the first object is freed, the pointers in the new object	477	* if the first object is freed, the pointers in the new object
556	* will point at garbage.	478	* will point at garbage.
557	*/	479	*/
558	void	480	void
559	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
560	{	482	{
561	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
562	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
563		485
564	op2->clone (op);	486	*(object_copy *)dst = *this;
		487
		488	if (self || cb)
		489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
565		490
566	if (is_freed)	491	if (is_freed)
567	SET_FLAG (op, FLAG_FREED);	492	SET_FLAG (dst, FLAG_FREED);
		493
568	if (is_removed)	494	if (is_removed)
569	SET_FLAG (op, FLAG_REMOVED);	495	SET_FLAG (dst, FLAG_REMOVED);
570		496
571	if (op2->speed < 0)	497	if (speed < 0)
572	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
573		499
574	/* Copy over key_values, if any. */	500	/* Copy over key_values, if any. */
575	if (op2->key_values)	501	if (key_values)
576	{	502	{
577	key_value *tail = 0;	503	key_value *tail = 0;
578	key_value *i;	504	key_value *i;
579		505
580	op->key_values = 0;	506	dst->key_values = 0;
581		507
582	for (i = op2->key_values; i; i = i->next)	508	for (i = key_values; i; i = i->next)
583	{	509	{
584	key_value *new_link = new key_value;	510	key_value *new_link = new key_value;
585		511
586	new_link->next = 0;	512	new_link->next = 0;
587	new_link->key = i->key;	513	new_link->key = i->key;
588	new_link->value = i->value;	514	new_link->value = i->value;
589		515
590	/* Try and be clever here, too. */	516	/* Try and be clever here, too. */
591	if (!op->key_values)	517	if (!dst->key_values)
592	{	518	{
593	op->key_values = new_link;	519	dst->key_values = new_link;
594	tail = new_link;	520	tail = new_link;
595	}	521	}
596	else	522	else
597	{	523	{
598	tail->next = new_link;	524	tail->next = new_link;
599	tail = new_link;	525	tail = new_link;
600	}	526	}
601	}	527	}
602	}	528	}
603		529
604	update_ob_speed (op);	530	update_ob_speed (dst);
		531	}
		532
		533	object *
		534	object::clone ()
		535	{
		536	object *neu = create ();
		537	copy_to (neu);
		538	return neu;
605	}	539	}
606		540
607	/*	541	/*
608	* If an object with the IS_TURNABLE() flag needs to be turned due	542	* If an object with the IS_TURNABLE() flag needs to be turned due
609	* to the closest player being on the other side, this function can	543	* to the closest player being on the other side, this function can
…		…
717	op->active_next = NULL;	651	op->active_next = NULL;
718	op->active_prev = NULL;	652	op->active_prev = NULL;
719	}	653	}
720		654
721	/*	655	/*
722	* update_object() updates the array which represents the map.	656	* update_object() updates the the map.
723	* It takes into account invisible objects (and represent squares covered	657	* It takes into account invisible objects (and represent squares covered
724	* by invisible objects by whatever is below them (unless it's another	658	* by invisible objects by whatever is below them (unless it's another
725	* invisible object, etc...)	659	* invisible object, etc...)
726	* If the object being updated is beneath a player, the look-window	660	* If the object being updated is beneath a player, the look-window
727	* of that player is updated (this might be a suboptimal way of	661	* of that player is updated (this might be a suboptimal way of
728	* updating that window, though, since update_object() is called _often_)	662	* updating that window, though, since update_object() is called _often_)
729	*	663	*
730	* action is a hint of what the caller believes need to be done.	664	* action is a hint of what the caller believes need to be done.
731	* For example, if the only thing that has changed is the face (due to
732	* an animation), we don't need to call update_position until that actually
733	* comes into view of a player. OTOH, many other things, like addition/removal
734	* of walls or living creatures may need us to update the flags now.
735	* current action are:	665	* current action are:
736	* UP_OBJ_INSERT: op was inserted	666	* UP_OBJ_INSERT: op was inserted
737	* UP_OBJ_REMOVE: op was removed	667	* UP_OBJ_REMOVE: op was removed
738	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	668	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
739	* as that is easier than trying to look at what may have changed.	669	* as that is easier than trying to look at what may have changed.
740	* UP_OBJ_FACE: only the objects face has changed.	670	* UP_OBJ_FACE: only the objects face has changed.
741	*/	671	*/
742
743	void	672	void
744	update_object (object *op, int action)	673	update_object (object *op, int action)
745	{	674	{
746	int update_now = 0, flags;
747	MoveType move_on, move_off, move_block, move_slow;	675	MoveType move_on, move_off, move_block, move_slow;
748		676
749	if (op == NULL)	677	if (op == NULL)
750	{	678	{
751	/* this should never happen */	679	/* this should never happen */
752	LOG (llevDebug, "update_object() called for NULL object.\n");	680	LOG (llevDebug, "update_object() called for NULL object.\n");
753	return;	681	return;
754	}	682	}
755		683
756	if (op->env != NULL)	684	if (op->env)
757	{	685	{
758	/* Animation is currently handled by client, so nothing	686	/* Animation is currently handled by client, so nothing
759	* to do in this case.	687	* to do in this case.
760	*/	688	*/
761	return;	689	return;
…		…
775	abort ();	703	abort ();
776	#endif	704	#endif
777	return;	705	return;
778	}	706	}
779		707
780	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	708	mapspace &m = op->ms ();
781	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
782	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
783	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
784	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
785	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
786		709
		710	if (m.flags_ & P_NEED_UPDATE)
		711	/* nop */;
787	if (action == UP_OBJ_INSERT)	712	else if (action == UP_OBJ_INSERT)
788	{	713	{
		714	// this is likely overkill, TODO: revisit (schmorp)
789	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	715	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
790	update_now = 1;
791
792	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	716	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
793	update_now = 1;	717	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
794		718	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		719	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
795	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	720	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
796	update_now = 1;
797
798	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
799	update_now = 1;
800
801	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
802	update_now = 1;
803
804	if ((move_on | op->move_on) != move_on)	721	|| (m.move_on | op->move_on ) != m.move_on
805	update_now = 1;
806
807	if ((move_off | op->move_off) != move_off)	722	|| (m.move_off | op->move_off ) != m.move_off
808	update_now = 1;	723	|| (m.move_slow | op->move_slow) != m.move_slow
809
810	/* This isn't perfect, but I don't expect a lot of objects to	724	/* This isn't perfect, but I don't expect a lot of objects to
811	* to have move_allow right now.	725	* to have move_allow right now.
812	*/	726	*/
813	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
814	update_now = 1;	728	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
815		729	m.flags_ = P_NEED_UPDATE;
816	if ((move_slow | op->move_slow) != move_slow)
817	update_now = 1;
818	}	730	}
819	/* if the object is being removed, we can't make intelligent	731	/* if the object is being removed, we can't make intelligent
820	* decisions, because remove_ob can't really pass the object	732	* decisions, because remove_ob can't really pass the object
821	* that is being removed.	733	* that is being removed.
822	*/	734	*/
823	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
824	update_now = 1;	736	m.flags_ = P_NEED_UPDATE;
825	else if (action == UP_OBJ_FACE)	737	else if (action == UP_OBJ_FACE)
826	/* Nothing to do for that case */ ;	738	/* Nothing to do for that case */ ;
827	else	739	else
828	LOG (llevError, "update_object called with invalid action: %d\n", action);	740	LOG (llevError, "update_object called with invalid action: %d\n", action);
829		741
830	if (update_now)
831	{
832	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
833	update_position (op->map, op->x, op->y);
834	}
835
836	if (op->more != NULL)	742	if (op->more)
837	update_object (op->more, action);	743	update_object (op->more, action);
838	}	744	}
839		745
840	static unordered_vector<object *> mortals;	746	object::vector object::mortals;
841	static std::vector<object *> freed;	747	object::vector object::objects; // not yet used
		748	object *object::first;
842		749
843	void object::free_mortals ()	750	void object::free_mortals ()
844	{	751	{
845	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
846	if ((*i)->refcnt)	753	if ((*i)->refcnt)
847	++i; // further delay freeing	754	++i; // further delay freeing
848	else	755	else
849	{	756	{
850	freed.push_back (*i);//D
851	//delete *i;	757	delete *i;
852	mortals.erase (i);	758	mortals.erase (i);
853	}	759	}
854
855	if (mortals.size() && 0)//D
856	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
857	}	760	}
858		761
859	object::object ()	762	object::object ()
860	{	763	{
861	SET_FLAG (this, FLAG_REMOVED);	764	SET_FLAG (this, FLAG_REMOVED);
862		765
863	expmul = 1.0;	766	expmul = 1.0;
864	face = blank_face;	767	face = blank_face;
865	attacked_by_count = -1;
866	}	768	}
867		769
868	object::~object ()	770	object::~object ()
869	{	771	{
870	free_key_values (this);	772	free_key_values (this);
871	}	773	}
872		774
873	void object::link ()	775	void object::link ()
874	{	776	{
875	count = ++ob_count;	777	count = ++ob_count;
		778	uuid = gen_uuid ();
876		779
877	prev = 0;	780	prev = 0;
878	next = objects;	781	next = object::first;
879		782
880	if (objects)	783	if (object::first)
881	objects->prev = this;	784	object::first->prev = this;
882		785
883	objects = this;	786	object::first = this;
884	}	787	}
885		788
886	void object::unlink ()	789	void object::unlink ()
887	{	790	{
888	count = 0;	791	if (this == object::first)
		792	object::first = next;
889		793
890	/* Remove this object from the list of used objects */	794	/* Remove this object from the list of used objects */
891	if (prev)
892	{
893	prev->next = next;	795	if (prev) prev->next = next;
		796	if (next) next->prev = prev;
		797
894	prev = 0;	798	prev = 0;
895	}
896
897	if (next)
898	{
899	next->prev = prev;
900	next = 0;	799	next = 0;
901	}
902
903	if (this == objects)
904	objects = next;
905	}	800	}
906		801
907	object *object::create ()	802	object *object::create ()
908	{	803	{
909	object *op;
910
911	if (freed.empty ())
912	op = new object;	804	object *op = new object;
913	else
914	{
915	// highly annoying, but the only way to get it stable right now
916	op = freed.back ();
917	freed.pop_back ();
918	op->~object ();
919	new ((void *) op) object;
920	}
921
922	op->link ();	805	op->link ();
923	return op;	806	return op;
924	}	807	}
925		808
926	/*	809	/*
…		…
928	* it from the list of used objects, and puts it on the list of	811	* it from the list of used objects, and puts it on the list of
929	* free objects. The IS_FREED() flag is set in the object.	812	* free objects. The IS_FREED() flag is set in the object.
930	* The object must have been removed by remove_ob() first for	813	* The object must have been removed by remove_ob() first for
931	* this function to succeed.	814	* this function to succeed.
932	*	815	*
933	* If free_inventory is set, free inventory as well. Else drop items in	816	* If destroy_inventory is set, free inventory as well. Else drop items in
934	* inventory to the ground.	817	* inventory to the ground.
935	*/	818	*/
936	void object::free (bool free_inventory)	819	void object::destroy (bool destroy_inventory)
937	{	820	{
938	if (QUERY_FLAG (this, FLAG_FREED))	821	if (QUERY_FLAG (this, FLAG_FREED))
939	return;	822	return;
940		823
941	if (QUERY_FLAG (this, FLAG_FRIENDLY))	824	if (QUERY_FLAG (this, FLAG_FRIENDLY))
942	remove_friendly_object (this);	825	remove_friendly_object (this);
943		826
944	if (!QUERY_FLAG (this, FLAG_REMOVED))	827	if (!QUERY_FLAG (this, FLAG_REMOVED))
945	remove_ob (this);	828	remove ();
946		829
947	SET_FLAG (this, FLAG_FREED);	830	SET_FLAG (this, FLAG_FREED);
948		831
949	if (more)	832	if (more)
950	{	833	{
951	more->free (free_inventory);	834	more->destroy (destroy_inventory);
952	more = 0;	835	more = 0;
953	}	836	}
954		837
955	if (inv)	838	if (inv)
956	{	839	{
957	/* Only if the space blocks everything do we not process -	840	/* Only if the space blocks everything do we not process -
958	* if some form of movement is allowed, let objects	841	* if some form of movement is allowed, let objects
959	* drop on that space.	842	* drop on that space.
960	*/	843	*/
961	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	844	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
962	{	845	{
963	object *op = inv;	846	object *op = inv;
964		847
965	while (op)	848	while (op)
966	{	849	{
967	object *tmp = op->below;	850	object *tmp = op->below;
968	op->free (free_inventory);	851	op->destroy (destroy_inventory);
969	op = tmp;	852	op = tmp;
970	}	853	}
971	}	854	}
972	else	855	else
973	{ /* Put objects in inventory onto this space */	856	{ /* Put objects in inventory onto this space */
…		…
975		858
976	while (op)	859	while (op)
977	{	860	{
978	object *tmp = op->below;	861	object *tmp = op->below;
979		862
980	remove_ob (op);	863	op->remove ();
981		864
982	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	865	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
983	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
984	free_object (op);	867	op->destroy ();
985	else	868	else
986	{	869	{
987	op->x = x;	870	op->x = x;
988	op->y = y;	871	op->y = y;
989	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	872	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
992	op = tmp;	875	op = tmp;
993	}	876	}
994	}	877	}
995	}	878	}
996		879
		880	// hack to ensure that freed objects still have a valid map
		881	{
		882	static maptile *freed_map; // freed objects are moved here to avoid crashes
		883
		884	if (!freed_map)
		885	{
		886	freed_map = new maptile;
		887
		888	freed_map->name = "/internal/freed_objects_map";
		889	freed_map->width = 3;
		890	freed_map->height = 3;
		891
		892	freed_map->allocate ();
		893	}
		894
		895	map = freed_map;
		896	x = 1;
		897	y = 1;
		898	}
		899
		900	// clear those pointers that likely might have circular references to us
997	owner = 0;	901	owner = 0;
		902	enemy = 0;
		903	attacked_by = 0;
		904
		905	// only relevant for players(?), but make sure of it anyways
		906	contr = 0;
998		907
999	/* Remove object from the active list */	908	/* Remove object from the active list */
1000	speed = 0;	909	speed = 0;
1001	update_ob_speed (this);	910	update_ob_speed (this);
1002		911
…		…
1007		916
1008	/*	917	/*
1009	* sub_weight() recursively (outwards) subtracts a number from the	918	* sub_weight() recursively (outwards) subtracts a number from the
1010	* weight of an object (and what is carried by it's environment(s)).	919	* weight of an object (and what is carried by it's environment(s)).
1011	*/	920	*/
1012
1013	void	921	void
1014	sub_weight (object *op, signed long weight)	922	sub_weight (object *op, signed long weight)
1015	{	923	{
1016	while (op != NULL)	924	while (op != NULL)
1017	{	925	{
1018	if (op->type == CONTAINER)	926	if (op->type == CONTAINER)
1019	{
1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	927	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021	}	928
1022	op->carrying -= weight;	929	op->carrying -= weight;
1023	op = op->env;	930	op = op->env;
1024	}	931	}
1025	}	932	}
1026		933
1027	/* remove_ob(op):	934	/* op->remove ():
1028	* This function removes the object op from the linked list of objects	935	* This function removes the object op from the linked list of objects
1029	* which it is currently tied to. When this function is done, the	936	* which it is currently tied to. When this function is done, the
1030	* object will have no environment. If the object previously had an	937	* object will have no environment. If the object previously had an
1031	* environment, the x and y coordinates will be updated to	938	* environment, the x and y coordinates will be updated to
1032	* the previous environment.	939	* the previous environment.
1033	* Beware: This function is called from the editor as well!	940	* Beware: This function is called from the editor as well!
1034	*/	941	*/
1035
1036	void	942	void
1037	remove_ob (object *op)	943	object::remove ()
1038	{	944	{
		945	object *tmp, *last = 0;
1039	object *	946	object *otmp;
1040	tmp, *
1041	last = NULL;
1042	object *
1043	otmp;
1044		947
1045	tag_t
1046	tag;
1047	int
1048	check_walk_off;	948	int check_walk_off;
1049	mapstruct *
1050	m;
1051		949
1052	sint16
1053	x,
1054	y;
1055
1056	if (QUERY_FLAG (op, FLAG_REMOVED))	950	if (QUERY_FLAG (this, FLAG_REMOVED))
1057	return;	951	return;
1058		952
1059	SET_FLAG (op, FLAG_REMOVED);	953	SET_FLAG (this, FLAG_REMOVED);
1060		954
1061	if (op->more != NULL)	955	if (more)
1062	remove_ob (op->more);	956	more->remove ();
1063		957
1064	/*	958	/*
1065	* In this case, the object to be removed is in someones	959	* In this case, the object to be removed is in someones
1066	* inventory.	960	* inventory.
1067	*/	961	*/
1068	if (op->env != NULL)	962	if (env)
1069	{	963	{
1070	if (op->nrof)	964	if (nrof)
1071	sub_weight (op->env, op->weight * op->nrof);	965	sub_weight (env, weight * nrof);
1072	else	966	else
1073	sub_weight (op->env, op->weight + op->carrying);	967	sub_weight (env, weight + carrying);
1074		968
1075	/* NO_FIX_PLAYER is set when a great many changes are being	969	/* NO_FIX_PLAYER is set when a great many changes are being
1076	* made to players inventory. If set, avoiding the call	970	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.	971	* to save cpu time.
1078	*/	972	*/
1079	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1080	fix_player (otmp);	974	otmp->update_stats ();
1081		975
1082	if (op->above != NULL)	976	if (above != NULL)
1083	op->above->below = op->below;	977	above->below = below;
1084	else	978	else
1085	op->env->inv = op->below;	979	env->inv = below;
1086		980
1087	if (op->below != NULL)	981	if (below != NULL)
1088	op->below->above = op->above;	982	below->above = above;
1089		983
1090	/* we set up values so that it could be inserted into	984	/* we set up values so that it could be inserted into
1091	* the map, but we don't actually do that - it is up	985	* the map, but we don't actually do that - it is up
1092	* to the caller to decide what we want to do.	986	* to the caller to decide what we want to do.
1093	*/	987	*/
1094	op->x = op->env->x, op->y = op->env->y;	988	x = env->x, y = env->y;
1095	op->map = op->env->map;	989	map = env->map;
1096	op->above = NULL, op->below = NULL;	990	above = 0, below = 0;
1097	op->env = NULL;	991	env = 0;
1098	}	992	}
1099	else if (op->map)	993	else if (map)
1100	{	994	{
1101	x = op->x;
1102	y = op->y;
1103	m = get_map_from_coord (op->map, &x, &y);
1104
1105	if (!m)
1106	{
1107	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1108	op->map->path, op->x, op->y);
1109	/* in old days, we used to set x and y to 0 and continue.
1110	* it seems if we get into this case, something is probablye
1111	* screwed up and should be fixed.
1112	*/
1113	abort ();
1114	}
1115
1116	if (op->map != m)
1117	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1118	op->map->path, m->path, op->x, op->y, x, y);
1119
1120	/* Re did the following section of code - it looks like it had	995	/* Re did the following section of code - it looks like it had
1121	* lots of logic for things we no longer care about	996	* lots of logic for things we no longer care about
1122	*/	997	*/
1123		998
1124	/* link the object above us */	999	/* link the object above us */
1125	if (op->above)	1000	if (above)
1126	op->above->below = op->below;	1001	above->below = below;
1127	else	1002	else
1128	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1003	map->at (x, y).top = below; /* we were top, set new top */
1129		1004
1130	/* Relink the object below us, if there is one */	1005	/* Relink the object below us, if there is one */
1131	if (op->below)	1006	if (below)
1132	op->below->above = op->above;	1007	below->above = above;
1133	else	1008	else
1134	{	1009	{
1135	/* Nothing below, which means we need to relink map object for this space	1010	/* Nothing below, which means we need to relink map object for this space
1136	* use translated coordinates in case some oddness with map tiling is	1011	* use translated coordinates in case some oddness with map tiling is
1137	* evident	1012	* evident
1138	*/	1013	*/
1139	if (GET_MAP_OB (m, x, y) != op)	1014	if (GET_MAP_OB (map, x, y) != this)
1140	{	1015	{
1141	dump_object (op);	1016	char *dump = dump_object (this);
1142	LOG (llevError,	1017	LOG (llevError,
1143	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1018	"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);
		1019	free (dump);
1144	dump_object (GET_MAP_OB (m, x, y));	1020	dump = dump_object (GET_MAP_OB (map, x, y));
1145	LOG (llevError, "%s\n", errmsg);	1021	LOG (llevError, "%s\n", dump);
		1022	free (dump);
1146	}	1023	}
1147		1024
1148	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1025	map->at (x, y).bottom = above; /* goes on above it. */
1149	}	1026	}
1150		1027
1151	op->above = 0;	1028	above = 0;
1152	op->below = 0;	1029	below = 0;
1153		1030
1154	if (op->map->in_memory == MAP_SAVING)	1031	if (map->in_memory == MAP_SAVING)
1155	return;	1032	return;
1156		1033
1157	tag = op->count;
1158	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1159		1035
1160	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1161	{	1037	{
1162	/* No point updating the players look faces if he is the object	1038	/* No point updating the players look faces if he is the object
1163	* being removed.	1039	* being removed.
1164	*/	1040	*/
1165		1041
1166	if (tmp->type == PLAYER && tmp != op)	1042	if (tmp->type == PLAYER && tmp != this)
1167	{	1043	{
1168	/* If a container that the player is currently using somehow gets	1044	/* If a container that the player is currently using somehow gets
1169	* removed (most likely destroyed), update the player view	1045	* removed (most likely destroyed), update the player view
1170	* appropriately.	1046	* appropriately.
1171	*/	1047	*/
1172	if (tmp->container == op)	1048	if (tmp->container == this)
1173	{	1049	{
1174	CLEAR_FLAG (op, FLAG_APPLIED);	1050	CLEAR_FLAG (this, FLAG_APPLIED);
1175	tmp->container = NULL;	1051	tmp->container = 0;
1176	}	1052	}
1177		1053
1178	tmp->contr->socket.update_look = 1;	1054	tmp->contr->ns->floorbox_update ();
1179	}	1055	}
1180		1056
1181	/* See if player moving off should effect something */	1057	/* See if player moving off should effect something */
1182	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1058	if (check_walk_off
		1059	&& ((move_type & tmp->move_off)
		1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1183	{	1061	{
1184	move_apply (tmp, op, NULL);	1062	move_apply (tmp, this, 0);
1185		1063
1186	if (was_destroyed (op, tag))	1064	if (destroyed ())
1187	{
1188	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1065	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1189	}
1190	}	1066	}
1191		1067
1192	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1193		1069
1194	if (tmp->above == tmp)	1070	if (tmp->above == tmp)
1195	tmp->above = NULL;	1071	tmp->above = 0;
1196		1072
1197	last = tmp;	1073	last = tmp;
1198	}	1074	}
1199		1075
1200	/* last == NULL of there are no objects on this space */	1076	/* last == NULL of there are no objects on this space */
1201	if (last == NULL)	1077	if (!last)
1202	{	1078	map->at (x, y).flags_ = P_NEED_UPDATE;
1203	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1204	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1205	* those out anyways, and if there are any flags set right now, they won't
1206	* be correct anyways.
1207	*/
1208	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1209	update_position (op->map, op->x, op->y);
1210	}
1211	else	1079	else
1212	update_object (last, UP_OBJ_REMOVE);	1080	update_object (last, UP_OBJ_REMOVE);
1213		1081
1214	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1215	update_all_los (op->map, op->x, op->y);	1083	update_all_los (map, x, y);
1216	}	1084	}
1217	}	1085	}
1218		1086
1219	/*	1087	/*
1220	* merge_ob(op,top):	1088	* merge_ob(op,top):
…		…
1222	* This function goes through all objects below and including top, and	1090	* This function goes through all objects below and including top, and
1223	* merges op to the first matching object.	1091	* merges op to the first matching object.
1224	* If top is NULL, it is calculated.	1092	* If top is NULL, it is calculated.
1225	* Returns pointer to object if it succeded in the merge, otherwise NULL	1093	* Returns pointer to object if it succeded in the merge, otherwise NULL
1226	*/	1094	*/
1227
1228	object *	1095	object *
1229	merge_ob (object *op, object *top)	1096	merge_ob (object *op, object *top)
1230	{	1097	{
1231	if (!op->nrof)	1098	if (!op->nrof)
1232	return 0;	1099	return 0;
…		…
1236		1103
1237	for (; top != NULL; top = top->below)	1104	for (; top != NULL; top = top->below)
1238	{	1105	{
1239	if (top == op)	1106	if (top == op)
1240	continue;	1107	continue;
1241	if (CAN_MERGE (op, top))	1108
		1109	if (object::can_merge (op, top))
1242	{	1110	{
1243	top->nrof += op->nrof;	1111	top->nrof += op->nrof;
1244		1112
1245	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1113	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1246	op->weight = 0; /* Don't want any adjustements now */	1114	op->weight = 0; /* Don't want any adjustements now */
1247	remove_ob (op);	1115	op->destroy ();
1248	free_object (op);
1249	return top;	1116	return top;
1250	}	1117	}
1251	}	1118	}
1252		1119
1253	return NULL;	1120	return 0;
1254	}	1121	}
1255		1122
1256	/*	1123	/*
1257	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1258	* job preparing multi-part monsters	1125	* job preparing multi-part monsters
1259	*/	1126	*/
1260	object *	1127	object *
1261	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1262	{	1129	{
1263	object *tmp;	1130	object *tmp;
1264		1131
1265	if (op->head)	1132	if (op->head)
1266	op = op->head;	1133	op = op->head;
…		…
1294	* NULL if 'op' was destroyed	1161	* NULL if 'op' was destroyed
1295	* just 'op' otherwise	1162	* just 'op' otherwise
1296	*/	1163	*/
1297		1164
1298	object *	1165	object *
1299	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1300	{	1167	{
1301	object *tmp, *top, *floor = NULL;	1168	object *tmp, *top, *floor = NULL;
1302	sint16 x, y;	1169	sint16 x, y;
1303		1170
1304	if (QUERY_FLAG (op, FLAG_FREED))	1171	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1307	return NULL;	1174	return NULL;
1308	}	1175	}
1309		1176
1310	if (m == NULL)	1177	if (m == NULL)
1311	{	1178	{
1312	dump_object (op);	1179	char *dump = dump_object (op);
1313	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1181	free (dump);
1314	return op;	1182	return op;
1315	}	1183	}
1316		1184
1317	if (out_of_map (m, op->x, op->y))	1185	if (out_of_map (m, op->x, op->y))
1318	{	1186	{
1319	dump_object (op);	1187	char *dump = dump_object (op);
1320	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1321	#ifdef MANY_CORES	1189	#ifdef MANY_CORES
1322	/* Better to catch this here, as otherwise the next use of this object	1190	/* Better to catch this here, as otherwise the next use of this object
1323	* is likely to cause a crash. Better to find out where it is getting	1191	* is likely to cause a crash. Better to find out where it is getting
1324	* improperly inserted.	1192	* improperly inserted.
1325	*/	1193	*/
1326	abort ();	1194	abort ();
1327	#endif	1195	#endif
		1196	free (dump);
1328	return op;	1197	return op;
1329	}	1198	}
1330		1199
1331	if (!QUERY_FLAG (op, FLAG_REMOVED))	1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1332	{	1201	{
1333	dump_object (op);	1202	char *dump = dump_object (op);
1334	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1204	free (dump);
1335	return op;	1205	return op;
1336	}	1206	}
1337		1207
1338	if (op->more != NULL)	1208	if (op->more != NULL)
1339	{	1209	{
…		…
1377		1247
1378	/* this has to be done after we translate the coordinates.	1248	/* this has to be done after we translate the coordinates.
1379	*/	1249	*/
1380	if (op->nrof && !(flag & INS_NO_MERGE))	1250	if (op->nrof && !(flag & INS_NO_MERGE))
1381	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1382	if (CAN_MERGE (op, tmp))	1252	if (object::can_merge (op, tmp))
1383	{	1253	{
1384	op->nrof += tmp->nrof;	1254	op->nrof += tmp->nrof;
1385	remove_ob (tmp);	1255	tmp->destroy ();
1386	free_object (tmp);
1387	}	1256	}
1388		1257
1389	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1258	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1390	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1259	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1391		1260
…		…
1404	op->below = originator->below;	1273	op->below = originator->below;
1405		1274
1406	if (op->below)	1275	if (op->below)
1407	op->below->above = op;	1276	op->below->above = op;
1408	else	1277	else
1409	SET_MAP_OB (op->map, op->x, op->y, op);	1278	op->ms ().bottom = op;
1410		1279
1411	/* since *below* originator, no need to update top */	1280	/* since *below* originator, no need to update top */
1412	originator->below = op;	1281	originator->below = op;
1413	}	1282	}
1414	else	1283	else
…		…
1460	* If INS_ON_TOP is used, don't do this processing	1329	* If INS_ON_TOP is used, don't do this processing
1461	* Need to find the object that in fact blocks view, otherwise	1330	* Need to find the object that in fact blocks view, otherwise
1462	* stacking is a bit odd.	1331	* stacking is a bit odd.
1463	*/	1332	*/
1464	if (!(flag & INS_ON_TOP) &&	1333	if (!(flag & INS_ON_TOP) &&
1465	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1466	{	1335	{
1467	for (last = top; last != floor; last = last->below)	1336	for (last = top; last != floor; last = last->below)
1468	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1469	break;	1338	break;
1470	/* Check to see if we found the object that blocks view,	1339	/* Check to see if we found the object that blocks view,
…		…
1493		1362
1494	if (op->above)	1363	if (op->above)
1495	op->above->below = op;	1364	op->above->below = op;
1496		1365
1497	op->below = NULL;	1366	op->below = NULL;
1498	SET_MAP_OB (op->map, op->x, op->y, op);	1367	op->ms ().bottom = op;
1499	}	1368	}
1500	else	1369	else
1501	{ /* get inserted into the stack above top */	1370	{ /* get inserted into the stack above top */
1502	op->above = top->above;	1371	op->above = top->above;
1503		1372
…		…
1507	op->below = top;	1376	op->below = top;
1508	top->above = op;	1377	top->above = op;
1509	}	1378	}
1510		1379
1511	if (op->above == NULL)	1380	if (op->above == NULL)
1512	SET_MAP_TOP (op->map, op->x, op->y, op);	1381	op->ms ().top = op;
1513	} /* else not INS_BELOW_ORIGINATOR */	1382	} /* else not INS_BELOW_ORIGINATOR */
1514		1383
1515	if (op->type == PLAYER)	1384	if (op->type == PLAYER)
1516	op->contr->do_los = 1;	1385	op->contr->do_los = 1;
1517		1386
1518	/* If we have a floor, we know the player, if any, will be above	1387	/* If we have a floor, we know the player, if any, will be above
1519	* it, so save a few ticks and start from there.	1388	* it, so save a few ticks and start from there.
1520	*/	1389	*/
1521	if (!(flag & INS_MAP_LOAD))	1390	if (!(flag & INS_MAP_LOAD))
1522	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1391	if (object *pl = op->ms ().player ())
1523	if (tmp->type == PLAYER)	1392	pl->contr->ns->floorbox_update ();
1524	tmp->contr->socket.update_look = 1;
1525		1393
1526	/* If this object glows, it may affect lighting conditions that are	1394	/* If this object glows, it may affect lighting conditions that are
1527	* visible to others on this map. But update_all_los is really	1395	* visible to others on this map. But update_all_los is really
1528	* an inefficient way to do this, as it means los for all players	1396	* an inefficient way to do this, as it means los for all players
1529	* on the map will get recalculated. The players could very well	1397	* on the map will get recalculated. The players could very well
…		…
1537		1405
1538	/* updates flags (blocked, alive, no magic, etc) for this map space */	1406	/* updates flags (blocked, alive, no magic, etc) for this map space */
1539	update_object (op, UP_OBJ_INSERT);	1407	update_object (op, UP_OBJ_INSERT);
1540		1408
1541	/* Don't know if moving this to the end will break anything. However,	1409	/* Don't know if moving this to the end will break anything. However,
1542	* we want to have update_look set above before calling this.	1410	* we want to have floorbox_update called before calling this.
1543	*	1411	*
1544	* check_move_on() must be after this because code called from	1412	* check_move_on() must be after this because code called from
1545	* check_move_on() depends on correct map flags (so functions like	1413	* check_move_on() depends on correct map flags (so functions like
1546	* blocked() and wall() work properly), and these flags are updated by	1414	* blocked() and wall() work properly), and these flags are updated by
1547	* update_object().	1415	* update_object().
…		…
1563		1431
1564	return op;	1432	return op;
1565	}	1433	}
1566		1434
1567	/* this function inserts an object in the map, but if it	1435	/* this function inserts an object in the map, but if it
1568	* finds an object of its own type, it'll remove that one first.	1436	* finds an object of its own type, it'll remove that one first.
1569	* op is the object to insert it under: supplies x and the map.	1437	* op is the object to insert it under: supplies x and the map.
1570	*/	1438	*/
1571	void	1439	void
1572	replace_insert_ob_in_map (const char *arch_string, object *op)	1440	replace_insert_ob_in_map (const char *arch_string, object *op)
1573	{	1441	{
1574	object *	1442	object *tmp, *tmp1;
1575	tmp;
1576	object *
1577	tmp1;
1578		1443
1579	/* first search for itself and remove any old instances */	1444	/* first search for itself and remove any old instances */
1580		1445
1581	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1446	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1582	{
1583	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1584	{	1448	tmp->destroy ();
1585	remove_ob (tmp);
1586	free_object (tmp);
1587	}
1588	}
1589		1449
1590	tmp1 = arch_to_object (find_archetype (arch_string));	1450	tmp1 = arch_to_object (archetype::find (arch_string));
1591		1451
1592	tmp1->x = op->x;	1452	tmp1->x = op->x;
1593	tmp1->y = op->y;	1453	tmp1->y = op->y;
1594	insert_ob_in_map (tmp1, op->map, op, 0);	1454	insert_ob_in_map (tmp1, op->map, op, 0);
1595	}	1455	}
…		…
1603	*/	1463	*/
1604		1464
1605	object *	1465	object *
1606	get_split_ob (object *orig_ob, uint32 nr)	1466	get_split_ob (object *orig_ob, uint32 nr)
1607	{	1467	{
1608	object *	1468	object *newob;
1609	newob;
1610	int
1611	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1612		1470
1613	if (orig_ob->nrof < nr)	1471	if (orig_ob->nrof < nr)
1614	{	1472	{
1615	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1473	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1616	return NULL;	1474	return NULL;
1617	}	1475	}
1618		1476
1619	newob = object_create_clone (orig_ob);	1477	newob = object_create_clone (orig_ob);
1620		1478
1621	if ((orig_ob->nrof -= nr) < 1)	1479	if ((orig_ob->nrof -= nr) < 1)
1622	{	1480	orig_ob->destroy (1);
1623	if (!is_removed)
1624	remove_ob (orig_ob);
1625	free_object2 (orig_ob, 1);
1626	}
1627	else if (!is_removed)	1481	else if (!is_removed)
1628	{	1482	{
1629	if (orig_ob->env != NULL)	1483	if (orig_ob->env != NULL)
1630	sub_weight (orig_ob->env, orig_ob->weight * nr);	1484	sub_weight (orig_ob->env, orig_ob->weight * nr);
1631	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1485	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1661	if (i > op->nrof)	1515	if (i > op->nrof)
1662	i = op->nrof;	1516	i = op->nrof;
1663		1517
1664	if (QUERY_FLAG (op, FLAG_REMOVED))	1518	if (QUERY_FLAG (op, FLAG_REMOVED))
1665	op->nrof -= i;	1519	op->nrof -= i;
1666	else if (op->env != NULL)	1520	else if (op->env)
1667	{	1521	{
1668	/* is this object in the players inventory, or sub container	1522	/* is this object in the players inventory, or sub container
1669	* therein?	1523	* therein?
1670	*/	1524	*/
1671	tmp = is_player_inv (op->env);	1525	tmp = op->in_player ();
1672	/* nope. Is this a container the player has opened?	1526	/* nope. Is this a container the player has opened?
1673	* If so, set tmp to that player.	1527	* If so, set tmp to that player.
1674	* IMO, searching through all the players will mostly	1528	* IMO, searching through all the players will mostly
1675	* likely be quicker than following op->env to the map,	1529	* likely be quicker than following op->env to the map,
1676	* and then searching the map for a player.	1530	* and then searching the map for a player.
1677	*/	1531	*/
1678	if (!tmp)	1532	if (!tmp)
1679	{	1533	{
1680	for (pl = first_player; pl; pl = pl->next)	1534	for (pl = first_player; pl; pl = pl->next)
1681	if (pl->ob->container == op->env)	1535	if (pl->ob->container == op->env)
		1536	{
		1537	tmp = pl->ob;
1682	break;	1538	break;
1683	if (pl)	1539	}
1684	tmp = pl->ob;
1685	else
1686	tmp = NULL;
1687	}	1540	}
1688		1541
1689	if (i < op->nrof)	1542	if (i < op->nrof)
1690	{	1543	{
1691	sub_weight (op->env, op->weight * i);	1544	sub_weight (op->env, op->weight * i);
1692	op->nrof -= i;	1545	op->nrof -= i;
1693	if (tmp)	1546	if (tmp)
1694	{
1695	esrv_send_item (tmp, op);	1547	esrv_send_item (tmp, op);
1696	}
1697	}	1548	}
1698	else	1549	else
1699	{	1550	{
1700	remove_ob (op);	1551	op->remove ();
1701	op->nrof = 0;	1552	op->nrof = 0;
1702	if (tmp)	1553	if (tmp)
1703	{
1704	esrv_del_item (tmp->contr, op->count);	1554	esrv_del_item (tmp->contr, op->count);
1705	}
1706	}	1555	}
1707	}	1556	}
1708	else	1557	else
1709	{	1558	{
1710	object *above = op->above;	1559	object *above = op->above;
1711		1560
1712	if (i < op->nrof)	1561	if (i < op->nrof)
1713	op->nrof -= i;	1562	op->nrof -= i;
1714	else	1563	else
1715	{	1564	{
1716	remove_ob (op);	1565	op->remove ();
1717	op->nrof = 0;	1566	op->nrof = 0;
1718	}	1567	}
1719		1568
1720	/* Since we just removed op, op->above is null */	1569	/* Since we just removed op, op->above is null */
1721	for (tmp = above; tmp != NULL; tmp = tmp->above)	1570	for (tmp = above; tmp; tmp = tmp->above)
1722	if (tmp->type == PLAYER)	1571	if (tmp->type == PLAYER)
1723	{	1572	{
1724	if (op->nrof)	1573	if (op->nrof)
1725	esrv_send_item (tmp, op);	1574	esrv_send_item (tmp, op);
1726	else	1575	else
…		…
1730		1579
1731	if (op->nrof)	1580	if (op->nrof)
1732	return op;	1581	return op;
1733	else	1582	else
1734	{	1583	{
1735	free_object (op);	1584	op->destroy ();
1736	return NULL;	1585	return 0;
1737	}	1586	}
1738	}	1587	}
1739		1588
1740	/*	1589	/*
1741	* add_weight(object, weight) adds the specified weight to an object,	1590	* add_weight(object, weight) adds the specified weight to an object,
…		…
1753	op->carrying += weight;	1602	op->carrying += weight;
1754	op = op->env;	1603	op = op->env;
1755	}	1604	}
1756	}	1605	}
1757		1606
		1607	object *
		1608	insert_ob_in_ob (object *op, object *where)
		1609	{
		1610	if (!where)
		1611	{
		1612	char *dump = dump_object (op);
		1613	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1614	free (dump);
		1615	return op;
		1616	}
		1617
		1618	if (where->head)
		1619	{
		1620	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1621	where = where->head;
		1622	}
		1623
		1624	return where->insert (op);
		1625	}
		1626
1758	/*	1627	/*
1759	* insert_ob_in_ob(op,environment):	1628	* env->insert (op)
1760	* This function inserts the object op in the linked list	1629	* This function inserts the object op in the linked list
1761	* inside the object environment.	1630	* inside the object environment.
1762	*	1631	*
1763	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1764	* the inventory at the last position or next to other objects of the same
1765	* type.
1766	* Frank: Now sorted by type, archetype and magic!
1767	*
1768	* The function returns now pointer to inserted item, and return value can	1632	* The function returns now pointer to inserted item, and return value can
1769	* be != op, if items are merged. -Tero	1633	* be != op, if items are merged. -Tero
1770	*/	1634	*/
1771		1635
1772	object *	1636	object *
1773	insert_ob_in_ob (object *op, object *where)	1637	object::insert (object *op)
1774	{	1638	{
1775	object *	1639	object *tmp, *otmp;
1776	tmp, *
1777	otmp;
1778		1640
1779	if (!QUERY_FLAG (op, FLAG_REMOVED))	1641	if (!QUERY_FLAG (op, FLAG_REMOVED))
1780	{	1642	op->remove ();
1781	dump_object (op);
1782	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1783	return op;
1784	}
1785
1786	if (where == NULL)
1787	{
1788	dump_object (op);
1789	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1790	return op;
1791	}
1792
1793	if (where->head)
1794	{
1795	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1796	where = where->head;
1797	}
1798		1643
1799	if (op->more)	1644	if (op->more)
1800	{	1645	{
1801	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1646	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1802	return op;	1647	return op;
…		…
1804		1649
1805	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1650	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1806	CLEAR_FLAG (op, FLAG_REMOVED);	1651	CLEAR_FLAG (op, FLAG_REMOVED);
1807	if (op->nrof)	1652	if (op->nrof)
1808	{	1653	{
1809	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1654	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1810	if (CAN_MERGE (tmp, op))	1655	if (object::can_merge (tmp, op))
1811	{	1656	{
1812	/* return the original object and remove inserted object	1657	/* return the original object and remove inserted object
1813	(client needs the original object) */	1658	(client needs the original object) */
1814	tmp->nrof += op->nrof;	1659	tmp->nrof += op->nrof;
1815	/* Weight handling gets pretty funky. Since we are adding to	1660	/* Weight handling gets pretty funky. Since we are adding to
1816	* tmp->nrof, we need to increase the weight.	1661	* tmp->nrof, we need to increase the weight.
1817	*/	1662	*/
1818	add_weight (where, op->weight * op->nrof);	1663	add_weight (this, op->weight * op->nrof);
1819	SET_FLAG (op, FLAG_REMOVED);	1664	SET_FLAG (op, FLAG_REMOVED);
1820	free_object (op); /* free the inserted object */	1665	op->destroy (); /* free the inserted object */
1821	op = tmp;	1666	op = tmp;
1822	remove_ob (op); /* and fix old object's links */	1667	op->remove (); /* and fix old object's links */
1823	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
1824	break;	1669	break;
1825	}	1670	}
1826		1671
1827	/* I assume combined objects have no inventory	1672	/* I assume combined objects have no inventory
1828	* We add the weight - this object could have just been removed	1673	* We add the weight - this object could have just been removed
1829	* (if it was possible to merge). calling remove_ob will subtract	1674	* (if it was possible to merge). calling remove_ob will subtract
1830	* the weight, so we need to add it in again, since we actually do	1675	* the weight, so we need to add it in again, since we actually do
1831	* the linking below	1676	* the linking below
1832	*/	1677	*/
1833	add_weight (where, op->weight * op->nrof);	1678	add_weight (this, op->weight * op->nrof);
1834	}	1679	}
1835	else	1680	else
1836	add_weight (where, (op->weight + op->carrying));	1681	add_weight (this, (op->weight + op->carrying));
1837		1682
1838	otmp = is_player_inv (where);	1683	otmp = this->in_player ();
1839	if (otmp && otmp->contr != NULL)	1684	if (otmp && otmp->contr)
1840	{
1841	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1685	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1842	fix_player (otmp);	1686	otmp->update_stats ();
1843	}
1844		1687
1845	op->map = NULL;	1688	op->map = 0;
1846	op->env = where;	1689	op->env = this;
1847	op->above = NULL;	1690	op->above = 0;
1848	op->below = NULL;	1691	op->below = 0;
1849	op->x = 0, op->y = 0;	1692	op->x = 0, op->y = 0;
1850		1693
1851	/* reset the light list and los of the players on the map */	1694	/* reset the light list and los of the players on the map */
1852	if ((op->glow_radius != 0) && where->map)	1695	if ((op->glow_radius != 0) && map)
1853	{	1696	{
1854	#ifdef DEBUG_LIGHTS	1697	#ifdef DEBUG_LIGHTS
1855	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1698	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1856	#endif /* DEBUG_LIGHTS */	1699	#endif /* DEBUG_LIGHTS */
1857	if (MAP_DARKNESS (where->map))	1700	if (MAP_DARKNESS (map))
1858	update_all_los (where->map, where->x, where->y);	1701	update_all_los (map, x, y);
1859	}	1702	}
1860		1703
1861	/* Client has no idea of ordering so lets not bother ordering it here.	1704	/* Client has no idea of ordering so lets not bother ordering it here.
1862	* It sure simplifies this function...	1705	* It sure simplifies this function...
1863	*/	1706	*/
1864	if (where->inv == NULL)	1707	if (!inv)
1865	where->inv = op;	1708	inv = op;
1866	else	1709	else
1867	{	1710	{
1868	op->below = where->inv;	1711	op->below = inv;
1869	op->below->above = op;	1712	op->below->above = op;
1870	where->inv = op;	1713	inv = op;
1871	}	1714	}
		1715
1872	return op;	1716	return op;
1873	}	1717	}
1874		1718
1875	/*	1719	/*
1876	* Checks if any objects has a move_type that matches objects	1720	* Checks if any objects has a move_type that matches objects
…		…
1894	*/	1738	*/
1895		1739
1896	int	1740	int
1897	check_move_on (object *op, object *originator)	1741	check_move_on (object *op, object *originator)
1898	{	1742	{
1899	object *	1743	object *tmp;
1900	tmp;	1744	maptile *m = op->map;
1901	tag_t
1902	tag;
1903	mapstruct *
1904	m = op->map;
1905	int
1906	x = op->x, y = op->y;	1745	int x = op->x, y = op->y;
1907		1746
1908	MoveType	1747	MoveType move_on, move_slow, move_block;
1909	move_on,
1910	move_slow,
1911	move_block;
1912		1748
1913	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1749	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1914	return 0;	1750	return 0;
1915
1916	tag = op->count;
1917		1751
1918	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1752	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1919	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1753	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1920	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1754	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1921		1755
…		…
1982	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1816	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1983	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1817	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1984	{	1818	{
1985	move_apply (tmp, op, originator);	1819	move_apply (tmp, op, originator);
1986		1820
1987	if (was_destroyed (op, tag))	1821	if (op->destroyed ())
1988	return 1;	1822	return 1;
1989		1823
1990	/* what the person/creature stepped onto has moved the object	1824	/* what the person/creature stepped onto has moved the object
1991	* someplace new. Don't process any further - if we did,	1825	* someplace new. Don't process any further - if we did,
1992	* have a feeling strange problems would result.	1826	* have a feeling strange problems would result.
…		…
2004	* a matching archetype at the given map and coordinates.	1838	* a matching archetype at the given map and coordinates.
2005	* The first matching object is returned, or NULL if none.	1839	* The first matching object is returned, or NULL if none.
2006	*/	1840	*/
2007		1841
2008	object *	1842	object *
2009	present_arch (const archetype *at, mapstruct *m, int x, int y)	1843	present_arch (const archetype *at, maptile *m, int x, int y)
2010	{	1844	{
2011	object *	1845	object *
2012	tmp;	1846	tmp;
2013		1847
2014	if (m == NULL || out_of_map (m, x, y))	1848	if (m == NULL || out_of_map (m, x, y))
…		…
2027	* a matching type variable at the given map and coordinates.	1861	* a matching type variable at the given map and coordinates.
2028	* The first matching object is returned, or NULL if none.	1862	* The first matching object is returned, or NULL if none.
2029	*/	1863	*/
2030		1864
2031	object *	1865	object *
2032	present (unsigned char type, mapstruct *m, int x, int y)	1866	present (unsigned char type, maptile *m, int x, int y)
2033	{	1867	{
2034	object *	1868	object *
2035	tmp;	1869	tmp;
2036		1870
2037	if (out_of_map (m, x, y))	1871	if (out_of_map (m, x, y))
…		…
2177	* the archetype because that isn't correct if the monster has been	2011	* the archetype because that isn't correct if the monster has been
2178	* customized, changed states, etc.	2012	* customized, changed states, etc.
2179	*/	2013	*/
2180		2014
2181	int	2015	int
2182	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2016	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2183	{	2017	{
2184	int	2018	int
2185	i,	2019	i,
2186	index = 0, flag;	2020	index = 0, flag;
2187	static int	2021	static int
…		…
2199	* if the space being examined only has a wall to the north and empty	2033	* if the space being examined only has a wall to the north and empty
2200	* spaces in all the other directions, this will reduce the search space	2034	* spaces in all the other directions, this will reduce the search space
2201	* to only the spaces immediately surrounding the target area, and	2035	* to only the spaces immediately surrounding the target area, and
2202	* won't look 2 spaces south of the target space.	2036	* won't look 2 spaces south of the target space.
2203	*/	2037	*/
2204	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2038	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2205	stop = maxfree[i];	2039	stop = maxfree[i];
2206	}	2040	}
		2041
2207	if (!index)	2042	if (!index)
2208	return -1;	2043	return -1;
		2044
2209	return altern[RANDOM () % index];	2045	return altern[RANDOM () % index];
2210	}	2046	}
2211		2047
2212	/*	2048	/*
2213	* find_first_free_spot(archetype, mapstruct, x, y) works like	2049	* find_first_free_spot(archetype, maptile, x, y) works like
2214	* find_free_spot(), but it will search max number of squares.	2050	* find_free_spot(), but it will search max number of squares.
2215	* But it will return the first available spot, not a random choice.	2051	* But it will return the first available spot, not a random choice.
2216	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2052	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2217	*/	2053	*/
2218		2054
2219	int	2055	int
2220	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2056	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2221	{	2057	{
2222	int	2058	int
2223	i;	2059	i;
2224		2060
2225	for (i = 0; i < SIZEOFFREE; i++)	2061	for (i = 0; i < SIZEOFFREE; i++)
…		…
2289	* because we have to know what movement the thing looking to move	2125	* because we have to know what movement the thing looking to move
2290	* there is capable of.	2126	* there is capable of.
2291	*/	2127	*/
2292		2128
2293	int	2129	int
2294	find_dir (mapstruct *m, int x, int y, object *exclude)	2130	find_dir (maptile *m, int x, int y, object *exclude)
2295	{	2131	{
2296	int	2132	int
2297	i,	2133	i,
2298	max = SIZEOFFREE, mflags;	2134	max = SIZEOFFREE, mflags;
2299		2135
2300	sint16 nx, ny;	2136	sint16 nx, ny;
2301	object *	2137	object *
2302	tmp;	2138	tmp;
2303	mapstruct *	2139	maptile *
2304	mp;	2140	mp;
2305		2141
2306	MoveType blocked, move_type;	2142	MoveType blocked, move_type;
2307		2143
2308	if (exclude && exclude->head)	2144	if (exclude && exclude->head)
…		…
2321	mp = m;	2157	mp = m;
2322	nx = x + freearr_x[i];	2158	nx = x + freearr_x[i];
2323	ny = y + freearr_y[i];	2159	ny = y + freearr_y[i];
2324		2160
2325	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2161	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2162
2326	if (mflags & P_OUT_OF_MAP)	2163	if (mflags & P_OUT_OF_MAP)
2327	{
2328	max = maxfree[i];	2164	max = maxfree[i];
2329	}
2330	else	2165	else
2331	{	2166	{
2332	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2167	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2333		2168
2334	if ((move_type & blocked) == move_type)	2169	if ((move_type & blocked) == move_type)
2335	{
2336	max = maxfree[i];	2170	max = maxfree[i];
2337	}
2338	else if (mflags & P_IS_ALIVE)	2171	else if (mflags & P_IS_ALIVE)
2339	{	2172	{
2340	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2173	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2341	{
2342	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2174	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2343	{
2344	break;	2175	break;
2345	}	2176
2346	}
2347	if (tmp)	2177	if (tmp)
2348	{
2349	return freedir[i];	2178	return freedir[i];
2350	}
2351	}	2179	}
2352	}	2180	}
2353	}	2181	}
		2182
2354	return 0;	2183	return 0;
2355	}	2184	}
2356		2185
2357	/*	2186	/*
2358	* distance(object 1, object 2) will return the square of the	2187	* distance(object 1, object 2) will return the square of the
…		…
2360	*/	2189	*/
2361		2190
2362	int	2191	int
2363	distance (const object *ob1, const object *ob2)	2192	distance (const object *ob1, const object *ob2)
2364	{	2193	{
2365	int	2194	int i;
2366	i;
2367		2195
2368	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2196	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2369	return i;	2197	return i;
2370	}	2198	}
2371		2199
…		…
2376	*/	2204	*/
2377		2205
2378	int	2206	int
2379	find_dir_2 (int x, int y)	2207	find_dir_2 (int x, int y)
2380	{	2208	{
2381	int	2209	int q;
2382	q;
2383		2210
2384	if (y)	2211	if (y)
2385	q = x * 100 / y;	2212	q = x * 100 / y;
2386	else if (x)	2213	else if (x)
2387	q = -300 * x;	2214	q = -300 * x;
…		…
2513	* find a path to that monster that we found. If not,	2340	* find a path to that monster that we found. If not,
2514	* we don't bother going toward it. Returns 1 if we	2341	* we don't bother going toward it. Returns 1 if we
2515	* can see a direct way to get it	2342	* can see a direct way to get it
2516	* Modified to be map tile aware -.MSW	2343	* Modified to be map tile aware -.MSW
2517	*/	2344	*/
2518
2519
2520	int	2345	int
2521	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2346	can_see_monsterP (maptile *m, int x, int y, int dir)
2522	{	2347	{
2523	sint16 dx, dy;	2348	sint16 dx, dy;
2524	int
2525	mflags;	2349	int mflags;
2526		2350
2527	if (dir < 0)	2351	if (dir < 0)
2528	return 0; /* exit condition: invalid direction */	2352	return 0; /* exit condition: invalid direction */
2529		2353
2530	dx = x + freearr_x[dir];	2354	dx = x + freearr_x[dir];
…		…
2543	return 0;	2367	return 0;
2544		2368
2545	/* yes, can see. */	2369	/* yes, can see. */
2546	if (dir < 9)	2370	if (dir < 9)
2547	return 1;	2371	return 1;
		2372
2548	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2373	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2549	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2374	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2375	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2550	}	2376	}
2551
2552
2553		2377
2554	/*	2378	/*
2555	* can_pick(picker, item): finds out if an object is possible to be	2379	* can_pick(picker, item): finds out if an object is possible to be
2556	* picked up by the picker. Returnes 1 if it can be	2380	* picked up by the picker. Returnes 1 if it can be
2557	* picked up, otherwise 0.	2381	* picked up, otherwise 0.
…		…
2568	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2392	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2569	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2393	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2570	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2394	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2571	}	2395	}
2572		2396
2573
2574	/*	2397	/*
2575	* create clone from object to another	2398	* create clone from object to another
2576	*/	2399	*/
2577	object *	2400	object *
2578	object_create_clone (object *asrc)	2401	object_create_clone (object *asrc)
2579	{	2402	{
2580	object *
2581	dst = NULL, *tmp, *src, *part, *prev, *item;	2403	object *dst = 0, *tmp, *src, *part, *prev, *item;
2582		2404
2583	if (!asrc)	2405	if (!asrc)
2584	return NULL;	2406	return 0;
		2407
2585	src = asrc;	2408	src = asrc;
2586	if (src->head)	2409	if (src->head)
2587	src = src->head;	2410	src = src->head;
2588		2411
2589	prev = NULL;	2412	prev = 0;
2590	for (part = src; part; part = part->more)	2413	for (part = src; part; part = part->more)
2591	{	2414	{
2592	tmp = get_object ();	2415	tmp = part->clone ();
2593	copy_object (part, tmp);
2594	tmp->x -= src->x;	2416	tmp->x -= src->x;
2595	tmp->y -= src->y;	2417	tmp->y -= src->y;
		2418
2596	if (!part->head)	2419	if (!part->head)
2597	{	2420	{
2598	dst = tmp;	2421	dst = tmp;
2599	tmp->head = NULL;	2422	tmp->head = 0;
2600	}	2423	}
2601	else	2424	else
2602	{
2603	tmp->head = dst;	2425	tmp->head = dst;
2604	}	2426
2605	tmp->more = NULL;	2427	tmp->more = 0;
		2428
2606	if (prev)	2429	if (prev)
2607	prev->more = tmp;	2430	prev->more = tmp;
		2431
2608	prev = tmp;	2432	prev = tmp;
2609	}	2433	}
2610		2434
2611	/*** copy inventory ***/
2612	for (item = src->inv; item; item = item->below)	2435	for (item = src->inv; item; item = item->below)
2613	{
2614	(void) insert_ob_in_ob (object_create_clone (item), dst);	2436	insert_ob_in_ob (object_create_clone (item), dst);
2615	}
2616		2437
2617	return dst;	2438	return dst;
2618	}	2439	}
2619		2440
2620	/* return true if the object was destroyed, 0 otherwise */
2621	int
2622	was_destroyed (const object *op, tag_t old_tag)
2623	{
2624	/* checking for FLAG_FREED isn't necessary, but makes this function more
2625	* robust */
2626	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2627	}
2628
2629	/* GROS - Creates an object using a string representing its content. */	2441	/* GROS - Creates an object using a string representing its content. */
2630
2631	/* Basically, we save the content of the string to a temp file, then call */	2442	/* Basically, we save the content of the string to a temp file, then call */
2632
2633	/* load_object on it. I admit it is a highly inefficient way to make things, */	2443	/* load_object on it. I admit it is a highly inefficient way to make things, */
2634
2635	/* but it was simple to make and allows reusing the load_object function. */	2444	/* but it was simple to make and allows reusing the load_object function. */
2636
2637	/* Remember not to use load_object_str in a time-critical situation. */	2445	/* Remember not to use load_object_str in a time-critical situation. */
2638
2639	/* Also remember that multiparts objects are not supported for now. */	2446	/* Also remember that multiparts objects are not supported for now. */
2640		2447
2641	object *	2448	object *
2642	load_object_str (const char *obstr)	2449	load_object_str (const char *obstr)
2643	{	2450	{
2644	object *	2451	object *op;
2645	op;
2646	char
2647	filename[MAX_BUF];	2452	char filename[MAX_BUF];
2648		2453
2649	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2454	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2650		2455
2651	FILE *
2652	tempfile = fopen (filename, "w");	2456	FILE *tempfile = fopen (filename, "w");
2653		2457
2654	if (tempfile == NULL)	2458	if (tempfile == NULL)
2655	{	2459	{
2656	LOG (llevError, "Error - Unable to access load object temp file\n");	2460	LOG (llevError, "Error - Unable to access load object temp file\n");
2657	return NULL;	2461	return NULL;
2658	};	2462	}
		2463
2659	fprintf (tempfile, obstr);	2464	fprintf (tempfile, obstr);
2660	fclose (tempfile);	2465	fclose (tempfile);
2661		2466
2662	op = get_object ();	2467	op = object::create ();
2663		2468
2664	object_thawer thawer (filename);	2469	object_thawer thawer (filename);
2665		2470
2666	if (thawer)	2471	if (thawer)
2667	load_object (thawer, op, 0);	2472	load_object (thawer, op, 0);
…		…
2677	* returns NULL if no match.	2482	* returns NULL if no match.
2678	*/	2483	*/
2679	object *	2484	object *
2680	find_obj_by_type_subtype (const object *who, int type, int subtype)	2485	find_obj_by_type_subtype (const object *who, int type, int subtype)
2681	{	2486	{
2682	object *	2487	object *tmp;
2683	tmp;
2684		2488
2685	for (tmp = who->inv; tmp; tmp = tmp->below)	2489	for (tmp = who->inv; tmp; tmp = tmp->below)
2686	if (tmp->type == type && tmp->subtype == subtype)	2490	if (tmp->type == type && tmp->subtype == subtype)
2687	return tmp;	2491	return tmp;
2688		2492
…		…
2696	* do the desired thing.	2500	* do the desired thing.
2697	*/	2501	*/
2698	key_value *	2502	key_value *
2699	get_ob_key_link (const object *ob, const char *key)	2503	get_ob_key_link (const object *ob, const char *key)
2700	{	2504	{
2701	key_value *	2505	key_value *link;
2702	link;
2703		2506
2704	for (link = ob->key_values; link != NULL; link = link->next)	2507	for (link = ob->key_values; link != NULL; link = link->next)
2705	{
2706	if (link->key == key)	2508	if (link->key == key)
2707	{
2708	return link;	2509	return link;
2709	}
2710	}
2711		2510
2712	return NULL;	2511	return NULL;
2713	}	2512	}
2714		2513
2715	/*	2514	/*
…		…
2857	}	2656	}
2858	else	2657	else
2859	item = item->env;	2658	item = item->env;
2860	}	2659	}
2861		2660
		2661	// return a suitable string describing an objetc in enough detail to find it
		2662	const char *
		2663	object::debug_desc (char *info) const
		2664	{
		2665	char info2[256 * 3];
		2666	char *p = info;
		2667
		2668	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2669	count,
		2670	&name,
		2671	title ? " " : "",
		2672	title ? (const char *)title : "");
		2673
		2674	if (env)
		2675	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2676
		2677	if (map)
		2678	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2679
		2680	return info;
		2681	}
		2682
		2683	const char *
		2684	object::debug_desc () const
		2685	{
		2686	static char info[256 * 3];
		2687	return debug_desc (info);
		2688	}
		2689

Diff Legend

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